v17.3 (#167)

* Update butterknife to latest version * Update eventbus to latest version * Update firebase to latest version * Update appcompat library to latest version * Update material library to latest version * Update to latest buildToolsVersion * Replace old crashlytics with firebase crashlytics * Add dark mode (#157) This PR adds dark mode for devices running Android Q and later. Co-authored-by: John Slavick <[email protected]> * Force Dark Mode Tweaks (#160) * Disable forced dark mode on StreakWidget * Add isAppInDarkMode * Change moving average color to be more legible in dark mode * Only call `setForceDarkAllowed` if device SDK >= 29 * Disable force dark mode on food and tweak history calendars and set card background to gray * Revert "Force Dark Mode Tweaks (#160)" This reverts commit 6171f76. * Revert "Add dark mode (#157)" This reverts commit 13aefb5. * Polish Translation with some correlated Android/Apple updates (#166) * [email protected]:marc-medley/daily-dozen-android.git * Add Polish translation. Sets Chickpeas/Garbanzo Beans as a single synonym item. Treats arrays with <item>@.../... as translatable="false". * Update gradle and third party libs * Update version * Remove outdated version history Co-authored-by: jordansieve <[email protected]> Co-authored-by: --marc <[email protected]>
nutritionfactsorg · Mar 7, 2021 · f9c6c2c · f9c6c2c
1 parent eae5fbc
commit f9c6c2c
Show file tree

Hide file tree

Showing 16 changed files with 656 additions and 340 deletions.
diff --git a/README.md b/README.md
@@ -47,82 +47,6 @@ Contributors
 
 Special thanks to the volunteer efforts of the creators of the previous app: Chan Kruse, Allan Portera, and Sangeeta Kumar
 
-Updates
--------
-
-### Version 16
-- Add Plant-based Omega 3s - thanks to contributor [lucivpav](https://github.com/lucivpav)
-- Fixed non-smooth scrolling - thanks to contributor [DJTai](https://github.com/DJTai)
-- Added Italian translation - thanks to contributor [lucab85](https://github.com/lucab85)
-- Added Portuguese translation - thanks to contributor [Armfoot](https://github.com/Armfoot)
-- Fixed bug on history screen where missing days weren't being shown
-- Updated icons
-
-### Version 15.1
-- Fixed crash for Romanian and Chinese users when opening information for Whole Grains
-
-### Version 15
-- Added support for deploying to F-Droid - thanks to contributor [alibitek](https://github.com/alibitek)
-- Added Chinese translation - thanks to contributor [rahul577](https://github.com/rahul577)
-- Added Romanian translation - thanks to contributor [alibitek](https://github.com/alibitek)
-- Added Russian translation - thanks to contributor [ChadoNihi](https://github.com/ChadoNihi)
-
-### Version 14
-- Added CheckBoxes for Vitamin B12 and Vitamin D
-
-### Version 13.1
-- Fixed minor bug where notification was not being dismissed unless the app was opened from the notification
-- Improvements to the German translation - thanks to contributor [caugner](https://github.com/caugner)
-
-### Version 13
-- Can now switch between metric and Imperial units
-- Tapping on a date in the calendar or chart view now takes you to that date
-- Reverted the MPAndroidChart version as the newer library was causing crashes
-
-### Version 12.2
-- Fixed black background issue on Samsung devices
-- You can now move the app to your device's SD card
-
-### Version 12
-- Improved performance and functionality of the Daily Servings History graph
-- Redesigned checkbox layout to improve support for translations and small screens
-- Added Spanish translation - thanks to contributor Monica Suarez
-- Added French translation - thanks to contributor [vgstef](https://github.com/vgstef)
-- Added Dutch translation - thanks to contributor [gfvpelt](https://github.com/gfvpelt)
-- Added Bulgarian translation - thanks to contributor [haripetrov](https://github.com/haripetrov)
-- Added Greek translation - thanks to contributor [kapcom01](https://github.com/kapcom01)
-
-### Version 11
-- Added German translation - thanks to contributor [MovGP0](https://github.com/MovGP0)
-- Improved CheckBox functionality - thanks to contributor [notmypassword](https://github.com/notmypassword)
-- Fixed swapped images - thanks to contributor [myang310](https://github.com/myang310)
-- Fixed bug where last CheckBox for Beverages was hidden on devices with small screens
-- Fixed a few minor crashes
-
-### Version 10
-- Added links to videos on nutritionfacts.org. These links are for overall food groups like beans and greens, but also for specific foods like chickpeas and spinach.
-- Fixed bug where update reminder alarm was not being set when the device restarted.
-- Fixed very rare OutOfMemoryError crash when loading the large food images.
-- Upgraded to ButterKnife 8.1.0
-
-### Version 9
-- Added a Daily Reminder to update your servings
-- Fixed bug where every other day was being skipped in the daily servings chart
-- Fixed bug where failing to load the image in FoodInfoActivity was crashing the app
-- Removed allowBackup="false" from AndroidManifest.xml. This will allow devices running Marshmallow and later to automatically backup to the user's Google Account.
-- Upgraded to ButterKnife 8.0.1
-
-### Version 8 - Completely new app
-- Entries are now persisted over time and can be graphed and charted
-- Added streaks so you can see at a glance how many days you have met your required servings
-- History can be backed up to a comma-separated values text file
-
-### 1.0.1 - 1.0.2 (Google Play)
-- Misspelling fix
-
-### 1.0.0 (Google Play)
-- Initial Release
-
 [nutritionfacts.org]: http://nutritionfacts.org "NutritionFacts.org - The Latest in Nutrition Research"
 [contribute]: https://github.com/nutritionfactsorg/daily-dozen-android/blob/master/CONTRIBUTING.md "Contribute to the Daily Dozen Android App"
 [donate]: https://nutritionfacts.org/donate "Donate to NutritionFacts.org"

diff --git a/app/build.gradle b/app/build.gradle
@@ -2,7 +2,6 @@ buildscript {
     repositories {
         mavenCentral()
         google()
-        maven { url 'https://maven.fabric.io/public' }
     }
 
     dependencies {
@@ -11,7 +10,8 @@ buildscript {
 }
 apply plugin: 'com.android.application'
 apply plugin: 'com.jakewharton.hugo'
-apply plugin: 'io.fabric'
+apply plugin: 'com.google.gms.google-services'
+apply plugin: 'com.google.firebase.crashlytics'
 
 repositories {
     mavenCentral()
@@ -26,7 +26,7 @@ configurations {
 
 android {
     compileSdkVersion 29
-    buildToolsVersion '28.0.3'
+    buildToolsVersion '29.0.3'
 
     compileOptions {
        sourceCompatibility JavaVersion.VERSION_1_8
@@ -37,8 +37,8 @@ android {
         minSdkVersion 16
         targetSdkVersion 29
         vectorDrawables.useSupportLibrary = true
-        versionCode 54
-        versionName "17.2"
+        versionCode 55
+        versionName "17.3"
     }
     buildTypes {
         debug {
@@ -64,21 +64,19 @@ android {
 }
 
 dependencies {
-    implementation 'com.google.firebase:firebase-analytics:17.2.2'
-    implementation 'com.crashlytics.sdk.android:crashlytics:2.10.1'
-    implementation 'androidx.appcompat:appcompat:1.1.0'
+    implementation 'com.google.firebase:firebase-analytics:18.0.2'
+    implementation 'com.google.firebase:firebase-crashlytics:17.3.1'
+    implementation 'androidx.appcompat:appcompat:1.2.0'
     implementation 'androidx.cardview:cardview:1.0.0'
-    implementation 'com.google.android.material:material:1.0.0'
+    implementation 'com.google.android.material:material:1.3.0'
     implementation 'com.michaelpardo:activeandroid:3.1.0-SNAPSHOT'
     implementation 'com.darwinsys:hirondelle-date4j:1.5.1'
     implementation 'com.github.prolificinteractive:material-calendarview:2.0.1'
     implementation('com.joanzapata.iconify:android-iconify-fontawesome:2.2.2') { exclude group: "com.android.support" }
     implementation('com.github.PhilJay:MPAndroidChart:v2.2.5') { exclude group: "com.android.support" }
-    implementation('org.greenrobot:eventbus:3.1.1') { exclude group: "com.android.support" }
-    implementation 'com.jakewharton:butterknife:10.2.1'
-    annotationProcessor 'com.jakewharton:butterknife-compiler:10.2.1'
+    implementation('org.greenrobot:eventbus:3.2.0') { exclude group: "com.android.support" }
+    implementation 'com.jakewharton:butterknife:10.2.3'
+    annotationProcessor 'com.jakewharton:butterknife-compiler:10.2.3'
     implementation 'com.google.code.gson:gson:2.8.5'
     implementation 'com.jakewharton.timber:timber:4.7.1'
 }
-
-apply plugin: 'com.google.gms.google-services'
diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml
@@ -28,7 +28,6 @@
     <string name="donate">Направете дарение</string>
     <string name="subscribe">Абонирай се</string>
     <string name="open_source">Отворен код</string>
-    <string name="library_butterknife">ButterKnife</string>
     <string name="permission_needed_to_write_storage">Не може да направите резервно копие без да имате права за писане върху паметта</string>
     <string name="backup_failed">Задачата за създаване на архив е неуспешна</string>
     <string name="restore_failed">Процесът по възстановяване на информация от архив е неуспешен</string>
@@ -148,7 +147,6 @@
         <item>Нахут</item>
         <item>Едамаме</item>
         <item>Английски грах</item>
-        <item>Нахут тип Гарбанзо</item>
         <item>Едър боб</item>
         <item>Бъбрековиден боб</item>
         <item>Леща (белуга, френска и червени сортове)</item>

diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
@@ -37,7 +37,6 @@
     <string name="not_now">Nicht jetzt</string>
     <string name="no_servings_recorded">Du hast noch keine Portionen aufgezeichnet!</string>
     <string name="no">Nein</string>
-    <string name="library_butterknife">Buttermesser</string>
     <string name="latest_videos">Neueste Videos</string>
     <string name="history_to_generate">Zu erstellender Verlauf</string>
     <string name="history">Verlauf</string>
@@ -82,22 +81,6 @@
     <string name="units">Einheiten</string>
     <string name="imperial">Englisch</string>
     <string name="metric">Metrisch</string>
-
-    <string-array name="food_names">
-        <item>@string/beans</item>
-        <item>@string/berries</item>
-        <item>@string/other_fruits</item>
-        <item>@string/cruciferous_vegetables</item>
-        <item>@string/greens</item>
-        <item>@string/other_vegetables</item>
-        <item>@string/flaxseeds</item>
-        <item>@string/nuts</item>
-        <item>@string/spices</item>
-        <item>@string/whole_grains</item>
-        <item>@string/beverages</item>
-        <item>@string/exercise</item>
-        <item>@string/vitamin_b12</item>
-    </string-array>
 
     <string-array name="about_text_lines">
         <item>Diese Anwendung wurde von John Slavick erstellt.</item>
@@ -140,7 +123,6 @@
         <item>Kichererbsen</item>
         <item>Edamame</item>
         <item>Englische Erbsen</item>
-        <item>Kichererbsen</item>
         <item>Great Northern Bohnen</item>
         <item>Kidney-Bohnen</item>
         <item>Linsen (Beluga, französisch, oder rote Sorten)</item>

diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml
@@ -28,7 +28,6 @@
     <string name="donate">Δωρεά</string>
     <string name="subscribe">Εγγραφή</string>
     <string name="open_source">Ανοιχτός Κώδικας</string>
-    <string name="library_butterknife">Μαχαίρι Βουτύρου</string>
     <string name="permission_needed_to_write_storage">Αδύνατη η δημιουργία αντιγράφου ασφαλείας χωρίς δικαιώματα εγγραφής στον αποθηκευτικό χώρο</string>
     <string name="backup_failed">Απέτυχε το αντίγραφο ασφαλείας</string>
     <string name="restore_failed">Απέτυχε η επαναφορά αντιγράφου ασφαλείας</string>
@@ -82,31 +81,6 @@
     <string name="imperial">Αγγλοσαξονικό</string>
     <string name="metric">Μετρικό</string>
 
-    <string-array name="food_names">
-        <item>@string/beans</item>
-        <item>@string/berries</item>
-        <item>@string/other_fruits</item>
-        <item>@string/cruciferous_vegetables</item>
-        <item>@string/greens</item>
-        <item>@string/other_vegetables</item>
-        <item>@string/flaxseeds</item>
-        <item>@string/nuts</item>
-        <item>@string/spices</item>
-        <item>@string/whole_grains</item>
-        <item>@string/beverages</item>
-        <item>@string/exercise</item>
-        <item>@string/vitamin_b12</item>
-    </string-array>
-
-    <string-array name="notification_icon_food_names">
-        <item>@string/beans</item>
-        <item>@string/berries</item>
-        <item>@string/other_fruits</item>
-        <item>@string/cruciferous_vegetables</item>
-        <item>@string/other_vegetables</item>
-        <item>@string/spices</item>
-    </string-array>
-
     <string-array name="about_text_lines">
         <item>Η εφαρμογή δημιουργήθηκε από τον John Slavick.</item>
         <item/>
@@ -148,7 +122,6 @@
         <item>Ρεβίθια</item>
         <item>Ενταμάμε</item>
         <item>Αρακάς</item>
-        <item>Ρεβίθια</item>
         <item>Μεγάλα βόρεια</item>
         <item>Κόκκινα</item>
         <item>Φακές (μαύρες beluga, γαλλικές, και κόκκινες ποικιλίες)</item>

diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
@@ -28,7 +28,6 @@
     <string name="donate">Donación</string>
     <string name="subscribe">Suscríbete</string>
     <string name="open_source">Código abierto</string>
-    <string name="library_butterknife">ButterKnife</string>
     <string name="permission_needed_to_write_storage">No puedes hacer copias de seguridad si no tienes permiso para guardarlas en el disco duro.</string>
     <string name="backup_failed">Copia de seguridad fallida</string>
     <string name="restore_failed">Restauración fallida</string>
@@ -82,31 +81,6 @@
     <string name="imperial">Imperial</string>
     <string name="metric">Métrico</string>
 
-    <string-array name="food_names">
-        <item>@string/beans</item>
-        <item>@string/berries</item>
-        <item>@string/other_fruits</item>
-        <item>@string/cruciferous_vegetables</item>
-        <item>@string/greens</item>
-        <item>@string/other_vegetables</item>
-        <item>@string/flaxseeds</item>
-        <item>@string/nuts</item>
-        <item>@string/spices</item>
-        <item>@string/whole_grains</item>
-        <item>@string/beverages</item>
-        <item>@string/exercise</item>
-        <item>@string/vitamin_b12</item>
-    </string-array>
-
-    <string-array name="notification_icon_food_names">
-        <item>@string/beans</item>
-        <item>@string/berries</item>
-        <item>@string/other_fruits</item>
-        <item>@string/cruciferous_vegetables</item>
-        <item>@string/other_vegetables</item>
-        <item>@string/spices</item>
-    </string-array>
-
     <string-array name="about_text_lines">
         <item>Esta app fue creada por John Slavick.</item>
         <item />
@@ -148,7 +122,6 @@
         <item>Garbanzos</item>
         <item>Edamame</item>
         <item>Guisantes</item>
-        <item>Garbanzos</item>
         <item>Frijoles Great Northern</item>
         <item>Frijoles rojos</item>
         <item>Lentejas (beluga, francesa, roja)</item>

diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
@@ -29,7 +29,6 @@
     <string name="donate">Faire un don</string>
     <string name="subscribe">Souscrire</string>
     <string name="open_source">Open source</string>
-    <string name="library_butterknife">ButterKnife</string>
     <string name="permission_needed_to_write_storage">Ne peut pas sauvegarder sans autorisation d\'écrire dans le stockage</string>
     <string name="backup_failed">Échec de la sauvegarde</string>
     <string name="restore_failed">échec de la restauration</string>
@@ -83,31 +82,6 @@
     <string name="imperial">Impérial</string>
     <string name="metric">Métrique</string>
 
-    <string-array name="food_names">
-        <item>@string/beans</item>
-        <item>@string/berries</item>
-        <item>@string/other_fruits</item>
-        <item>@string/cruciferous_vegetables</item>
-        <item>@string/greens</item>
-        <item>@string/other_vegetables</item>
-        <item>@string/flaxseeds</item>
-        <item>@string/nuts</item>
-        <item>@string/spices</item>
-        <item>@string/whole_grains</item>
-        <item>@string/beverages</item>
-        <item>@string/exercise</item>
-        <item>@string/vitamin_b12</item>
-    </string-array>
-
-    <string-array name="notification_icon_food_names">
-        <item>@string/beans</item>
-        <item>@string/berries</item>
-        <item>@string/other_fruits</item>
-        <item>@string/cruciferous_vegetables</item>
-        <item>@string/other_vegetables</item>
-        <item>@string/spices</item>
-    </string-array>
-
     <string-array name="about_text_lines">
         <item>Cette application a été créée par John Slavick.</item>
         <item />
@@ -149,7 +123,6 @@
         <item>Pois chiches</item>
         <item>Edamame</item>
         <item>Pois à écosser</item>
-        <item>Pois chiches</item>
         <item>Haricots blancs</item>
         <item>Haricots rouges</item>
         <item>Lentilles (variétés beluga, françaises et rouges)</item>

diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
@@ -28,7 +28,6 @@
     <string name="donate">Donare</string>
     <string name="subscribe">Sottoscrivi</string>
     <string name="open_source">Open Source</string>
-    <string name="library_butterknife">ButterKnife</string>
     <string name="permission_needed_to_write_storage">Non puoi eseguire backup senza il permesso di scrittura nell\'archivio</string>
     <string name="backup_failed">Backup non riuscito</string>
     <string name="restore_failed">Ripristino fallito</string>
@@ -82,31 +81,6 @@
     <string name="imperial">Imperiali</string>
     <string name="metric">Metriche</string>
 
-    <string-array name="food_names">
-        <item>@string/beans</item>
-        <item>@string/berries</item>
-        <item>@string/other_fruits</item>
-        <item>@string/cruciferous_vegetables</item>
-        <item>@string/greens</item>
-        <item>@string/other_vegetables</item>
-        <item>@string/flaxseeds</item>
-        <item>@string/nuts</item>
-        <item>@string/spices</item>
-        <item>@string/whole_grains</item>
-        <item>@string/beverages</item>
-        <item>@string/exercise</item>
-        <item>@string/vitamin_b12</item>
-    </string-array>
-
-    <string-array name="notification_icon_food_names">
-        <item>@string/beans</item>
-        <item>@string/berries</item>
-        <item>@string/other_fruits</item>
-        <item>@string/cruciferous_vegetables</item>
-        <item>@string/other_vegetables</item>
-        <item>@string/spices</item>
-    </string-array>
-
     <integer-array name="food_quantities">
         <item>3</item>
         <item>1</item>
@@ -165,7 +139,6 @@
         <item>Ceci</item>
         <item>Fagioli di soia (edamame)</item>
         <item>Piselli inglesi</item>
-        <item>Ceci Garbanzo</item>
         <item>Fagioli grandi del nord</item>
         <item>Fagioli rossi</item>
         <item>Lenticchie (beluga, francese e varietà rossa)</item>