Merge pull request #200 from HoraApps/develop

v0.4

Author: dnldsht

README.md

@@ -1,15 +1,16 @@
-# LeafPic [![Crowdin](https://d322cqt584bo4o.cloudfront.net/leafpic/localized.svg)](https://crowdin.com/project/leafpic)
-<!--<img src="app/src/main/res/mipmap-xxhdpi/ic_launcher.png" align="left" > </br></br></br></br>-->
-
-<img src="app/src/main/res/mipmap-xxhdpi/ic_launcher.png" align="left" width="150" hspace="10" vspace="10">
-LeafPic is a fluid, material-designed alternative gallery. LeafPic is ad-free, open sourced under GPL v3. It is smaller than other apps but it doesn't miss any of the main features.
-
-LeafPic is available on F-Droid.
-
-[![F-Droid](https://f-droid.org/wiki/images/0/06/F-Droid-button_get-it-on.png)](https://f-droid.org/repository/browse/?fdid=com.horaapps.leafpic)
-
-</br>
-## Screenshot
+[![GitHub release](https://img.shields.io/github/release/HoraApps/LeafPic.svg)](https://github.com/HoraApps/LeafPic/releases)
+[![Crowdin](https://d322cqt584bo4o.cloudfront.net/leafpic/localized.svg)](https://crowdin.com/project/leafpic)
+[![Donate](https://img.shields.io/badge/donate-paypal-blue.svg)](https://www.paypal.me/HoraApps)
+# LeafPic
+<img src="/app/src/main/res/drawable/leaf_pic.png" align="left" width="200" hspace="10" vspace="10">
+LeafPic is a fluid, material-designed alternative gallery, it  also is ad-free and open source under GPLv3 license. It doesn't miss any of the main features of a stock gallery, we also have in plan to add some useful feature.
+
+<a href="https://f-droid.org/app/com.horaapps.leafpic">
+    <img src="https://f-droid.org/badge/get-it-on.png"
+         alt="Get it on F-Droid" height="80">
+</a>
+</br></br>
+## Screenshots
 <div style="dispaly:flex;" >
 <img  src="screenshots/1.png" width="19%" >
 <img style="margin-left:10px;" src="screenshots/2.png" width="19%" >
@@ -23,19 +24,15 @@ LeafPic is available on F-Droid.
 
 ###### Code & Issues
 If you are a developer and you wish to contribute to the app please fork the project
-and submit a pull request.
+and submit a pull request if possible make it on the [develop branch](https://github.com/HoraApps/LeafPic/tree/develop).
 If you have any questions, feel free to ask [me](mailto:dnld.sht@gmail.com) about whatever you want.
 [Here](https://github.com/HoraApps/LeafPic/issues) is the list of known issues.
 If you want to report new bugs please add helpful description or screenshots.
 
 ###### Translations
 If you are able to contribute with a new translation of a missing language or if you want to improve an existing one, we greatly appreciate any suggestion!
-[The project uses Crowdin](https://crowdin.com/project/leafpic), a platform that allows anybody to contribute to translating the app
+The project uses [Crowdin](https://crowdin.com/project/leafpic), a platform that allows anybody to contribute to translating the app
 
 #### Licensing
-Leafpic is licensed under the [GNU v3 Public License](https://github.com/HoraApps/LeafPic/blob/master/LICENSE).
-
+LeafPic is licensed under the [GNU v3 Public License](https://github.com/HoraApps/LeafPic/blob/master/LICENSE).
 In addition to the terms set by the GNU v3 Public License, we ask that if you use any code from this repository that you send us a message to let us know.
-
-
-

app/build.gradle

@@ -3,7 +3,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.1.0'
+        classpath 'com.android.tools.build:gradle:2.1.2'
     }
 }
 
@@ -22,8 +22,8 @@ android {
         applicationId "com.horaapps.leafpic"
         minSdkVersion 19
         targetSdkVersion 23
-        versionCode 6
-        versionName "v0.3.5"
+        versionCode 7
+        versionName "v0.4"
     }
 
     lintOptions {
@@ -47,7 +47,7 @@ android {
 }
 
 dependencies {
-    compile fileTree(include: ['*.jar'], dir: 'libs')
+    compile fileTree(dir: 'libs', include: ['*.jar'])
     compile 'com.android.support:appcompat-v7:23.4.0'
     compile 'com.android.support:cardview-v7:23.4.0'
     compile 'com.android.support:recyclerview-v7:23.4.0'
@@ -62,11 +62,14 @@ dependencies {
     compile 'com.mikepenz:fontawesome-typeface:4.6.0.1@aar'
     compile 'com.github.paolorotolo:appintro:3.4.0'
     compile 'com.yalantis:ucrop:1.5.0'
-    compile(group: 'uz.shift', name: 'colorpicker', version: '0.5', ext: 'aar')
+    compile 'uz.shift:colorpicker:0.5@aar'
     compile 'com.balysv:material-ripple:1.0.2'
     compile 'com.commit451:PhotoView:1.2.5'
     compile 'com.google.android.exoplayer:exoplayer:r1.5.7'
-    compile('de.psdev.licensesdialog:licensesdialog:1.8.0')
+    compile 'de.psdev.licensesdialog:licensesdialog:1.8.0'
     compile 'com.android.support:customtabs:23.4.0'
     compile 'com.davemorrissey.labs:subsampling-scale-image-view:3.5.0'
+    compile 'de.hdodenhof:circleimageview:2.0.0'
+    compile 'com.drewnoakes:metadata-extractor:2.9.1'
+    compile 'org.jetbrains:annotations-java5:15.0'
 }

app/src/main/AndroidManifest.xml

@@ -112,7 +112,7 @@
         </activity>
 
         <activity
-            android:name=".SettingActivity"
+            android:name=".SettingsActivity"
             android:theme="@style/Theme.AppCompat.NoActionBar">
             <intent-filter>
                 <action android:name="android.intent.action.SETTING" />