From 3a2d4449562aad9405bb100cfb7783306f34855f Mon Sep 17 00:00:00 2001 From: denizk0461 Date: Thu, 13 Apr 2023 19:21:53 +0200 Subject: [PATCH] Currently changing the app's colours. fuck i spent so much time changing the fucking status bar colour. like stackoverflow is so damn outdated on this topic --- .../studip/fragment/SettingsFragment.kt | 22 +++++++- app/src/main/res/color/switch_thumb.xml | 5 ++ app/src/main/res/layout/activity_fetcher.xml | 3 +- app/src/main/res/layout/content_main.xml | 6 +- app/src/main/res/layout/fragment_event.xml | 2 +- app/src/main/res/layout/fragment_food.xml | 2 +- app/src/main/res/layout/fragment_settings.xml | 55 +++++++++++++------ app/src/main/res/values-night/themes.xml | 23 ++++++-- app/src/main/res/values/attrs.xml | 3 + app/src/main/res/values/colors.xml | 17 ++++-- app/src/main/res/values/strings.xml | 4 +- app/src/main/res/values/themes.xml | 13 +++-- 12 files changed, 114 insertions(+), 41 deletions(-) create mode 100644 app/src/main/res/color/switch_thumb.xml 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 b707c35..2d189a3 100644 --- a/app/src/main/java/com/denizk0461/studip/fragment/SettingsFragment.kt +++ b/app/src/main/java/com/denizk0461/studip/fragment/SettingsFragment.kt @@ -21,6 +21,8 @@ class SettingsFragment : Fragment() { private val binding get() = _binding!! private var appVersionClick = 0 + private var isQuarterChecked = false + override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View { _binding = FragmentSettingsBinding.inflate(inflater, container, false) return binding.root @@ -29,9 +31,18 @@ class SettingsFragment : Fragment() { override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) - val toast2 = Toast.makeText(context, "2", Toast.LENGTH_SHORT) - val toast22 = Toast.makeText(context, "22", Toast.LENGTH_SHORT) - val toast222 = Toast.makeText(context, "222", Toast.LENGTH_SHORT) + var toast2 = makeToast("2") + var toast22 = makeToast("22") + var toast222 = makeToast("222") + +// binding.layoutQuarter.setOnClickListener { +// isQuarterChecked = !isQuarterChecked +// binding.switchQuarter.isChecked = isQuarterChecked +// } + + binding.switchQuarter.setOnClickListener { + isQuarterChecked = !isQuarterChecked + } binding.buttonAppVersion.setOnClickListener { when (appVersionClick) { @@ -51,6 +62,9 @@ class SettingsFragment : Fragment() { } 22 -> { toast222.cancel() + toast2 = makeToast("2") + toast22 = makeToast("22") + toast222 = makeToast("222") startActivity(Intent(Intent.ACTION_VIEW, Uri.parse(Misc.mysteryLink))) appVersionClick = 0 } @@ -61,6 +75,8 @@ class SettingsFragment : Fragment() { binding.appVersionText.text = BuildConfig.VERSION_NAME } + private fun makeToast(text: String): Toast = Toast.makeText(context, text, Toast.LENGTH_SHORT) + override fun onDestroyView() { super.onDestroyView() _binding = null diff --git a/app/src/main/res/color/switch_thumb.xml b/app/src/main/res/color/switch_thumb.xml new file mode 100644 index 0000000..c82831e --- /dev/null +++ b/app/src/main/res/color/switch_thumb.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_fetcher.xml b/app/src/main/res/layout/activity_fetcher.xml index d10388d..ba8ac15 100644 --- a/app/src/main/res/layout/activity_fetcher.xml +++ b/app/src/main/res/layout/activity_fetcher.xml @@ -2,7 +2,8 @@ + android:layout_height="match_parent" + android:background="?attr/colorBackground"> + app:layout_behavior="@string/appbar_scrolling_view_behavior" + android:background="?attr/colorBackground"> + app:layout_constraintEnd_toEndOf="parent" + android:background="?attr/colorBackground"> + android:background="?attr/colorBackground"> + android:background="?attr/colorBackground"> \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_settings.xml b/app/src/main/res/layout/fragment_settings.xml index 829cf9c..4f60458 100644 --- a/app/src/main/res/layout/fragment_settings.xml +++ b/app/src/main/res/layout/fragment_settings.xml @@ -3,8 +3,9 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" + xmlns:app="http://schemas.android.com/apk/res-auto" tools:context=".fragment.SettingsFragment" - android:background="?android:colorBackground"> + android:background="?attr/colorBackground"> - - + + + + + + + + + + + + + app:layout_constraintTop_toTopOf="parent" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintBottom_toBottomOf="parent" + app:thumbTint="@color/switch_thumb"/> - - - + + + \ No newline at end of file diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml index 3ffd941..0763bd9 100644 --- a/app/src/main/res/values/attrs.xml +++ b/app/src/main/res/values/attrs.xml @@ -2,4 +2,7 @@ + + + \ No newline at end of file diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index f15886f..2abdf11 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -6,11 +6,20 @@ - #B82729 - #B2665A + #B82729 + #B2665A - #871D1E - #CB9890 + #871D1E + #CB9890 + + #CB9890 // TODO + #CDCBCB + + #CB9890 // TODO + #B9B6B6 + + #151414 // TODO + #151414 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index ab1187f..2873f12 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -14,7 +14,7 @@ FRIDAY Your Schedule - Canteen Plans + Canteen Offers App Settings Schedule @@ -30,7 +30,7 @@ Where applicable App Version - with ♡️ from Osterholz\nMade by Deniz \\__* + with ♡️ from Bremen-Osterholz\nmade by denizk0461 \\__* Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nam in scelerisque sem. Mauris diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml index 58a8b49..ed16973 100644 --- a/app/src/main/res/values/themes.xml +++ b/app/src/main/res/values/themes.xml @@ -2,25 +2,28 @@ \ No newline at end of file