Merge pull request #702 from PhenoApps/string-and-minify-fixes

strings and minify
PhenoApps · Aug 4, 2023 · 1301ae4 · 1301ae4
2 parents 7781a49 + 10d3773
commit 1301ae4
Show file tree

Hide file tree

Showing 12 changed files with 860 additions and 893 deletions.
diff --git a/.gitignore b/.gitignore
@@ -24,9 +24,6 @@ gradlew.bat
 # Local configuration file (sdk path, etc)
 local.properties
 
-# Proguard folder generated by Eclipse
-proguard/
-
 # Log Files
 *.log
 

diff --git a/app/build.gradle b/app/build.gradle
@@ -77,8 +77,9 @@ android {
         debug {
             clean
             debuggable true
+            minifyEnabled true
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
             manifestPlaceholders = [crashlyticsCollectionEnabled: "false"]
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
 

diff --git a/app/proguard-rules.txt b/app/proguard-rules.txt
@@ -0,0 +1,2 @@
+-keep public class com.fieldbook.tracker.**
+
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
diff --git a/app/src/main/res/values/strings_about.xml b/app/src/main/res/values/strings_about.xml
diff --git a/app/src/main/res/values/strings_brapi.xml b/app/src/main/res/values/strings_brapi.xml