Merge branch 'master' into production

.gitignore

@@ -1,4 +1,8 @@
+*.iml
+.gradle
 .idea/
+build
+local.properties
 
 app/build
 app/*.apk
@@ -15,7 +19,16 @@ app/src/main/res/drawable/ic_night_rain.xml
 app/src/main/res/drawable/ic_moon_9.xml
 app/src/main/res/drawable/ic_bolt.xml
 
-*.iml
-.gradle
-build
-local.properties
+app/src/gms/res/drawable/ic_clouds_and_sun.xml
+app/src/gms/res/drawable/ic_umbrella_1.xml
+app/src/gms/res/drawable/ic_sunny.xml
+app/src/gms/res/drawable/ic_stars_2.xml
+app/src/gms/res/drawable/ic_snowing.xml
+app/src/gms/res/drawable/ic_raindrops.xml
+app/src/gms/res/drawable/ic_rainbow.xml
+app/src/gms/res/drawable/ic_night_rain.xml
+app/src/gms/res/drawable/ic_moon_9.xml
+app/src/gms/res/drawable/ic_bolt.xml
+
+
+

README.md

@@ -10,7 +10,8 @@
 This is a diary application optimized to user experience.
 
 <a href='https://play.google.com/store/apps/details?id=me.blog.korn123.easydiary'><img alt='Get it on Google Play' src='https://play.google.com/intl/en_us/badges/images/generic/en_badge_web_generic.png' width="258" height="98"/></a>
-
+<a href='https://f-droid.org/en/packages/me.blog.korn123.easydiary'><img alt='Get it on F-Droid' src='screenshots/fdroid.png' height="98"/></a>
+
 <img src="screenshots/00.jpg">&nbsp;
 <img src="screenshots/showcase_en.gif" width="288" height="512">
 
@@ -26,7 +27,7 @@ This is a diary application optimized to user experience.
 08. Time Line
 09. Advanced Settings
      - Font Setting
-     - Lock Setting
+     - Lock Setting(PIN or Fingerprint)
      - Theme Setting
      - Backup and Recovery
 ```
@@ -64,12 +65,15 @@ This is a diary application optimized to user experience.
 <img src="screenshots/app_easydiary06_en.png" width="288" height="512">&nbsp;
 
 # How to build
+## GMS Flavor
+To build the gms flavor build, you need to add your Google Mobile Service settings and download the weather icons from Flaticon and import them directly.
 ```
 Step1. Fork or download 'aaf-easydiary' project.
 Step2. Import 'aaf-easydiary' project into android studio.
 Step3. Use below link download svg images from Flaticon.
 Step4. Import 10 svg files for your project from your Android studio.
-       Project rightclick > New > Vector Asset... You can import from the menu and the resource names are:
+       Project rightclick > New > Vector Asset...(Res Directory is gms)
+       You can import from the menu and the resource names are:
        clouds-and-sun.svg -> ic_clouds_and_sun.xml
        umbrella-1.svg     -> ic_umbrella_1.xml
        sunny.svg          -> ic_sunny.xml
@@ -82,9 +86,21 @@ Step4. Import 10 svg files for your project from your Android studio.
        bolt.svg           -> ic_bolt.xml
 Step5. Register your package name and SHA-1 signature certificate fingerprint for Google Drive use.(https://console.developers.google.com/)
 Step6. Build 'aaf-easydiary' project with android studio.
+       a. Build > Select Build Variant
+       b. Select 'gmsRelease' from the Build Variant setting and run
 ```
 [Download 'weather-set-2' svg images from Flaticon](https://www.flaticon.com/packs/weather-set-2)
 
+## FOSS Flavor
+For the foss flavor build, no further action is required. However, because we do not use Google Mobile Service, we can not use the backup function with Google Drive, and we will use simpler weather icons than weather icons provided by gms flavor.
+```
+Step1. Fork or download 'aaf-easydiary' project.
+Step2. Import 'aaf-easydiary' project into android studio.
+Step3. Build 'aaf-easydiary' project with android studio.
+       a. Build > Select Build Variant
+       b. Select 'fossRelease' from the Build Variant setting and run
+```
+
 # Translation
 Thanks for someone help me to translate this app.   
 
@@ -113,4 +129,4 @@ Currently supported languages are listed below:
 
 [licensesvg]: https://img.shields.io/badge/License-Apache--2.0-brightgreen.svg
 [README_ko.md]: https://github.com/hanjoongcho/aaf-easydiary/blob/master/README_ko.md
-[LICENSE.md]: https://github.com/hanjoongcho/aaf-easydiary/blob/master/LICENSE.md
+[LICENSE.md]: https://github.com/hanjoongcho/aaf-easydiary/blob/master/LICENSE.md

app/build.gradle

@@ -8,6 +8,17 @@ apply plugin: 'realm-android'
 android {
     compileSdkVersion versions.compileSdk
     buildToolsVersion versions.buildTools
+
+    Properties properties = new Properties()
+    properties.load(project.rootProject.file('local.properties').newDataInputStream())
+    signingConfigs {
+        config {
+            keyAlias 'android'
+            keyPassword properties.getProperty("storePassword")
+            storeFile file(properties.getProperty("storeFile"))
+            storePassword properties.getProperty("storePassword")
+        }
+    }
 
     defaultConfig {
         applicationId "me.blog.korn123.easydiary"
@@ -18,11 +29,31 @@ android {
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true
         multiDexEnabled true
-
         renderscriptTargetApi 18
         renderscriptSupportModeEnabled true
+        signingConfig signingConfigs.config
+    }
+    flavorDimensions "release"
+    productFlavors {
+        gms {
+            dimension "release"
+            versionName "${versions.publishVersion}_gms"
+            signingConfig signingConfigs.config
+        }
+        foss {
+            dimension "release"
+            versionName "${versions.publishVersion}_foss"
+            signingConfig signingConfigs.config
+        }
+    }
+    sourceSets {
+        gms {
+            manifest.srcFile 'src/gms/AndroidManifest.xml'
+        }
+        foss {
+            manifest.srcFile 'src/foss/AndroidManifest.xml'
+        }
     }
-
     buildTypes {
         release {
             minifyEnabled true
@@ -34,18 +65,19 @@ android {
                     output.outputFileName = releaseFileName
                 }
             }
+            signingConfig signingConfigs.config
+        }
+        debug {
+            signingConfig signingConfigs.config
         }
     }
-
     androidExtensions {
         experimental = true
     }
-
     packagingOptions {
         exclude 'META-INF/commons_release.kotlin_module'
         exclude 'META-INF/rxjava.properties'
     }
-
     lintOptions {
         checkReleaseBuilds false
         // Or, if you prefer, you can continue to check for errors in release builds,
@@ -55,33 +87,30 @@ android {
 }
 
 dependencies {
-    implementation fileTree(dir: 'libs', include: ['*.jar'])
-
+    implementation fileTree(include: ['*.jar'], dir: 'libs')
     // android
     implementation 'com.android.support:multidex:1.0.3'
     implementation "com.android.support:appcompat-v7:$versions.supportLib"
     implementation "com.android.support:cardview-v7:$versions.supportLib"
     implementation "com.android.support:design:$versions.supportLib"
     implementation "com.android.support:support-v4:$versions.supportLib"
     implementation "com.android.support:support-vector-drawable:$versions.supportLib"
-
     // google
-    implementation "com.google.android.gms:play-services-drive:$versions.gms"
-    implementation "com.google.android.gms:play-services-auth:$versions.gms"
+    gmsImplementation "com.google.android.gms:play-services-drive:$versions.gms"
+    gmsImplementation "com.google.android.gms:play-services-auth:$versions.gms"
     implementation 'com.google.android:flexbox:1.0.0'
-    implementation "com.google.code.gson:gson:2.8.5"
-
+    implementation 'com.google.code.gson:gson:2.8.5'
     // jetbrains
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$versions.kotlin"
-
     // apache commons
-    implementation "commons-io:commons-io:2.6"
-    implementation "org.apache.commons:commons-lang3:3.7"
-    implementation 'io.github.aafactory:commons:0.9.6'
+    implementation 'commons-io:commons-io:2.6'
+    implementation 'org.apache.commons:commons-lang3:3.7'
+    gmsImplementation 'io.github.aafactory:commons:0.9.6'
+    fossImplementation 'io.github.aafactory:commons-foss:0.9.6'
 //    implementation project(":aafactory-commons")
     implementation 'com.github.PhilJay:MPAndroidChart:v3.0.1'
-    implementation group: 'com.roomorama', name: 'caldroid', version: '3.0.1'
-    implementation 'com.github.chrisbanes:PhotoView:2.1.3'
+    implementation 'com.roomorama:caldroid:3.0.1'
+    implementation 'com.github.chrisbanes:PhotoView:2.1.3'  
     implementation 'com.github.QuadFlask:colorpicker:0.0.13'
     implementation 'com.github.amlcurran.showcaseview:library:5.4.3'
     implementation 'id.zelory:compressor:2.1.0'
@@ -91,14 +120,11 @@ dependencies {
     implementation 'com.github.ksoichiro:android-observablescrollview:1.5.2'
     implementation 'com.nineoldandroids:library:2.4.0'
     implementation 'com.qhutch.elevationimageview:elevationimageview:2.3'
-
     // debug, release
     debugImplementation "com.squareup.leakcanary:leakcanary-android:$LEAK_CANARY_VERSION"
     releaseImplementation "com.squareup.leakcanary:leakcanary-android-no-op:$LEAK_CANARY_VERSION"
-
     // test
     testImplementation 'junit:junit:4.12'
-
     // android test
     androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2', {
         exclude group: 'com.android.support', module: 'support-annotations'