Merge pull request #36 from dgngulcan/fix-crash-on-mainviewmodel-enab…

…le-minify Fix crash on mainviewmodel enable minify
dgngulcan · Mar 5, 2019 · eabc0b8 · eabc0b8
2 parents 1d2221a + 9efaf36
commit eabc0b8
Show file tree

Hide file tree

Showing 21 changed files with 55 additions and 49 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -5,8 +5,8 @@ apply plugin: 'kotlin-kapt'
 apply plugin: 'io.fabric'
 
 ext.app = [
-        'version'            : '2.1.1',
-        'version_code'       : 16,
+        'version'            : '2.1.5',
+        'version_code'       : 22,
         'compile_sdk_version': 28,
         'min_sdk_version'    : 21,
         'target_sdk_version' : 28
@@ -44,8 +44,8 @@ android {
         }
 
         release {
-            shrinkResources false
-            minifyEnabled false
+            shrinkResources true
+            minifyEnabled true
         }
     }
 
@@ -76,58 +76,43 @@ androidExtensions {
 }
 
 dependencies {
-    implementation fileTree(dir: 'libs', include: ['*.jar'])
-
+    implementation fileTree(include: ['*.jar'], dir: 'libs')
     implementation deps.kotlin.stdlib
     implementation deps.kotlin.coroutines
-
     implementation deps.material_design
-
     implementation deps.androidx.core_ktx
     implementation deps.androidx.fragment
     implementation deps.androidx.browser
     implementation deps.androidx.lifecycle
     kapt deps.androidx.lifecycle_compiler
     implementation deps.androidx.paging
-
     implementation deps.androidx.constraint_layout
-
     implementation deps.room.runtime
     kapt deps.room.compiler
-
     implementation deps.dagger.core
     implementation deps.dagger.android
     implementation deps.dagger.android_support
     kapt deps.dagger.compiler
     kapt deps.dagger.processor
-
     implementation deps.glide.core
     kapt deps.glide.compiler
-
     implementation deps.retrofit.core
     implementation deps.retrofit.moshi_converter
-
     implementation deps.okhttp.core
     implementation deps.okhttp.logging_interceptor
-
     implementation deps.crashlytics
-
     implementation deps.lottie
-
     implementation deps.firebase.core
     implementation deps.firebase.config
     implementation deps.firebase.firestore
-
     implementation deps.jsoup
     implementation deps.gson // quick fix for version conflict between room and firestore
-
     testImplementation deps.mockito.core
     testImplementation deps.mockito.inline
     testImplementation deps.junit
     testImplementation deps.kotlin.coroutines_test
     testImplementation deps.testx.core
     testImplementation deps.arch_testing
-
     androidTestImplementation deps.arch_testing
     androidTestImplementation deps.testx.core
     androidTestImplementation deps.testx.runner
@@ -136,7 +121,6 @@ dependencies {
     androidTestImplementation deps.testx.monitor
     androidTestImplementation deps.testx.ext
     androidTestImplementation deps.room.testing
-
     detektPlugins deps.detekt_formatting
 }
 

diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
@@ -13,7 +13,6 @@
 -keepattributes SourceFile,LineNumberTable
 -repackageclasses ''
 
-
 -keep class com.crashlytics.** { *; }
 -keepattributes *Annotation*,Signature,Exceptions
 

diff --git a/app/src/main/java/com/droidfeed/data/api/mailchimp/ErrorAdapter.kt b/app/src/main/java/com/droidfeed/data/api/mailchimp/ErrorAdapter.kt
@@ -1,6 +1,9 @@
 package com.droidfeed.data.api.mailchimp
 
 import androidx.annotation.Keep
+import com.droidfeed.data.api.mailchimp.model.ErrorJson
+import com.droidfeed.data.api.mailchimp.model.ErrorType
+import com.droidfeed.data.api.mailchimp.model.MailchimpError
 import com.droidfeed.util.logThrowable
 import com.squareup.moshi.FromJson
 import com.squareup.moshi.JsonDataException
@@ -21,6 +24,10 @@ internal class ErrorAdapter {
             }
         }
 
