diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml new file mode 100644 index 0000000..2e5d4cf --- /dev/null +++ b/.idea/deploymentTargetDropDown.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/java/com/denizk0461/studip/activity/MainActivity.kt b/app/src/main/java/com/denizk0461/studip/activity/MainActivity.kt index 739c89f..46fd66d 100644 --- a/app/src/main/java/com/denizk0461/studip/activity/MainActivity.kt +++ b/app/src/main/java/com/denizk0461/studip/activity/MainActivity.kt @@ -42,7 +42,7 @@ class MainActivity : FragmentActivity() { setContentView(binding.root) // Set up navigation view bar to launch fragments - binding.contentMain.navView.setOnItemSelectedListener { item -> + binding.navView.setOnItemSelectedListener { item -> // Launch fragment based on the item that has been clicked loadFragment(when (item.itemId) { R.id.food -> "canteen" @@ -58,11 +58,11 @@ class MainActivity : FragmentActivity() { .getBooleanPreference(SettingsPreferences.LAUNCH_CANTEEN_ON_START) ) { // Open canteen fragment - binding.contentMain.navView.selectedItemId = R.id.food + binding.navView.selectedItemId = R.id.food currentFragment = "canteen" } else { // Open event fragment - binding.contentMain.navView.selectedItemId = R.id.plan + binding.navView.selectedItemId = R.id.plan currentFragment = "event" } diff --git a/app/src/main/java/com/denizk0461/studip/fragment/SettingsFragment.kt b/app/src/main/java/com/denizk0461/studip/fragment/SettingsFragment.kt index a4c55df..db39c16 100644 --- a/app/src/main/java/com/denizk0461/studip/fragment/SettingsFragment.kt +++ b/app/src/main/java/com/denizk0461/studip/fragment/SettingsFragment.kt @@ -137,38 +137,21 @@ class SettingsFragment : AppFragment() { bundle.putString("img", "garbage") intent.putExtras(bundle) }) - appVersionClick += 1 - } - 10 -> { - showToast(context, "ahhh yes") - appVersionClick += 1 - } - 15 -> { - showToast(context, "keep clicking") - appVersionClick += 1 - } - 20 -> { - showToast(context, "^_^") - appVersionClick += 1 - } - 30 -> { - showToast(context, "^_____^") - appVersionClick += 1 - } - 121 -> { - showToast(context, "Shouldn't you study for your exam?") - appVersionClick += 1 - } - 200 -> { - showToast(context, "\\__*") - appVersionClick += 1 } + 10 -> showToast(context, getString(R.string.settings_app_version_10)) + 15 -> showToast(context, getString(R.string.settings_app_version_15)) + 20 -> showToast(context, getString(R.string.settings_app_version_20)) + 30 -> showToast(context, getString(R.string.settings_app_version_30)) + 90 -> showToast(context, getString(R.string.settings_app_version_90)) + 121 -> showToast(context, getString(R.string.settings_app_version_121)) + 165 -> showToast(context, getString(R.string.settings_app_version_165)) + 200 -> showToast(context, getString(R.string.settings_app_version_200)) 222 -> { startActivity(Intent(Intent.ACTION_VIEW, Uri.parse(mysteryLink))) - appVersionClick = 0 + appVersionClick = -1 } - else -> appVersionClick += 1 } + appVersionClick += 1 } /* diff --git a/app/src/main/res/color/list_chip_beef_bg.xml b/app/src/main/res/color/list_chip_beef_bg.xml new file mode 100644 index 0000000..02d08cf --- /dev/null +++ b/app/src/main/res/color/list_chip_beef_bg.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/color/list_chip_beef_text.xml b/app/src/main/res/color/list_chip_beef_text.xml new file mode 100644 index 0000000..626e1d1 --- /dev/null +++ b/app/src/main/res/color/list_chip_beef_text.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/color/list_chip_fair_bg.xml b/app/src/main/res/color/list_chip_fair_bg.xml new file mode 100644 index 0000000..71efcb5 --- /dev/null +++ b/app/src/main/res/color/list_chip_fair_bg.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/color/list_chip_fair_text.xml b/app/src/main/res/color/list_chip_fair_text.xml new file mode 100644 index 0000000..56366f2 --- /dev/null +++ b/app/src/main/res/color/list_chip_fair_text.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/color/list_chip_fish_bg.xml b/app/src/main/res/color/list_chip_fish_bg.xml new file mode 100644 index 0000000..262e1f0 --- /dev/null +++ b/app/src/main/res/color/list_chip_fish_bg.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/color/list_chip_fish_text.xml b/app/src/main/res/color/list_chip_fish_text.xml new file mode 100644 index 0000000..271092d --- /dev/null +++ b/app/src/main/res/color/list_chip_fish_text.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/color/list_chip_game_bg.xml b/app/src/main/res/color/list_chip_game_bg.xml new file mode 100644 index 0000000..31ba860 --- /dev/null +++ b/app/src/main/res/color/list_chip_game_bg.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/color/list_chip_game_text.xml b/app/src/main/res/color/list_chip_game_text.xml new file mode 100644 index 0000000..914e235 --- /dev/null +++ b/app/src/main/res/color/list_chip_game_text.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/color/list_chip_lamb_bg.xml b/app/src/main/res/color/list_chip_lamb_bg.xml new file mode 100644 index 0000000..b9cc675 --- /dev/null +++ b/app/src/main/res/color/list_chip_lamb_bg.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/color/list_chip_lamb_text.xml b/app/src/main/res/color/list_chip_lamb_text.xml new file mode 100644 index 0000000..3460384 --- /dev/null +++ b/app/src/main/res/color/list_chip_lamb_text.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/color/list_chip_pork_bg.xml b/app/src/main/res/color/list_chip_pork_bg.xml new file mode 100644 index 0000000..f8c26c8 --- /dev/null +++ b/app/src/main/res/color/list_chip_pork_bg.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/color/list_chip_pork_text.xml b/app/src/main/res/color/list_chip_pork_text.xml new file mode 100644 index 0000000..e647ae6 --- /dev/null +++ b/app/src/main/res/color/list_chip_pork_text.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/color/list_chip_poultry_bg.xml b/app/src/main/res/color/list_chip_poultry_bg.xml new file mode 100644 index 0000000..6b54391 --- /dev/null +++ b/app/src/main/res/color/list_chip_poultry_bg.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/color/list_chip_poultry_text.xml b/app/src/main/res/color/list_chip_poultry_text.xml new file mode 100644 index 0000000..4b6fb09 --- /dev/null +++ b/app/src/main/res/color/list_chip_poultry_text.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/color/list_chip_vegan_bg.xml b/app/src/main/res/color/list_chip_vegan_bg.xml new file mode 100644 index 0000000..f664d32 --- /dev/null +++ b/app/src/main/res/color/list_chip_vegan_bg.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/color/list_chip_vegan_text.xml b/app/src/main/res/color/list_chip_vegan_text.xml new file mode 100644 index 0000000..c353806 --- /dev/null +++ b/app/src/main/res/color/list_chip_vegan_text.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/color/list_chip_vegetarian_bg.xml b/app/src/main/res/color/list_chip_vegetarian_bg.xml new file mode 100644 index 0000000..0635339 --- /dev/null +++ b/app/src/main/res/color/list_chip_vegetarian_bg.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/color/list_chip_vegetarian_text.xml b/app/src/main/res/color/list_chip_vegetarian_text.xml new file mode 100644 index 0000000..a2ccc3f --- /dev/null +++ b/app/src/main/res/color/list_chip_vegetarian_text.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/color/list_chip_vital_bg.xml b/app/src/main/res/color/list_chip_vital_bg.xml new file mode 100644 index 0000000..083264c --- /dev/null +++ b/app/src/main/res/color/list_chip_vital_bg.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/color/list_chip_vital_text.xml b/app/src/main/res/color/list_chip_vital_text.xml new file mode 100644 index 0000000..307a421 --- /dev/null +++ b/app/src/main/res/color/list_chip_vital_text.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 9fb1fe8..94ad7f4 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -1,12 +1,33 @@ - - + - \ No newline at end of file + + + \ No newline at end of file diff --git a/app/src/main/res/layout/content_main.xml b/app/src/main/res/layout/content_main.xml deleted file mode 100644 index a7cb6fc..0000000 --- a/app/src/main/res/layout/content_main.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_canteen.xml b/app/src/main/res/layout/fragment_canteen.xml index 4c9ab76..d4affcf 100644 --- a/app/src/main/res/layout/fragment_canteen.xml +++ b/app/src/main/res/layout/fragment_canteen.xml @@ -13,6 +13,14 @@ app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent"> + + + android:layout_marginHorizontal="16dp"/> - - + android:animateLayoutChanges="true" + android:paddingHorizontal="8dp"> diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 36d467d..345a5bc 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -155,5 +155,9 @@ App-Version - mit ♡️ aus Bremen-Osterholz\von denizk0461 \\__* + oh jaa + klick weiter + Solltest du nicht für deine Klausuren lernen? + + mit ♡️ aus Bremen-Osterholz\nvon denizk0461 \\__* \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 2a3b74a..c10858e 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -162,6 +162,15 @@ App Version + ahhh yes + keep clicking + ^_^ + ^_____^ + (⎌ℕ⎌) + Shouldn\'t you study for your exams? + ◢◤ + \\__* + with ♡️ from Bremen-Osterholz\nmade by denizk0461 \\__* In our hearts, she lives forevermore diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml index 9a69859..cf19a89 100644 --- a/app/src/main/res/values/themes.xml +++ b/app/src/main/res/values/themes.xml @@ -86,4 +86,9 @@ + + \ No newline at end of file