v28 (#258)

* Upgrade gradle to latest version

* Upgrade firebase dependencies

* Increase minSdkVersion from 21 to 26 to get access to java.time

* Replace com.darwinsys:hirondelle-date4j with java.time

* Refactor to use LocalDate instead of LocalDateTime

* Remove date4j license mentions

* Fix "can be replaced with 'List.sort()'" warnings

* Fix code warning

* Fix warnings caused by increasing minSdkVersion to 26

* Enable automatic per-app language preference support by following https://developer.android.com/guide/topics/resources/app-languages#auto-localeconfig

* Remove unused imports

* Remove default zone id args

* Deduplicate DateTimeFormatters and remove default locale args

* Update firebase-crashlytics

* Change format from "day of year" to "day of month"

* Upgrade to latest gradle

* Remove getMonthNum in favor of getMonthValue

* Fix build.gradle warnings

* Improve performance of getDaysAfter by removing unnecessary type conversions

* Calculate streaks during restore

* Use date long instead of string

* Simplify recalculateStreak

* Update versionCode and versionName

* Replace deprecated `androidx.viewpager.widget.ViewPager` with `androidx.viewpager2.widget.ViewPager2`

* Replace deprecated function call

* Undo changes to fragment_tweaks.xml

* Remove deprecated ProgressDialogs from history activities. Not replacing these as they only ever flashed briefly.

* Replace ProgressDialog with ProgressBar

* Simplify day change detection algorithm

* Add loading indicator when changing time scale

* Call recreate to fix rendering issue after backing up data

* Upgrade firebase dependencies

* Upgrade dependencies

* Fix warnings

* Update to sdk 35

* Add android:fitsSystemWindows="true" to AppBarLayouts

* Add android:clipToPadding="false" to RecyclerViews

* Add DailyDozenActivity to encapsulate edge-to-edge UI handling

* Fix status bar display

* Translation update v06. Adds Hungarian_hu translation. (#262)

* Update: v06 translations. Adds Hungarian_hu.

* [FIX] Applies primary level Hungarian quotation marks „ (U+201E) ” (U+201D).

* Adds Lychees video topic.

* Hungarian update "CHECKED_Hungarian_hu.app.v06.DoubleCheck.tsv.txt"

- nutritionfactsorg/daily-dozen-localization#53 (comment)

* Fix broken video links caused by removing strings from food_info_type_* string arrays

---------

Co-authored-by: --marc <[email protected]>

Author: slavick

app/build.gradle

@@ -20,6 +20,9 @@ configurations {
 }
 
 android {
+    androidResources {
+        generateLocaleConfig = true
+    }
     buildFeatures {
         buildConfig = true
         viewBinding = true
@@ -30,13 +33,13 @@ android {
     }
     defaultConfig {
         applicationId "org.nutritionfacts.dailydozen"
-        minSdkVersion 21
+        minSdkVersion 26
         multiDexEnabled true
-        compileSdk 34
-        targetSdkVersion 34
+        compileSdk 35
+        targetSdkVersion 35
         vectorDrawables.useSupportLibrary = true
-        versionCode 91
-        versionName "27"
+        versionCode 92
+        versionName "28"
     }
     buildTypes {
         debug {
@@ -50,7 +53,7 @@ android {
         }
     }
 
-    flavorDimensions "store"
+    flavorDimensions = ["store"]
     productFlavors {
         play {
             dimension "store"
@@ -63,18 +66,18 @@ android {
 }
 
 dependencies {
-    implementation 'com.google.firebase:firebase-analytics:22.1.0'
-    implementation 'com.google.firebase:firebase-crashlytics:19.1.0'
-    implementation 'androidx.appcompat:appcompat:1.7.0'
+    implementation 'com.google.firebase:firebase-analytics:22.5.0'
+    implementation 'com.google.firebase:firebase-crashlytics:19.4.4'
+    implementation 'androidx.appcompat:appcompat:1.7.1'
     implementation 'androidx.cardview:cardview:1.0.0'
+    implementation 'androidx.viewpager2:viewpager2:1.1.0'
     implementation 'com.google.android.material:material:1.12.0'
     implementation fileTree(include: ['*.jar'], dir: 'libs')
-    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.3.1') { exclude group: "com.android.support" }
-    implementation 'com.google.code.gson:gson:2.10.1'
+    implementation 'com.google.code.gson:gson:2.13.1'
     implementation 'com.jakewharton.timber:timber:5.0.1'
     implementation "io.noties.markwon:core:4.6.2"
 }

app/src/main/java/likeanimation/CircleView.java

@@ -15,10 +15,10 @@ public class CircleView extends View {
     private static final int START_COLOR = 0xFFFF5722;
     private static final int END_COLOR = 0xFFFFC107;
 
-    private ArgbEvaluator argbEvaluator = new ArgbEvaluator();
+    private final ArgbEvaluator argbEvaluator = new ArgbEvaluator();
 
-    private Paint circlePaint = new Paint();
-    private Paint maskPaint = new Paint();
+    private final Paint circlePaint = new Paint();
+    private final Paint maskPaint = new Paint();
 
     private Bitmap tempBitmap;
     private Canvas tempCanvas;

app/src/main/java/likeanimation/DotsView.java

@@ -34,7 +34,7 @@ public class DotsView extends View {
     private float currentDotSize2 = 0;
     private float currentRadius2 = 0;
 
-    private ArgbEvaluator argbEvaluator = new ArgbEvaluator();
+    private final ArgbEvaluator argbEvaluator = new ArgbEvaluator();
 
     public DotsView(Context context) {
         super(context);

app/src/main/java/likeanimation/LikeButtonView.java

@@ -53,9 +53,9 @@ public LikeButtonView(Context context, AttributeSet attrs, int defStyleAttr, int
     private void init() {
         LayoutInflater.from(getContext()).inflate(R.layout.view_like_button, this, true);
 
-        ivStar = (TextView) findViewById(R.id.ivStar);
-        vDotsView = (DotsView) findViewById(R.id.vDotsView);
-        vCircle = (CircleView) findViewById(R.id.vCircle);
+        ivStar = findViewById(R.id.ivStar);
+        vDotsView = findViewById(R.id.vDotsView);
+        vCircle = findViewById(R.id.vCircle);
 
         setOnClickListener(this);
     }

app/src/main/java/org/nutritionfacts/dailydozen/activity/AboutActivity.java

@@ -10,14 +10,13 @@
 import android.widget.TextView;
 
 import androidx.appcompat.app.ActionBar;
-import androidx.appcompat.app.AppCompatActivity;
 
 import org.nutritionfacts.dailydozen.BuildConfig;
 import org.nutritionfacts.dailydozen.Common;
 import org.nutritionfacts.dailydozen.R;
 import org.nutritionfacts.dailydozen.databinding.ActivityAboutBinding;
 
-public class AboutActivity extends AppCompatActivity {
+public class AboutActivity extends DailyDozenActivity {
     private ActivityAboutBinding binding;
 
     @Override

app/src/main/java/org/nutritionfacts/dailydozen/activity/DailyDozenActivity.java

@@ -0,0 +1,29 @@
+package org.nutritionfacts.dailydozen.activity;
+
+import android.os.Bundle;
+import android.view.ViewGroup;
+
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.core.graphics.Insets;
+import androidx.core.view.ViewCompat;
+import androidx.core.view.WindowInsetsCompat;
+
+public class DailyDozenActivity extends AppCompatActivity {
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        applyWindowInsets(findViewById(android.R.id.content));
+    }
+
+    protected void applyWindowInsets(ViewGroup viewGroup) {
+        ViewCompat.setOnApplyWindowInsetsListener(viewGroup,
+                (v, windowInsets) -> {
+                    Insets insets = windowInsets.getInsets(WindowInsetsCompat.Type.systemBars());
+                    v.setPadding(insets.left, insets.top, insets.right, insets.bottom);
+
+                    // Return CONSUMED if you don't want the window insets to keep passing
+                    // down to descendant views.
+                    return WindowInsetsCompat.CONSUMED;
+                });
+    }
+}

app/src/main/java/org/nutritionfacts/dailydozen/activity/DailyReminderSettingsActivity.java

@@ -7,7 +7,6 @@
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import androidx.appcompat.app.AppCompatActivity;
 import androidx.recyclerview.widget.LinearLayoutManager;
 
 import org.greenrobot.eventbus.Subscribe;
@@ -21,7 +20,7 @@
 import org.nutritionfacts.dailydozen.util.DateUtil;
 import org.nutritionfacts.dailydozen.util.NotificationUtil;
 
-public class DailyReminderSettingsActivity extends AppCompatActivity implements TimePickerDialog.OnTimeSetListener {
+public class DailyReminderSettingsActivity extends DailyDozenActivity implements TimePickerDialog.OnTimeSetListener {
     private ActivityNotificationSettingsBinding binding;
 
     protected DailyReminderAdapter reminderAdapter;

app/src/main/java/org/nutritionfacts/dailydozen/activity/DebugActivity.java

@@ -1,14 +1,12 @@
 package org.nutritionfacts.dailydozen.activity;
 
-import android.app.ProgressDialog;
 import android.os.Bundle;
 import android.view.View;
 import android.widget.AdapterView;
 import android.widget.ArrayAdapter;
 
 import androidx.annotation.NonNull;
 import androidx.appcompat.app.AlertDialog;
-import androidx.appcompat.app.AppCompatActivity;
 
 import org.nutritionfacts.dailydozen.Common;
 import org.nutritionfacts.dailydozen.R;
@@ -22,11 +20,9 @@
 
 import timber.log.Timber;
 
-public class DebugActivity extends AppCompatActivity implements AdapterView.OnItemSelectedListener, ProgressListener {
+public class DebugActivity extends DailyDozenActivity implements AdapterView.OnItemSelectedListener, ProgressListener {
     private ActivityDebugBinding binding;
 
-    private ProgressDialog progressDialog;
-
     private int historyToGenerate;
 
     @Override
@@ -144,29 +140,19 @@ public void onRequestPermissionsResult(int requestCode, @NonNull String[] permis
 
     @Override
     public void showProgressBar(int titleId) {
-        progressDialog = new ProgressDialog(this);
-        progressDialog.setIndeterminate(false);
-        progressDialog.setProgressStyle(ProgressDialog.STYLE_HORIZONTAL);
-        progressDialog.setTitle(titleId);
-        progressDialog.show();
+        binding.debugProgressBarContainer.setVisibility(View.VISIBLE);
+        binding.debugProgressText.setText(titleId);
+        binding.debugProgressBar.setProgress(0);
     }
 
     @Override
     public void updateProgressBar(int current, int total) {
-        progressDialog.setProgress(current);
-        progressDialog.setMax(total);
+        binding.debugProgressBar.setProgress(current);
+        binding.debugProgressBar.setMax(total);
     }
 
     @Override
     public void hideProgressBar() {
-        try {
-            if (progressDialog != null && progressDialog.isShowing()) {
-                progressDialog.dismiss();
-            }
-        } catch (Exception e) {
-            Timber.e("hideProgressBar: Exception while trying to dismiss progress dialog");
-        } finally {
-            progressDialog = null;
-        }
+        binding.debugProgressBarContainer.setVisibility(View.GONE);
     }
 }

app/src/main/java/org/nutritionfacts/dailydozen/activity/FaqActivity.java

@@ -3,14 +3,13 @@
 import android.os.Bundle;
 
 import androidx.annotation.Nullable;
-import androidx.appcompat.app.AppCompatActivity;
 
 import org.nutritionfacts.dailydozen.R;
 import org.nutritionfacts.dailydozen.databinding.ActivityFaqBinding;
 
 import io.noties.markwon.Markwon;
 
-public class FaqActivity extends AppCompatActivity {
+public class FaqActivity extends DailyDozenActivity {
     private ActivityFaqBinding binding;
 
     @Override

app/src/main/java/org/nutritionfacts/dailydozen/activity/HistoryActivity.java

@@ -20,6 +20,7 @@
 import org.nutritionfacts.dailydozen.util.CalendarHistoryDecorator;
 import org.nutritionfacts.dailydozen.util.DateUtil;
 
+import java.time.LocalDate;
 import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.HashSet;
@@ -29,16 +30,14 @@
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 
-import hirondelle.date4j.DateTime;
-
 public class HistoryActivity extends InfoActivity {
     private ActivityHistoryBinding binding;
 
     private boolean isFoodHistory = false;
 
     private final Set<String> loadedMonths = new HashSet<>();
-    private List<DateTime> fullServingsDates;
-    private List<DateTime> partialServingsDates;
+    private List<LocalDate> fullServingsDates;
+    private List<LocalDate> partialServingsDates;
 
     @SuppressWarnings("unchecked")
     @Override
@@ -50,8 +49,8 @@ protected void onCreate(Bundle savedInstanceState) {
         fullServingsDates = new ArrayList<>();
         partialServingsDates = new ArrayList<>();
         if (savedInstanceState != null) {
-            fullServingsDates = (ArrayList<DateTime>) savedInstanceState.getSerializable(Args.DATES_WITH_FULL_SERVINGS);
-            partialServingsDates = (ArrayList<DateTime>) savedInstanceState.getSerializable(Args.DATES_WITH_PARTIAL_SERVINGS);
+            fullServingsDates = (ArrayList<LocalDate>) savedInstanceState.getSerializable(Args.DATES_WITH_FULL_SERVINGS);
+            partialServingsDates = (ArrayList<LocalDate>) savedInstanceState.getSerializable(Args.DATES_WITH_PARTIAL_SERVINGS);
         }
 
         displayHistory();
@@ -116,9 +115,9 @@ private void displayEntriesForVisibleMonths(final Calendar cal, final long id) {
 
                     for (Map.Entry<Day, Boolean> serving : servings.entrySet()) {
                         if (serving.getValue()) {
-                            fullServingsDates.add(serving.getKey().getDateTime());
+                            fullServingsDates.add(serving.getKey().getDate());
                         } else {
-                            partialServingsDates.add(serving.getKey().getDateTime());
+                            partialServingsDates.add(serving.getKey().getDate());
                         }
                     }
                 }