-        return MailchimpError(errorType, errorJson.status, errorJson.detail)
+        return MailchimpError(
+            errorType,
+            errorJson.status,
+            errorJson.detail
+        )
     }
 }
diff --git a/...droidfeed/data/api/mailchimp/ErrorJson.kt → ...eed/data/api/mailchimp/model/ErrorJson.kt b/...droidfeed/data/api/mailchimp/ErrorJson.kt → ...eed/data/api/mailchimp/model/ErrorJson.kt
@@ -1,5 +1,8 @@
-package com.droidfeed.data.api.mailchimp
+package com.droidfeed.data.api.mailchimp.model
 
+import androidx.annotation.Keep
+
+@Keep
 data class ErrorJson(
     val title: String,
     val status: Int,

diff --git a/...droidfeed/data/api/mailchimp/ErrorType.kt → ...eed/data/api/mailchimp/model/ErrorType.kt b/...droidfeed/data/api/mailchimp/ErrorType.kt → ...eed/data/api/mailchimp/model/ErrorType.kt
@@ -1,5 +1,8 @@
-package com.droidfeed.data.api.mailchimp
+package com.droidfeed.data.api.mailchimp.model
 
+import androidx.annotation.Keep
+
+@Keep
 enum class ErrorType {
     MEMBER_ALREADY_EXIST,
     INVALID_RESOURCE,

diff --git a/...feed/data/api/mailchimp/MailchimpError.kt → ...ata/api/mailchimp/model/MailchimpError.kt b/...feed/data/api/mailchimp/MailchimpError.kt → ...ata/api/mailchimp/model/MailchimpError.kt
@@ -1,8 +1,11 @@
-package com.droidfeed.data.api.mailchimp
+package com.droidfeed.data.api.mailchimp.model
+
+import androidx.annotation.Keep
 
 /**
  * Defines base error response for Mailchimp API.
  */
+@Keep
 data class MailchimpError(
     val type: ErrorType,
     val code: Int,

diff --git a/...roidfeed/data/api/mailchimp/Subscriber.kt → ...ed/data/api/mailchimp/model/Subscriber.kt b/...roidfeed/data/api/mailchimp/Subscriber.kt → ...ed/data/api/mailchimp/model/Subscriber.kt
@@ -1,7 +1,9 @@
-package com.droidfeed.data.api.mailchimp
+package com.droidfeed.data.api.mailchimp.model
 
+import androidx.annotation.Keep
 import com.squareup.moshi.Json
 
+@Keep
 data class Subscriber(
     @field:Json(name = "email_address")
     var email: String,

diff --git a/.../data/api/mailchimp/SubscriptionStatus.kt → ...api/mailchimp/model/SubscriptionStatus.kt b/.../data/api/mailchimp/SubscriptionStatus.kt → ...api/mailchimp/model/SubscriptionStatus.kt
@@ -1,7 +1,9 @@
-package com.droidfeed.data.api.mailchimp
+package com.droidfeed.data.api.mailchimp.model
 
+import androidx.annotation.Keep
 import com.squareup.moshi.Json
 
+@Keep
 enum class SubscriptionStatus(private val status: String) {
     @Json(name = "subscribed")
     SUBSCRIBED("subscribed"),

diff --git a/...idfeed/data/api/mailchimp/UserResponse.kt → .../data/api/mailchimp/model/UserResponse.kt b/...idfeed/data/api/mailchimp/UserResponse.kt → .../data/api/mailchimp/model/UserResponse.kt
@@ -1,7 +1,9 @@
-package com.droidfeed.data.api.mailchimp
+package com.droidfeed.data.api.mailchimp.model
 
+import androidx.annotation.Keep
 import com.squareup.moshi.Json
 
+@Keep
 data class UserResponse(
     val id: String,
 

diff --git a/app/src/main/java/com/droidfeed/data/api/mailchimp/service/NewsletterService.kt b/app/src/main/java/com/droidfeed/data/api/mailchimp/service/NewsletterService.kt
@@ -1,7 +1,7 @@
 package com.droidfeed.data.api.mailchimp.service
 
-import com.droidfeed.data.api.mailchimp.Subscriber
-import com.droidfeed.data.api.mailchimp.UserResponse
+import com.droidfeed.data.api.mailchimp.model.Subscriber
+import com.droidfeed.data.api.mailchimp.model.UserResponse
 import retrofit2.Call
 import retrofit2.http.Body
 import retrofit2.http.POST

diff --git a/app/src/main/java/com/droidfeed/data/repo/NewsletterRepo.kt b/app/src/main/java/com/droidfeed/data/repo/NewsletterRepo.kt
@@ -2,8 +2,8 @@ package com.droidfeed.data.repo
 
 import com.droidfeed.data.DataStatus
 import com.droidfeed.data.api.mailchimp.ErrorAdapter
-import com.droidfeed.data.api.mailchimp.MailchimpError
-import com.droidfeed.data.api.mailchimp.Subscriber
+import com.droidfeed.data.api.mailchimp.model.MailchimpError
+import com.droidfeed.data.api.mailchimp.model.Subscriber
 import com.droidfeed.data.api.mailchimp.service.NewsletterService
 import com.droidfeed.util.extention.suspendingEnqueue
 import com.google.firebase.remoteconfig.FirebaseRemoteConfig
@@ -28,6 +28,7 @@ class NewsletterRepo @Inject constructor(
         try {
             val listId = remoteConfig.getString("mc_newsletter_list_id")
             newsletterService.addSubscriber(listId, subscriber).suspendingEnqueue()
+
             DataStatus.Successful()
         } catch (e: HttpException) {
             when (e.code()) {

diff --git a/app/src/main/java/com/droidfeed/ui/adapter/viewholder/ConferenceViewHolder.kt b/app/src/main/java/com/droidfeed/ui/adapter/viewholder/ConferenceViewHolder.kt
@@ -18,7 +18,6 @@ open class ConferenceViewHolder(
             itemCard.setOnClickListener {
                 onItemClick(conference)
             }
-
         }
     }
 }
diff --git a/app/src/main/java/com/droidfeed/ui/binding/CommonBindingAdapters.kt b/app/src/main/java/com/droidfeed/ui/binding/CommonBindingAdapters.kt
@@ -80,9 +80,9 @@ fun loadImage(
 @BindingAdapter("app:displayUrl")
 fun displayUrl(
     webView: WebView,
-    url: String
+    url: String?
 ) {
-    webView.loadUrl(url)
+    url?.let { webView.loadUrl(it) }
 }
 
 @BindingAdapter("app:relativeTimestamp")

diff --git a/app/src/main/java/com/droidfeed/ui/module/feed/FeedFragment.kt b/app/src/main/java/com/droidfeed/ui/module/feed/FeedFragment.kt
@@ -50,7 +50,7 @@ class FeedFragment : BaseFragment("feed"), Scrollable {
             .get(FeedViewModel::class.java)
 
         mainViewModel = ViewModelProviders
-            .of(activity!!)
+            .of(activity!!, viewModelFactory)
             .get(MainViewModel::class.java)
     }
 

diff --git a/app/src/main/java/com/droidfeed/ui/module/newsletter/NewsletterViewModel.kt b/app/src/main/java/com/droidfeed/ui/module/newsletter/NewsletterViewModel.kt
@@ -1,15 +1,16 @@
 package com.droidfeed.ui.module.newsletter
 
+import android.util.Log
 import android.util.Patterns
 import androidx.annotation.StringRes
 import androidx.lifecycle.MutableLiveData
 import com.droidfeed.BuildConfig
 import com.droidfeed.R
 import com.droidfeed.data.DataStatus
-import com.droidfeed.data.api.mailchimp.ErrorType
-import com.droidfeed.data.api.mailchimp.MailchimpError
-import com.droidfeed.data.api.mailchimp.Subscriber
-import com.droidfeed.data.api.mailchimp.SubscriptionStatus
+import com.droidfeed.data.api.mailchimp.model.ErrorType
+import com.droidfeed.data.api.mailchimp.model.MailchimpError
+import com.droidfeed.data.api.mailchimp.model.Subscriber
+import com.droidfeed.data.api.mailchimp.model.SubscriptionStatus
 import com.droidfeed.data.repo.NewsletterRepo
 import com.droidfeed.ui.common.BaseViewModel
 import com.droidfeed.util.AnalyticsUtil
@@ -74,6 +75,8 @@ class NewsletterViewModel @Inject constructor(
     }
 
     private fun handleSignUpResponse(dataStatus: DataStatus<MailchimpError>) {
+        Log.e("JAMIRYO", "5---- $dataStatus")
+
         when (dataStatus) {
             is DataStatus.Successful -> {
                 isEmailInputVisible.postValue(false)

diff --git a/app/src/main/java/com/droidfeed/util/DebugUtils.kt b/app/src/main/java/com/droidfeed/util/DebugUtils.kt
@@ -11,9 +11,9 @@ private const val TAG = "DroidFeed"
  *
  * @param throwable
  */
-fun logThrowable(throwable: Throwable) {
+fun logThrowable(throwable: Throwable?) {
     if (BuildConfig.DEBUG) {
-        throwable.printStackTrace()
+        throwable?.printStackTrace()
     } else {
         Crashlytics.logException(throwable)
     }

diff --git a/app/src/main/res/layout/fragment_newsletter.xml b/app/src/main/res/layout/fragment_newsletter.xml
@@ -117,7 +117,7 @@
             android:layout_marginTop="@dimen/spacing_small"
             android:layout_marginEnd="@dimen/spacing_xlarge"
             android:backgroundTint="@color/colorAccent"
-            android:onClick="@{(v)->viewModel.signUp(edtEmail.getText().toString)}"
+            android:onClick="@{(v)->viewModel.signUp(edtEmail.getText().toString())}"
             android:text="@string/sign_me_up"
             app:isVisible="@{viewModel.isSignButtonVisible}"
             app:layout_constraintEnd_toEndOf="parent"

diff --git a/app/src/test/java/com/droidfeed/OnBoardViewModelTest.kt b/app/src/test/java/com/droidfeed/OnBoardViewModelTest.kt
@@ -16,7 +16,6 @@ import org.junit.runners.JUnit4
 import org.mockito.ArgumentMatchers
 import org.mockito.Mockito.*
 
-
 @Suppress("TestFunctionName")
 @RunWith(JUnit4::class)
 class OnBoardViewModelTest {
@@ -80,7 +79,6 @@ class OnBoardViewModelTest {
         verify(observer).onChanged(false)
     }
 
-
     @Test
     fun WHEN_continue_button_is_clicked_THEN_open_main_activity() {
         runBlocking {
@@ -95,5 +93,4 @@ class OnBoardViewModelTest {
 
         verify(observer, only()).onChanged(ArgumentMatchers.any())
     }
-
 }
diff --git a/build.gradle b/build.gradle
@@ -8,7 +8,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.3.1'
+        classpath 'com.android.tools.build:gradle:3.3.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$versions.kotlin"
         classpath "org.jetbrains.kotlin:kotlin-android-extensions:$versions.kotlin"
         classpath "io.fabric.tools:gradle:$versions.fabric_gradle"

diff --git a/dependencies.gradle b/dependencies.gradle
@@ -17,7 +17,7 @@ ext.versions = [
         crashlytics           : '2.9.9',
         detekt_ktlint         : '1.0.0-RC14',
         firebase_core         : '16.0.7',
-        firebase_config       : '16.3.0',
+        firebase_config       : '16.1.3',
         firebase_firestore    : '18.0.1',
         okHttp                : '3.13.1',
         jSoup                 : '1.11.3',

diff --git a/gradle.properties b/gradle.properties
@@ -13,6 +13,7 @@ android.enableJetifier=true
 android.useAndroidX=true
 org.gradle.jvmargs=-Xmx4096M
 android.databinding.enableV2=true
+android.enableR8 = true
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects