Skip to content

Commit

Permalink
Version 1.0.2
Browse files Browse the repository at this point in the history
  • Loading branch information
guiguegon committed Jul 27, 2016
1 parent 4ef6dbc commit 8f4eb5d
Show file tree
Hide file tree
Showing 32 changed files with 50 additions and 48 deletions.
File renamed without changes.
12 changes: 7 additions & 5 deletions gallery/build.gradle → gallerymodule/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ apply plugin: 'me.tatarka.retrolambda'
apply plugin: 'com.jfrog.bintray'
apply plugin: 'com.github.dcendents.android-maven'

def versionLib = '1.0.2'

Properties properties = new Properties()
if (project.rootProject.file('local.properties').exists()) {
properties.load(project.rootProject.file('local.properties').newDataInputStream())
Expand All @@ -24,7 +26,7 @@ ext {

libraryDescription =
'Just a simple activity that show all the images and videos in a gallery and allows to select one and retrieve it'
libraryVersion = '1.0.1'
libraryVersion = versionLib

developerId = 'guiguegon'
developerName = 'Guillermo Guerrero González'
Expand All @@ -41,9 +43,9 @@ bintray {
licenses = ["Apache-2.0"]
publish = true
version {
name = '1.0.1'
name = versionLib
desc = 'Just a simple activity that show all the images and videos in a gallery and allows to select one and retrieve it'
vcsUrl = 'https://github.com/guiguegon/GalleryModule.git'
vcsUrl = 'https://github.com/guiguegon/gallerymodule.git'
}
}
}
Expand All @@ -56,7 +58,7 @@ android {
minSdkVersion 15
targetSdkVersion 24
versionCode 1
versionName "1.0.1"
versionName versionLib
}

compileOptions {
Expand Down Expand Up @@ -87,7 +89,6 @@ dependencies {

compile "com.android.support:appcompat-v7:$SUPPORT_LIBRARY_VERSION"
compile "com.android.support:recyclerview-v7:$SUPPORT_LIBRARY_VERSION"
compile "com.android.support:support-annotations:$SUPPORT_LIBRARY_VERSION"

//Dexter (permissions)
compile 'com.karumi:dexter:2.2.2'
Expand All @@ -107,4 +108,5 @@ if (project.rootProject.file('local.properties').exists()) {
apply from: 'https://raw.githubusercontent.com/borjabravo10/JCenter/master/bintrayv1.gradle'
}

bintrayUpload.mustRunAfter install
task remoteUpload(dependsOn: ['install', 'bintrayUpload'])
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package es.guiguegon.gallery;
package es.guiguegon.gallerymodule;

import android.app.Application;
import android.test.ApplicationTestCase;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
android:allowBackup="true"
android:supportsRtl="true">
<activity
android:name=".GalleryActivity"
android:name="es.guiguegon.gallerymodule.GalleryActivity"
android:theme="@style/Theme.AppCompat.NoActionBar"/>
</application>

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package es.guiguegon.gallery;
package es.guiguegon.gallerymodule;

import android.content.Context;
import android.content.Intent;
Expand All @@ -9,7 +9,7 @@
import android.support.v7.app.AppCompatActivity;
import android.view.MenuItem;
import com.karumi.dexter.Dexter;
import es.guiguegon.gallery.fragments.GalleryFragment;
import es.guiguegon.gallerymodule.fragments.GalleryFragment;
import java.util.List;

public class GalleryActivity extends AppCompatActivity {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package es.guiguegon.gallery.adapters;
package es.guiguegon.gallerymodule.adapters;

import android.content.Context;
import android.support.v7.widget.RecyclerView;
Expand All @@ -9,10 +9,10 @@
import android.view.ViewGroup;
import android.widget.FrameLayout;
import android.widget.ImageView;
import es.guiguegon.gallery.R;
import es.guiguegon.gallery.model.GalleryMedia;
import es.guiguegon.gallery.utils.ImageUtils;
import es.guiguegon.gallery.utils.ScreenUtils;
import es.guiguegon.gallerymodule.R;
import es.guiguegon.gallerymodule.model.GalleryMedia;
import es.guiguegon.gallerymodule.utils.ImageUtils;
import es.guiguegon.gallerymodule.utils.ScreenUtils;
import java.util.ArrayList;
import java.util.List;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package es.guiguegon.gallery.fragments;
package es.guiguegon.gallerymodule.fragments;

import android.Manifest;
import android.app.Activity;
Expand All @@ -17,14 +17,14 @@
import android.widget.ProgressBar;
import android.widget.TextView;
import android.widget.Toast;
import es.guiguegon.gallery.GalleryActivity;
import es.guiguegon.gallery.R;
import es.guiguegon.gallery.adapters.GalleryAdapter;
import es.guiguegon.gallery.helpers.CameraHelper;
import es.guiguegon.gallery.helpers.GalleryHelper;
import es.guiguegon.gallery.helpers.PermissionsManager;
import es.guiguegon.gallery.model.GalleryMedia;
import es.guiguegon.gallery.utils.ScreenUtils;
import es.guiguegon.gallerymodule.GalleryActivity;
import es.guiguegon.gallerymodule.R;
import es.guiguegon.gallerymodule.adapters.GalleryAdapter;
import es.guiguegon.gallerymodule.helpers.CameraHelper;
import es.guiguegon.gallerymodule.helpers.GalleryHelper;
import es.guiguegon.gallerymodule.helpers.PermissionsManager;
import es.guiguegon.gallerymodule.model.GalleryMedia;
import es.guiguegon.gallerymodule.utils.ScreenUtils;
import java.util.ArrayList;
import java.util.List;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package es.guiguegon.gallery.helpers;
package es.guiguegon.gallerymodule.helpers;

import android.app.Activity;
import android.content.ContentValues;
Expand All @@ -7,8 +7,8 @@
import android.net.Uri;
import android.provider.MediaStore;
import android.util.Log;
import es.guiguegon.gallery.model.GalleryMedia;
import es.guiguegon.gallery.utils.FileUtils;
import es.guiguegon.gallerymodule.model.GalleryMedia;
import es.guiguegon.gallerymodule.utils.FileUtils;

/**
* Created by guiguegon on 23/10/2015.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
package es.guiguegon.gallery.helpers;
package es.guiguegon.gallerymodule.helpers;

import android.content.Context;
import android.database.Cursor;
import android.provider.MediaStore;
import android.support.annotation.UiThread;
import android.support.annotation.WorkerThread;
import android.util.Log;
import es.guiguegon.gallery.model.GalleryMedia;
import es.guiguegon.gallerymodule.model.GalleryMedia;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package es.guiguegon.gallery.helpers;
package es.guiguegon.gallerymodule.helpers;

import android.view.ViewGroup;
import com.karumi.dexter.Dexter;
Expand All @@ -8,7 +8,7 @@
import com.karumi.dexter.listener.multi.CompositeMultiplePermissionsListener;
import com.karumi.dexter.listener.multi.MultiplePermissionsListener;
import com.karumi.dexter.listener.multi.SnackbarOnAnyDeniedMultiplePermissionsListener;
import es.guiguegon.gallery.R;
import es.guiguegon.gallerymodule.R;
import java.util.List;

public class PermissionsManager {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package es.guiguegon.gallery.model;
package es.guiguegon.gallerymodule.model;

import android.os.Parcel;
import android.os.Parcelable;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package es.guiguegon.gallery.utils;
package es.guiguegon.gallerymodule.utils;

import android.content.ContentResolver;
import android.net.Uri;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package es.guiguegon.gallery.utils;
package es.guiguegon.gallerymodule.utils;
/**
* Created by guillermoguerrero on 2/6/16.
*/
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package es.guiguegon.gallery.utils;
package es.guiguegon.gallerymodule.utils;

import android.content.Context;
import android.graphics.Point;
Expand Down
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package es.guiguegon.gallery;
package es.guiguegon.gallerymodule;

import org.junit.Test;

Expand Down
6 changes: 3 additions & 3 deletions sample/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ android {
buildToolsVersion "24.0.0"

defaultConfig {
applicationId "es.guiguegon.gallery.sample"
applicationId "es.guiguegon.gallerymodule.sample"
minSdkVersion 15
targetSdkVersion 24
versionCode 1
versionName "1.0.1"
versionName "1.0.2"
}

compileOptions {
Expand All @@ -32,5 +32,5 @@ dependencies {
compile 'com.android.support:appcompat-v7:24.1.1'
compile 'com.android.support:design:24.1.1'

compile project(':gallery')
compile project(':gallerymodule')
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package es.guiguegon.gallery;
package es.guiguegon.gallerymodule;

import android.app.Application;
import android.test.ApplicationTestCase;
Expand Down
4 changes: 2 additions & 2 deletions sample/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="es.guiguegon.gallery.sample">
package="es.guiguegon.gallerymodule.sample">

<application
android:allowBackup="true"
Expand All @@ -9,7 +9,7 @@
android:supportsRtl="true"
android:theme="@style/AppTheme">
<activity
android:name=".MainActivity"
android:name="es.guiguegon.gallerymodule.sample.MainActivity"
android:theme="@style/AppTheme.NoActionBar">
<intent-filter>
<category android:name="android.intent.category.LAUNCHER"/>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package es.guiguegon.gallery.sample;
package es.guiguegon.gallerymodule.sample;

import android.content.Intent;
import android.os.Bundle;
Expand All @@ -7,8 +7,8 @@
import android.support.v7.widget.Toolbar;
import android.view.View;
import android.widget.Toast;
import es.guiguegon.gallery.GalleryActivity;
import es.guiguegon.gallery.model.GalleryMedia;
import es.guiguegon.gallerymodule.GalleryActivity;
import es.guiguegon.gallerymodule.model.GalleryMedia;

public class MainActivity extends AppCompatActivity {

Expand Down
2 changes: 1 addition & 1 deletion sample/src/main/res/layout/activity_main.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:fitsSystemWindows="true"
tools:context="es.guiguegon.gallery.sample.MainActivity">
tools:context="es.guiguegon.gallerymodule.sample.MainActivity">

<android.support.design.widget.AppBarLayout
android:layout_width="match_parent"
Expand Down
2 changes: 1 addition & 1 deletion sample/src/main/res/layout/content_main.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,5 @@
android:paddingRight="@dimen/activity_horizontal_margin"
android:paddingTop="@dimen/activity_vertical_margin"
app:layout_behavior="@string/appbar_scrolling_view_behavior"
tools:context="es.guiguegon.gallery.sample.MainActivity"
tools:context="es.guiguegon.gallerymodule.sample.MainActivity"
tools:showIn="@layout/activity_main"/>
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package es.guiguegon.gallery;
package es.guiguegon.gallerymodule;

import org.junit.Test;

Expand Down
2 changes: 1 addition & 1 deletion settings.gradle
Original file line number Diff line number Diff line change
@@ -1 +1 @@
include ':sample', ':gallery'
include ':sample', ':gallerymodule'

0 comments on commit 8f4eb5d

Please sign in to comment.