feat: Enable proguard and fix minor bugs

amu-oss · Nov 24, 2017 · 2eb5fe9 · 2eb5fe9
1 parent f55ab03
commit 2eb5fe9
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 2 deletions.
diff --git a/app/.gitignore b/app/.gitignore
@@ -1 +1,2 @@
 /build
+/release
diff --git a/app/build.gradle b/app/build.gradle
@@ -27,7 +27,8 @@ android {
     }
     buildTypes {
         release {
-            minifyEnabled false
+            minifyEnabled true
+            shrinkResources true
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }

diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
@@ -19,3 +19,12 @@
 # If you keep the line number information, uncomment this to
 # hide the original source file name.
 #-renamesourcefileattribute SourceFile
+
+-dontwarn javax.annotation**
+-dontwarn com.google.errorprone.annotations.*
+
+-keep class io.amu.oss.data.model.** {
+  *;
+}
+
+-keepattributes SourceFile,LineNumberTable,*Annotation*,EnclosingMethod,Signature,Exceptions,InnerClasses
diff --git a/app/src/main/java/io/amu/oss/data/model/Notification.kt b/app/src/main/java/io/amu/oss/data/model/Notification.kt
@@ -3,7 +3,7 @@ package io.amu.oss.data.model
 data class Notification(
         val title: String = "Notification Update",
         val body: String = "",
-        val color: String = "#aaa",
+        val color: String = "#aaaaaa",
         val timestamp: String? = null,
         val skip: Boolean = false,
         val sent: Boolean = false,