Merge pull request #473 from Futsch1/414-filters-for-the-overviewtags…

…-for-medication 414 filters for the overviewtags for medication
Futsch1 · Feb 10, 2025 · 6e5f03b · 6e5f03b
2 parents 4587937 + 88cabe4
commit 6e5f03b
Show file tree

Hide file tree

Showing 226 changed files with 2,128 additions and 477 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -70,7 +70,7 @@ jobs:
             adb uninstall com.futsch1.medtimer || true
             EXIT_CODE=0 && ./gradlew JacocoDebugCodeCoverage || EXIT_CODE=$? && (adb pull /sdcard/googletest/test_outputfiles app/build/outputs/androidTest-results/ || true) && exit $EXIT_CODE
             adb install -g app/build/outputs/apk/debug/MedTimer-debug.apk
-            adb shell monkey -p com.futsch1.medtimer -v 2000
+            adb shell monkey -p com.futsch1.medtimer -v 5000 --throttle 10
           cores: 4
 
       - name: Run fuzzing tests

diff --git a/README.md b/README.md
@@ -68,6 +68,7 @@ Simple & Secure Data Management:
   professionals.
 - Backup and restore your medication list as JSON file.
 - Medication stock tracking and out of stock reminders.
+- Tag and filter your medication.
 
 Privacy & Offline Accessibility:
 

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -23,8 +23,8 @@ android {
         minSdk = 28
         multiDexEnabled = true
         targetSdk = 35
-        versionCode = 98
-        versionName = "1.15.3"
+        versionCode = 100
+        versionName = "1.16.0"
         base.archivesName = "MedTimer"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
@@ -92,6 +92,7 @@ dependencies {
     val appIntroVersion = "6.3.1"
     val calendarVersion = "2.6.2"
     val iconDialogVersion = "3.3.0"
+    val flexboxVersion = "3.0.0"
 
     val junitVersion = "5.11.4"
     val mockitoCoreVersion = "5.15.2"
@@ -131,6 +132,7 @@ dependencies {
     implementation("com.maltaisn:icondialog:$iconDialogVersion")
     implementation("androidx.test.espresso:espresso-idling-resource:$androidTestEspressoVersion")
     implementation("androidx.test.espresso.idling:idling-concurrent:$androidTestEspressoVersion")
+    implementation("com.google.android.flexbox:flexbox:$flexboxVersion")
 
     testImplementation("org.junit.jupiter:junit-jupiter-api:$junitVersion")
     testImplementation("org.mockito:mockito-core:$mockitoCoreVersion")