Merge branch 'release/2.2.0'

Android/EasyBudget/EasyBudget.iml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="EasyBudget" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" type="JAVA_MODULE" version="4">
+<module external.linked.project.id="EasyBudget" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
   <component name="FacetManager">
     <facet type="java-gradle" name="Java-Gradle">
       <configuration>

Android/EasyBudget/app/build.gradle

@@ -13,29 +13,17 @@
  *   See the License for the specific language governing permissions and
  *   limitations under the License.
  */
-
-buildscript {
-    repositories {
-        maven { url 'https://maven.fabric.io/public' }
-    }
-
-    dependencies {
-        classpath 'io.fabric.tools:gradle:1.31.2'
-    }
-}
-
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
 apply plugin: 'kotlin-kapt'
-apply plugin: 'io.fabric'
+apply plugin: 'com.google.firebase.crashlytics'
 
 apply from: 'batch.gradle'
 apply from: 'iap.gradle'
 
 repositories {
     google()
-    maven { url 'https://maven.fabric.io/public' }
     maven { url "http://maven.batch.com/release" }
     mavenCentral()
 }
@@ -47,8 +35,8 @@ android {
         applicationId "com.benoitletondor.easybudgetapp"
         minSdkVersion 21
         targetSdkVersion 29
-        versionCode 70
-        versionName "2.1.3"
+        versionCode 72
+        versionName "2.2.0"
         vectorDrawables.useSupportLibrary = true
     }
     buildTypes {
@@ -59,6 +47,9 @@ android {
             buildConfigField "boolean", "ANALYTICS_ACTIVATED", "false"
             buildConfigField "boolean", "DEV_PREFERENCES", "true"
             buildConfigField "String", "LICENCE_KEY", licence_key
+            firebaseCrashlytics {
+                mappingFileUploadEnabled false
+            }
         }
         release {
             buildConfigField "boolean", "DEBUG_LOG", "false"
@@ -87,42 +78,41 @@ dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 
     implementation 'androidx.appcompat:appcompat:1.1.0'
-    implementation 'androidx.core:core-ktx:1.1.0'
-    implementation 'com.google.android.material:material:1.0.0'
+    implementation 'androidx.core:core-ktx:1.2.0'
+    implementation 'com.google.android.material:material:1.1.0'
     implementation 'androidx.recyclerview:recyclerview:1.1.0'
     implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
-    implementation 'androidx.preference:preference-ktx:1.1.0'
+    implementation 'androidx.preference:preference-ktx:1.1.1'
     implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'
     implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.2.0'
-    implementation 'androidx.work:work-runtime-ktx:2.3.0'
-    implementation 'androidx.work:work-gcm:2.3.0'
+    implementation 'androidx.work:work-runtime-ktx:2.3.4'
+    implementation 'androidx.work:work-gcm:2.3.4'
 
-    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.3'
-    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.3'
+    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.6'
+    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.6'
 
-    implementation 'com.google.firebase:firebase-core:17.2.2'
-    implementation 'com.google.firebase:firebase-messaging:20.1.0'
-    implementation 'com.google.firebase:firebase-storage:19.1.0'
+    implementation 'com.google.firebase:firebase-core:17.4.1'
+    implementation 'com.google.firebase:firebase-messaging:20.1.7'
+    implementation 'com.google.firebase:firebase-storage:19.1.1'
+    implementation 'com.google.firebase:firebase-crashlytics:17.0.0'
     implementation 'com.firebaseui:firebase-ui-auth:6.2.0'
 
-    implementation 'com.android.billingclient:billing:2.1.0'
+    implementation 'com.android.billingclient:billing:2.2.0'
 
     implementation project(':caldroid')
     implementation 'com.getbase:floatingactionbutton:1.10.1'
     implementation 'me.relex:circleindicator:2.1.4@aar'
-    implementation('com.crashlytics.sdk.android:crashlytics:2.10.1@aar') { transitive = true }
-    implementation 'com.batch.android:batch-sdk:1.14.4'
+    implementation 'com.batch.android:batch-sdk:1.15.1'
 
-    implementation 'org.koin:koin-core:2.0.1'
-    implementation 'org.koin:koin-android:2.0.1'
-    implementation 'org.koin:koin-android-viewmodel:2.0.1'
-    implementation 'org.koin:koin-java:2.0.1'
+    implementation 'org.koin:koin-core:2.1.5'
+    implementation 'org.koin:koin-android:2.1.5'
+    implementation 'org.koin:koin-android-viewmodel:2.1.5'
 
-    kapt "androidx.room:room-compiler:2.2.3"
-    implementation "androidx.room:room-runtime:2.2.3"
-    implementation "androidx.room:room-ktx:2.2.3"
+    kapt "androidx.room:room-compiler:2.2.5"
+    implementation "androidx.room:room-runtime:2.2.5"
+    implementation "androidx.room:room-ktx:2.2.5"
 
-    implementation 'net.lingala.zip4j:zip4j:2.2.8'
+    implementation 'net.lingala.zip4j:zip4j:2.5.2'
 }
 
 apply plugin: 'com.google.gms.google-services'

Android/EasyBudget/app/proguard-rules.pro

@@ -16,16 +16,4 @@
 #   public *;
 #}
 
-# Batch specific
--keep class com.batch.** {
-    *;
-}
-
--keep class com.google.android.gms.** {
-    *;
-}
-
--dontwarn com.batch.android.mediation.**
--dontwarn com.batch.android.BatchPushService
-
--keep class com.android.vending.billing.**
+-keep class * extends androidx.fragment.app.Fragment {}

Android/EasyBudget/app/src/main/AndroidManifest.xml

@@ -5,7 +5,7 @@
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-    <uses-permission android:name="com.android.vending.BILLING" /> <!-- Push -->
+    <uses-permission android:name="com.android.vending.BILLING" />
     <uses-permission android:name="android.permission.WAKE_LOCK" />
     <uses-permission android:name="android.permission.VIBRATE" />
 
@@ -29,9 +29,6 @@
         <meta-data
             android:name="google_analytics_ssaid_collection_enabled"
             android:value="false" /> <!-- Fabric.io -->
-        <meta-data
-            android:name="io.fabric.ApiKey"
-            android:value="4f073b46e47c18a4636da5e93128e7c7d9f1600c" />
 
         <activity
             android:name=".view.main.MainActivity"
@@ -68,7 +65,7 @@
             android:label="@string/title_activity_add_expense"
             android:screenOrientation="portrait" />
         <activity
-            android:name=".view.recurringexpenseadd.RecurringExpenseAddActivity"
+            android:name=".view.recurringexpenseadd.RecurringExpenseEditActivity"
             android:configChanges="locale|keyboardHidden|orientation|screenSize"
             android:label="@string/title_activity_recurring_expense_add"
             android:screenOrientation="portrait" />
@@ -91,10 +88,6 @@
             android:name=".view.settings.backup.BackupSettingsActivity"
             android:label="@string/backup_settings_activity_title" />
 
-        <service
-            android:name=".notif.BackupNotif"
-            android:exported="false" />
-
         <!-- Push -->
         <service
             android:name=".push.PushService"

Android/EasyBudget/app/src/main/java/com/benoitletondor/easybudgetapp/EasyBudget.kt

@@ -29,8 +29,6 @@ import com.batch.android.BatchActivityLifecycleHelper
 import com.batch.android.BatchNotificationChannelsManager.DEFAULT_CHANNEL_ID
 import com.batch.android.Config
 import com.batch.android.PushNotificationType
-import com.benoitletondor.easybudgetapp.BuildVersion.VERSION_2_1_0
-import com.benoitletondor.easybudgetapp.BuildVersion.VERSION_2_1_3
 import com.benoitletondor.easybudgetapp.db.DB
 import com.benoitletondor.easybudgetapp.helper.*
 import com.benoitletondor.easybudgetapp.iab.Iab
@@ -44,8 +42,7 @@ import com.benoitletondor.easybudgetapp.view.main.MainActivity
 import com.benoitletondor.easybudgetapp.view.RatingPopup
 import com.benoitletondor.easybudgetapp.view.settings.SettingsActivity
 import com.benoitletondor.easybudgetapp.view.getRatingPopupUserStep
-import com.crashlytics.android.Crashlytics
-import io.fabric.sdk.android.Fabric
+import com.google.firebase.crashlytics.FirebaseCrashlytics
 import kotlinx.coroutines.runBlocking
 import org.koin.android.ext.android.inject
 import org.koin.android.ext.koin.androidContext
@@ -79,9 +76,13 @@ class EasyBudget : Application() {
 
         // Crashlytics
         if ( BuildConfig.CRASHLYTICS_ACTIVATED ) {
-            Fabric.with(this, Crashlytics())
+            FirebaseCrashlytics.getInstance().setCrashlyticsCollectionEnabled(true)
 
-            Crashlytics.setUserIdentifier(parameters.getLocalId())
+            parameters.getLocalId()?.let {
+                FirebaseCrashlytics.getInstance().setUserId(it)
+            }
+        } else {
+            FirebaseCrashlytics.getInstance().setCrashlyticsCollectionEnabled(false)
         }
 
         // Check if an update occurred and perform action if needed
@@ -365,10 +366,6 @@ class EasyBudget : Application() {
      */
     private fun onUpdate(previousVersion: Int, @Suppress("SameParameterValue") newVersion: Int) {
         Logger.debug("Update detected, from $previousVersion to $newVersion")
-
-        if( previousVersion < VERSION_2_1_0 && newVersion == VERSION_2_1_3 && iab.isUserPremium() && !parameters.isBackupEnabled() ) {
-            BackupNotif.showBackupNotif(this)
-        }
     }
 
 // -------------------------------------->

Android/EasyBudget/app/src/main/java/com/benoitletondor/easybudgetapp/db/impl/DBImpl.kt

@@ -170,7 +170,7 @@ private fun Expense.toExpenseEntity() = ExpenseEntity(
 private fun RecurringExpense.toRecurringExpenseEntity() = RecurringExpenseEntity (
     id,
     title,
-    originalAmount.getDBValue(),
+    amount.getDBValue(),
     recurringDate,
     modified,
     type.name

Android/EasyBudget/app/src/main/java/com/benoitletondor/easybudgetapp/db/impl/entity/RecurringExpenseEntity.kt

@@ -34,7 +34,7 @@ class RecurringExpenseEntity(@PrimaryKey
                              @ColumnInfo(name = "recurringDate")
                              val recurringDate: Date,
                              @ColumnInfo(name = "modified")
-                             val modified: Boolean, // Not implemented yet
+                             val modified: Boolean,
                              @ColumnInfo(name = "type")
                              val type: String) {
 

Android/EasyBudget/app/src/main/java/com/benoitletondor/easybudgetapp/helper/Logger.java

@@ -19,7 +19,7 @@
 import android.util.Log;
 
 import com.benoitletondor.easybudgetapp.BuildConfig;
-import com.crashlytics.android.Crashlytics;
+import com.google.firebase.crashlytics.FirebaseCrashlytics;
 
 /**
  * Helper to easily log into the application.
@@ -68,9 +68,9 @@ public static void error(String tag, boolean debug, String msg, Throwable t)
 		if( BuildConfig.CRASHLYTICS_ACTIVATED )
 		{
 			if( t != null ) {
-				Crashlytics.logException(new Throwable(msg, t));
+				FirebaseCrashlytics.getInstance().recordException(new Throwable(msg, t));
 			} else {
-				Crashlytics.log(Log.ERROR, tag, msg);
+				FirebaseCrashlytics.getInstance().log("E/"+tag+": "+msg);
 			}
 		}
 	}
@@ -162,9 +162,9 @@ public static void warning(String tag, boolean debug, String msg, Throwable t)
 		if( BuildConfig.CRASHLYTICS_ACTIVATED )
 		{
 			if( t != null ) {
-				Crashlytics.logException(new Throwable(msg, t));
+				FirebaseCrashlytics.getInstance().recordException(new Throwable(msg, t));
 			} else {
-				Crashlytics.log(Log.WARN, tag, msg);
+				FirebaseCrashlytics.getInstance().log("W/"+tag+": "+msg);
 			}
 		}
 	}
@@ -256,9 +256,9 @@ public static void debug(String tag, boolean debug, String msg, Throwable t)
 		if( BuildConfig.CRASHLYTICS_ACTIVATED )
 		{
 			if( t != null ) {
-				Crashlytics.logException(new Throwable(msg, t));
+				FirebaseCrashlytics.getInstance().recordException(new Throwable(msg, t));
 			} else {
-				Crashlytics.log(Log.DEBUG, tag, msg);
+				FirebaseCrashlytics.getInstance().log("D/"+tag+": "+msg);
 			}
 		}
 	}

Android/EasyBudget/app/src/main/java/com/benoitletondor/easybudgetapp/injection/ViewModelsModule.kt

@@ -19,7 +19,7 @@ package com.benoitletondor.easybudgetapp.injection
 import com.benoitletondor.easybudgetapp.view.expenseedit.ExpenseEditViewModel
 import com.benoitletondor.easybudgetapp.view.main.MainViewModel
 import com.benoitletondor.easybudgetapp.view.premium.PremiumViewModel
-import com.benoitletondor.easybudgetapp.view.recurringexpenseadd.RecurringExpenseAddViewModel
+import com.benoitletondor.easybudgetapp.view.recurringexpenseadd.RecurringExpenseEditViewModel
 import com.benoitletondor.easybudgetapp.view.report.MonthlyReportViewModel
 import com.benoitletondor.easybudgetapp.view.report.base.MonthlyReportBaseViewModel
 import com.benoitletondor.easybudgetapp.view.selectcurrency.SelectCurrencyViewModel
@@ -33,7 +33,7 @@ val viewModelModule = module {
     viewModel { MonthlyReportViewModel(get()) }
     viewModel { MonthlyReportBaseViewModel(get()) }
     viewModel { ExpenseEditViewModel(get(), get()) }
-    viewModel { RecurringExpenseAddViewModel(get(), get()) }
+    viewModel { RecurringExpenseEditViewModel(get(), get()) }
     viewModel { PremiumViewModel(get()) }
     viewModel { BackupSettingsViewModel(get(), get(), get()) }
 }

Android/EasyBudget/app/src/main/java/com/benoitletondor/easybudgetapp/model/RecurringExpense.kt

@@ -22,9 +22,9 @@ import java.util.*
 
 data class RecurringExpense(val id: Long?,
                             val title: String,
-                            val originalAmount: Double,
+                            val amount: Double,
                             val recurringDate: Date,
-                            val modified: Boolean, // Not implemented yet
+                            val modified: Boolean,
                             val type: RecurringExpenseType) : Parcelable {
 
     private constructor(parcel: Parcel) : this(
@@ -44,7 +44,7 @@ data class RecurringExpense(val id: Long?,
     override fun writeToParcel(parcel: Parcel, flags: Int) {
         parcel.writeValue(id)
         parcel.writeString(title)
-        parcel.writeDouble(originalAmount)
+        parcel.writeDouble(amount)
         parcel.writeLong(recurringDate.time)
         parcel.writeByte(if (modified) 1 else 0)
         parcel.writeInt(type.ordinal)