Remove unused library for preferencesx

Add monkey test to tests job Fix a potential crash when navigating preferences
Futsch1 · Jan 20, 2025 · ed7dccb · ed7dccb
1 parent f5c5a97
commit ed7dccb
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 10 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -1,4 +1,4 @@
-name: Unit test
+name: Tests
 
 on:
   workflow_dispatch:
@@ -70,6 +70,22 @@ jobs:
             EXIT_CODE=0 && ./gradlew JacocoDebugCodeCoverage || EXIT_CODE=$? && (adb pull /sdcard/googletest/test_outputfiles app/build/outputs/androidTest-results/ || true) && exit $EXIT_CODE
           cores: 4
 
+      - name: Run monkey test
+        uses: reactivecircus/android-emulator-runner@62dbb605bba737720e10b196cb4220d374026a6d # v2.33.0
+        with:
+          api-level: ${{ env.target_api_level }}
+          profile: ${{ env.profile }}
+          arch: x86_64
+          target: google_apis
+          force-avd-creation: false
+          emulator-options: -no-snapshot-save -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none -no-metrics
+          disable-animations: true
+          script: |
+            ./gradlew assembleDebug
+            adb install -g app/build/outputs/apk/debug/MedTimer-debug.apk
+            adb shell monkey -p com.futsch1.medtimer -v 2000
+          cores: 4
+
       - name: Run fuzzing tests
         run: ./gradlew testDebug -Dfuzzing=true
       - name: Android lint

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -85,7 +85,6 @@ dependencies {
     val lifecycleViewmodelKtxVersion = "2.8.7"
     val roomVersion = "2.6.1"
     val colorPickerViewVersion = "2.3.0"
-    val preferenceXVersion = "1.1.0"
     val simplyPDFVersion = "2.1.1"
     val gsonVersion = "2.11.0"
     val tableViewVersion = "0.8.9.4"
@@ -123,7 +122,6 @@ dependencies {
     implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycleViewmodelKtxVersion")
     implementation("androidx.room:room-runtime:$roomVersion")
     implementation("com.github.skydoves:colorpickerview:$colorPickerViewVersion")
-    implementation("com.takisoft.preferencex:preferencex:$preferenceXVersion")
     implementation("com.github.wwdablu:SimplyPDF:$simplyPDFVersion")
     implementation("com.google.code.gson:gson:$gsonVersion")
     implementation("com.github.evrencoskun:TableView:v$tableViewVersion")

diff --git a/app/src/main/java/com/futsch1/medtimer/PreferencesFragment.java b/app/src/main/java/com/futsch1/medtimer/PreferencesFragment.java
@@ -10,18 +10,19 @@
 
 import androidx.annotation.IdRes;
 import androidx.annotation.RequiresApi;
+import androidx.navigation.NavController;
 import androidx.navigation.Navigation;
 import androidx.preference.Preference;
+import androidx.preference.PreferenceFragmentCompat;
 import androidx.preference.PreferenceManager;
 import androidx.preference.SwitchPreference;
 import androidx.preference.SwitchPreferenceCompat;
 
-import com.takisoft.preferencex.PreferenceFragmentCompat;
 
 public class PreferencesFragment extends PreferenceFragmentCompat {
 
     @Override
-    public void onCreatePreferencesFix(Bundle savedInstanceState, String rootKey) {
+    public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
         setPreferencesFromResource(R.xml.root_preferences, rootKey);
 
         setupTheme();
@@ -77,7 +78,12 @@ private void setupPreferencesLink(String preferenceKey, @IdRes int actionId) {
         if (preference != null) {
             preference.setOnPreferenceClickListener(preference1 ->
                     {
-                        Navigation.findNavController(requireView()).navigate(actionId);
+                        NavController navController = Navigation.findNavController(requireView());
+                        try {
+                            navController.navigate(actionId);
+                        } catch (IllegalArgumentException e) {
+                            // Intentionally empty
+                        }
                         return true;
                     }
             );

diff --git a/app/src/main/java/com/futsch1/medtimer/RepeatRemindersPreferencesFragment.java b/app/src/main/java/com/futsch1/medtimer/RepeatRemindersPreferencesFragment.java
@@ -2,12 +2,12 @@
 
 import android.os.Bundle;
 
-import com.takisoft.preferencex.PreferenceFragmentCompat;
+import androidx.preference.PreferenceFragmentCompat;
 
 public class RepeatRemindersPreferencesFragment extends PreferenceFragmentCompat {
 
     @Override
-    public void onCreatePreferencesFix(Bundle savedInstanceState, String rootKey) {
+    public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
         setPreferencesFromResource(R.xml.repeat_reminders_preferences, rootKey);
     }
 }
diff --git a/app/src/main/java/com/futsch1/medtimer/WeekendModePreferencesFragment.java b/app/src/main/java/com/futsch1/medtimer/WeekendModePreferencesFragment.java
@@ -5,19 +5,19 @@
 
 import androidx.preference.MultiSelectListPreference;
 import androidx.preference.Preference;
+import androidx.preference.PreferenceFragmentCompat;
 import androidx.preference.PreferenceManager;
 
 import com.futsch1.medtimer.helpers.TimeHelper;
 import com.futsch1.medtimer.reminders.ReminderProcessor;
-import com.takisoft.preferencex.PreferenceFragmentCompat;
 
 import java.util.List;
 import java.util.stream.Collectors;
 
 public class WeekendModePreferencesFragment extends PreferenceFragmentCompat {
 
     @Override
-    public void onCreatePreferencesFix(Bundle savedInstanceState, String rootKey) {
+    public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
         setPreferencesFromResource(R.xml.weekend_mode_preferences, rootKey);
 
         setupWeekendMode();