diff --git a/app/build.gradle b/app/build.gradle index 94102ad..d0ae180 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -17,7 +17,7 @@ android { resourceConfigurations += ["en", "de"] - buildConfigField "long", "TIMESTAMP", System.currentTimeMillis() + "L" + buildConfigField "long", "BUILD_TIME_MILLIS", "${System.currentTimeMillis()}L" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } diff --git a/app/release/WeserPlaner_3_1-0-0.apk b/app/release/WeserPlaner_3_1-0-0.apk deleted file mode 100644 index e9882df..0000000 Binary files a/app/release/WeserPlaner_3_1-0-0.apk and /dev/null differ diff --git a/app/release/app-release-3.aab b/app/release/app-release-3.aab deleted file mode 100644 index fadd44a..0000000 Binary files a/app/release/app-release-3.aab and /dev/null differ diff --git a/app/release/output-metadata.json b/app/release/output-metadata.json index 7832ac6..40be6f7 100644 --- a/app/release/output-metadata.json +++ b/app/release/output-metadata.json @@ -11,8 +11,8 @@ "type": "SINGLE", "filters": [], "attributes": [], - "versionCode": 3, - "versionName": "1.0.0", + "versionCode": 4, + "versionName": "1.0.1", "outputFile": "app-release.apk" } ], diff --git a/app/src/main/java/com/denizk0461/weserplaner/db/AppDatabase.kt b/app/src/main/java/com/denizk0461/weserplaner/db/AppDatabase.kt index 7886db6..31b3bc7 100644 --- a/app/src/main/java/com/denizk0461/weserplaner/db/AppDatabase.kt +++ b/app/src/main/java/com/denizk0461/weserplaner/db/AppDatabase.kt @@ -51,7 +51,7 @@ abstract class AppDatabase : RoomDatabase() { AppDatabase::class.java, "event_db", ).addMigrations(migrationAddNewsToOfferCanteen_19_20) - .fallbackToDestructiveMigration() +// .fallbackToDestructiveMigration() .build() } } diff --git a/app/src/main/java/com/denizk0461/weserplaner/fragment/SettingsFragment.kt b/app/src/main/java/com/denizk0461/weserplaner/fragment/SettingsFragment.kt index 1cce41f..2aaf23d 100644 --- a/app/src/main/java/com/denizk0461/weserplaner/fragment/SettingsFragment.kt +++ b/app/src/main/java/com/denizk0461/weserplaner/fragment/SettingsFragment.kt @@ -199,7 +199,10 @@ class SettingsFragment : AppFragment() { openBottomSheet( getTextSheet( getString(R.string.sheet_licences_header), - getString(R.string.sheet_licences_content), + getString( + R.string.sheet_licences_content, + Calendar.getInstance().get(Calendar.YEAR).toString(), + ), ) ) } @@ -273,7 +276,7 @@ class SettingsFragment : AppFragment() { "${BuildConfig.VERSION_NAME}-${ if (BuildConfig.DEBUG) "dev-[${SimpleDateFormat("yyyy-MM-dd, HH:mm:ss.SSS", Locale.GERMANY) - .format(Date(BuildConfig.TIMESTAMP))}]" + .format(Date(BuildConfig.BUILD_TIME_MILLIS))}]" else "release" }" @@ -293,13 +296,14 @@ class SettingsFragment : AppFragment() { } /** - * Retrieves the text displayed in the allergen config setting to show the user how many - * allergens they have checked. + * Retrieves the appropriate text to display in the allergen config setting to show the user how + * many allergens they have checked. Text depends on how many allergens have been checked. * * @return localised string with the count of checked allergens inserted */ - private fun getAllergensConfigCountText(): String = getString( - R.string.allergens_config_subtitle, - viewModel.preferenceAllergenConfigCount - ) + private fun getAllergensConfigCountText(): String = when (viewModel.preferenceAllergenConfigCount) { + 0 -> getString(R.string.allergens_config_subtitle_zero) + 1 -> getString(R.string.allergens_config_subtitle_one) + else -> getString(R.string.allergens_config_subtitle_more, viewModel.preferenceAllergenConfigCount) + } } \ No newline at end of file diff --git a/app/src/main/java/com/denizk0461/weserplaner/model/CanteenOfferTuple.kt b/app/src/main/java/com/denizk0461/weserplaner/model/CanteenOfferTuple.kt deleted file mode 100644 index 4a72e0d..0000000 --- a/app/src/main/java/com/denizk0461/weserplaner/model/CanteenOfferTuple.kt +++ /dev/null @@ -1,12 +0,0 @@ -package com.denizk0461.weserplaner.model - -/** - * Serves to retrieve information about a specified canteen from the database using a single query. - * - * @param openingHours opening hours of the canteen - * @param news news that may be available for the canteen - */ -data class CanteenOfferTuple( - val openingHours: String, - val news: String, -) \ No newline at end of file diff --git a/app/src/main/java/com/denizk0461/weserplaner/model/OfferCategory.kt b/app/src/main/java/com/denizk0461/weserplaner/model/OfferCategory.kt index f35f048..0b52478 100644 --- a/app/src/main/java/com/denizk0461/weserplaner/model/OfferCategory.kt +++ b/app/src/main/java/com/denizk0461/weserplaner/model/OfferCategory.kt @@ -32,7 +32,7 @@ import androidx.room.PrimaryKey ) data class OfferCategory( @PrimaryKey val id: Int, - val dateId: Int, - val canteenId: Int, + /*@ColumnInfo(index = true)*/ val dateId: Int, + /*@ColumnInfo(index = true)*/ val canteenId: Int, val category: String, ) diff --git a/app/src/main/java/com/denizk0461/weserplaner/model/OfferItem.kt b/app/src/main/java/com/denizk0461/weserplaner/model/OfferItem.kt index 80e0e46..0de0a76 100644 --- a/app/src/main/java/com/denizk0461/weserplaner/model/OfferItem.kt +++ b/app/src/main/java/com/denizk0461/weserplaner/model/OfferItem.kt @@ -29,7 +29,7 @@ import androidx.room.PrimaryKey ) data class OfferItem( @PrimaryKey val itemId: Int, - val categoryId: Int, + /*@ColumnInfo(index = true)*/ val categoryId: Int, val title: String, val price: String, @ColumnInfo(name = "dietary_preferences") val dietaryPreferences: String, diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index cb7fb82..a6c4756 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -175,7 +175,9 @@ Funktioniert nur, wenn Kurse sich nicht überschneiden! Verstecke Angebote mit bestimmten Allergenen - Allergene, die Du ausgeschlossen hast: %d + Du hast keine Allergene ausgeschlossen + Du hast ein Allergen ausgeschlossen + Du hast %d Allergene ausgeschlossen Wähle, welche Allergene Du vermeiden möchtest Achtung: bitte verlasse Dich nicht vollständig auf diese Funktion. Stelle immer in der Mensa, die Du besuchst, sicher, dass die Stoffe, auf die Du allergisch reagierst, nicht in deren Angeboten vorhanden sind. Die Allergen-Hinweise einiger Mensen sind online leider unvollständig. Deine Allergene wurden gespeichert. diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index eeabab5..ef41c63 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -75,7 +75,7 @@ No news are available. Licences - Android developer resources by Google.\nhttps://developer.android.com/\nandroidx.appcompat:appcompat:1.6.1\nandroidx.constraintlayout:constraintlayout:2.1.4\nandroidx.core:core-ktx:1.10.0\nandroidx.fragment:fragment-ktx:1.6.0-beta01\nandroidx.navigation:navigation-fragment-ktx:2.5.3\nandroidx.navigation:navigation-ui-ktx:2.5.3\nandroidx.preference:preference-ktx:1.2.0\nandroidx.room:room-runtime:2.5.1\nandroidx.room:room-compiler:2.5.1\nandroidx.swiperefreshlayout:swiperefreshlayout:1.2.0-alpha01\n\nDesign guidelines, icons, and colour palette by Google.\nhttps://m3.material.io/\ncom.google.android.material:material:1.9.0\n\nAdditional icons by Flaticon.\nhttps://www.flaticon.com/\n\nWeb scraping functionality by Jonathan Hedley.\nhttps://jhy.io/\nhttps://jsoup.org/\norg.jsoup:jsoup:1.15.4\n\nApp developed by Deniz Düzgören.\ndenizk0461@gmail.com\ndeniz7@uni-bremen.de + Android, Material Design Resources © 2014 – %1$s Google, licenced under the Apache 2.0 License.\nhttps://developer.android.com\nhttps://material.io\n\nSeveral icons © 2013 – %1$s Flaticon, licenced under the Flaticon Basic Free License.\nhttps://www.flaticon.com\n\nLato © 2010 – %1$s Łukasz Dziedzic, licenced under the SIL Open Font License.\nhttps://fonts.google.com/specimen/Lato\n\njsoup HTML parser © 2009 – %1$s Jonathan Hedley, licenced under the MIT License.\nhttps://jsoup.org\n\nApp developed by Deniz Düzgören.\ndenizk0461@gmail.com\ndeniz7@uni-bremen.de Your Schedule Schedule @@ -179,7 +179,9 @@ Only works properly if courses don\'t overlap! Hide offers containing certain allergens - Allergens you\'ve excluded: %d + You have not excluded any allergens + You have excluded one allergen + You have excluded %d allergens Select which allergens you\'d like to avoid Note: please don\'t entirely rely on this. Always check the notices displayed at the canteen you\'re visiting to confirm substances you may be allergic against are not present in their offerings. Some canteens unfortunately don\'t provide full allergen information online. Your allergen settings have been saved.