Merge pull request #28 from b-lam/develop

v1.1.0
b-lam · Sep 22, 2017 · 88150c4 · 88150c4
2 parents 9ff46c0 + d92561e
commit 88150c4
Show file tree

Hide file tree

Showing 17 changed files with 513 additions and 156 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -2,14 +2,14 @@ apply plugin: 'com.android.application'
 apply plugin: 'android-apt'
 
 android {
-    compileSdkVersion 25
-    buildToolsVersion "25.0.3"
+    compileSdkVersion 26
+    buildToolsVersion "26.0.1"
     defaultConfig {
         applicationId "com.b_lam.resplash"
         minSdkVersion 21
-        targetSdkVersion 25
-        versionCode 10
-        versionName "1.0.9"
+        targetSdkVersion 26
+        versionCode 11
+        versionName "1.1.0"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         buildConfigField("String", "RELEASE_APP_ID", RELEASE_APP_ID)
         buildConfigField("String", "RELEASE_SECRET", RELEASE_SECRET)
@@ -29,6 +29,9 @@ android {
             applicationIdSuffix ".debug"
         }
     }
+    lintOptions {
+        disable 'MissingTranslation'
+    }
 }
 
 repositories {
@@ -40,26 +43,26 @@ dependencies {
     androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
         exclude group: 'com.android.support', module: 'support-annotations'
     })
-    compile('com.mikepenz:fastadapter:2.5.2@aar') {
-        transitive = true
-    }
-    compile('com.mikepenz:materialdrawer:5.9.1@aar') {
-        transitive = true
-    }
-    compile 'com.android.support:appcompat-v7:25.3.1'
-    compile 'com.android.support:support-v4:25.3.1'
-    compile 'com.android.support:design:25.3.1'
-    compile 'com.android.support:cardview-v7:25.3.1'
+    compile 'com.android.support:appcompat-v7:26.1.0'
+    compile 'com.android.support:support-v4:26.1.0'
+    compile 'com.android.support:design:26.1.0'
+    compile 'com.android.support:cardview-v7:26.1.0'
     compile 'com.squareup.retrofit2:retrofit:2.2.0'
     compile 'com.google.code.gson:gson:2.8.0'
     compile 'com.squareup.retrofit2:converter-gson:2.2.0'
     compile 'com.squareup.okhttp3:okhttp:3.7.0'
     compile 'com.squareup.okhttp3:okhttp-urlconnection:3.7.0'
     compile 'com.github.bumptech.glide:glide:3.7.0'
     compile 'com.github.chrisbanes:PhotoView:2.0.0'
-    compile 'com.mikepenz:fastadapter-commons:2.5.2@aar'
-    compile 'com.mikepenz:fastadapter-extensions:2.5.2@aar'
-    compile 'com.mikepenz:materialize:1.0.1@aar'
+    compile('com.mikepenz:materialdrawer:5.9.5@aar') {
+        transitive = true
+    }
+    compile('com.mikepenz:fastadapter:2.6.3@aar') {
+        transitive = true
+    }
+    compile 'com.mikepenz:fastadapter-commons:2.6.3@aar'
+    compile 'com.mikepenz:fastadapter-extensions:2.6.3@aar'
+    compile 'com.mikepenz:materialize:1.0.3@aar'
     compile 'com.mikepenz:iconics-core:2.8.1@aar'
     compile 'com.mikepenz:google-material-typeface:2.2.0.3.original@aar'
     compile 'com.mikepenz:community-material-typeface:1.5.54.2@aar'

diff --git a/app/resplash-1.1.0.apk b/app/resplash-1.1.0.apk
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -8,6 +8,7 @@
     <uses-permission android:name="android.permission.SET_WALLPAPER" />
     <uses-permission android:name="android.permission.SET_WALLPAPER_HINTS" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
     <uses-permission android:name="android.permission.WAKE_LOCK" />
     <uses-permission android:name="com.android.vending.BILLING" />
 
@@ -36,7 +37,7 @@
         </activity>
         <activity
             android:name=".activities.SettingsActivity"
-            android:label="Settings"
+            android:label="@string/main_settings"
             android:configChanges="locale"
             android:parentActivityName=".activities.MainActivity">
             <meta-data
@@ -54,6 +55,7 @@
         </activity>
         <activity
             android:name=".activities.DetailActivity"
+            android:screenOrientation="portrait"
             android:label="@string/app_name">
         </activity>
         <activity

diff --git a/app/src/main/java/com/b_lam/resplash/Resplash.java b/app/src/main/java/com/b_lam/resplash/Resplash.java
@@ -51,6 +51,8 @@ public class Resplash extends Application{
     public static final String UNSPLASH_UTM_PARAMETERS = "?utm_source=resplash&utm_medium=referral&utm_campaign=api-credit";
 
     public static final String DATE_FORMAT = "yyyy/MM/dd";
+    public static final String DOWNLOAD_PATH = "/Pictures/Resplash/";
+    public static final String DOWNLOAD_PHOTO_FORMAT = ".jpg";
 
     public static final int DEFAULT_PER_PAGE = 30;
     public static final int SEARCH_PER_PAGE = 20;