From fbbc9a3da2ce4b929044078e15441d1de125581b Mon Sep 17 00:00:00 2001 From: fheyming <fabio-andre.heyming@sva.de> Date: Fri, 2 Jun 2023 18:42:14 +0200 Subject: [PATCH] Added dark mode --- .../example/mampfmobil/ui/DecideFragment.java | 61 ++++++++++++++++-- app/src/main/res/drawable/darkmode.png | Bin 0 -> 2916 bytes app/src/main/res/drawable/lightmode.png | Bin 0 -> 3938 bytes app/src/main/res/layout/activity_main.xml | 3 +- app/src/main/res/layout/fragment_decide.xml | 21 ++++++ app/src/main/res/values/colors.xml | 1 + app/src/main/res/values/themes.xml | 2 + 7 files changed, 80 insertions(+), 8 deletions(-) create mode 100644 app/src/main/res/drawable/darkmode.png create mode 100644 app/src/main/res/drawable/lightmode.png diff --git a/app/src/main/java/com/example/mampfmobil/ui/DecideFragment.java b/app/src/main/java/com/example/mampfmobil/ui/DecideFragment.java index 827e67a..2ec099d 100644 --- a/app/src/main/java/com/example/mampfmobil/ui/DecideFragment.java +++ b/app/src/main/java/com/example/mampfmobil/ui/DecideFragment.java @@ -1,5 +1,6 @@ package com.example.mampfmobil.ui; +import androidx.appcompat.app.AppCompatDelegate; import androidx.fragment.app.FragmentManager; import androidx.fragment.app.FragmentTransaction; import androidx.lifecycle.ViewModelProvider; @@ -7,11 +8,13 @@ import androidx.lifecycle.ViewModelProvider; import android.content.Intent; import android.content.res.Configuration; import android.content.res.Resources; +import android.os.Build; import android.os.Bundle; import androidx.annotation.Nullable; import androidx.fragment.app.Fragment; +import android.util.Log; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -43,6 +46,26 @@ public class DecideFragment extends Fragment { ImageButton deButton = rootView.findViewById(R.id.imageView); ImageButton enButton = rootView.findViewById(R.id.imageView2); + ImageButton darkMode = rootView.findViewById(R.id.imageButton); + + darkMode.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + // Den Dark Mode programmgesteuert aktivieren + setDarkMode(true); + } + }); + + ImageButton lightMode = rootView.findViewById(R.id.imageButton2); + + lightMode.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + // Den Dark Mode programmgesteuert aktivieren + setDarkMode(false); + } + }); + deButton.setOnClickListener(new View.OnClickListener() { @Override @@ -112,12 +135,38 @@ public class DecideFragment extends Fragment { configuration.setLocale(locale); resources.updateConfiguration(configuration, resources.getDisplayMetrics()); - // Hier müssen Sie den Fragments-Wechsel aktualisieren, um sicherzustellen, - // dass die Ansichten und Texte entsprechend der geänderten Sprache aktualisiert werden - FragmentManager fragmentManager = requireActivity().getSupportFragmentManager(); - FragmentTransaction fragmentTransaction = fragmentManager.beginTransaction(); - fragmentTransaction.replace(R.id.container, new DecideFragment()); - fragmentTransaction.commit(); + recreateActivity(); // Aktivität neu starten, um die Änderungen anzuwenden + } + + private void setDarkMode(boolean enabled) { + + if (enabled) { + + Log.d("myTag", "YES"); + // Dark Mode aktivieren + AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES); + } else { + Log.d("myTag", "NO "); + // Dark Mode deaktivieren + AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_NO); + } + + recreateActivity(); // Aktivität neu starten, um den Dark Mode anzuwenden + + } + + private void recreateActivity() { + // Aktivität neu starten + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB) { + requireActivity().recreate(); + } else { + Intent intent = requireActivity().getIntent(); + intent.addFlags(Intent.FLAG_ACTIVITY_NO_ANIMATION); + requireActivity().finish(); + requireActivity().overridePendingTransition(0, 0); + startActivity(intent); + requireActivity().overridePendingTransition(0, 0); + } } } \ No newline at end of file diff --git a/app/src/main/res/drawable/darkmode.png b/app/src/main/res/drawable/darkmode.png new file mode 100644 index 0000000000000000000000000000000000000000..7e8436a0bd8ebb2007731c46e352e36c546e587a GIT binary patch literal 2916 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 literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable/lightmode.png b/app/src/main/res/drawable/lightmode.png new file mode 100644 index 0000000000000000000000000000000000000000..a810a1c35d5888c1a3fe734cc8f79c0986cc2b09 GIT binary patch literal 3938 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 literal 0 HcmV?d00001 diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 06ea6ca..bad97d6 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -3,8 +3,7 @@ xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/container" android:layout_width="match_parent" - android:layout_height="match_parent" - android:paddingTop="?attr/actionBarSize"> + android:layout_height="match_parent"> <com.google.android.material.bottomnavigation.BottomNavigationView android:id="@+id/nav_view" diff --git a/app/src/main/res/layout/fragment_decide.xml b/app/src/main/res/layout/fragment_decide.xml index f92c614..8fda789 100644 --- a/app/src/main/res/layout/fragment_decide.xml +++ b/app/src/main/res/layout/fragment_decide.xml @@ -68,5 +68,26 @@ app:layout_constraintStart_toEndOf="@+id/DelivererButton" app:layout_constraintTop_toBottomOf="@+id/DelivererButton" /> + <ImageButton + android:id="@+id/imageButton" + android:layout_width="87dp" + android:layout_height="83dp" + android:layout_marginTop="16dp" + android:layout_marginEnd="16dp" + android:scaleType="fitCenter" + android:src="@drawable/darkmode" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintTop_toTopOf="parent" /> + + <ImageButton + android:id="@+id/imageButton2" + android:layout_width="87dp" + android:layout_height="83dp" + android:layout_marginTop="16dp" + android:scaleType="fitCenter" + android:src="@drawable/lightmode" + app:layout_constraintEnd_toStartOf="@+id/imageButton" + app:layout_constraintTop_toTopOf="parent" /> + </androidx.constraintlayout.widget.ConstraintLayout> </FrameLayout> \ 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 f8c6127..b136129 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -7,4 +7,5 @@ <color name="teal_700">#FF018786</color> <color name="black">#FF000000</color> <color name="white">#FFFFFFFF</color> + <color name="dark_grey">#5A5A5A</color> </resources> \ No newline at end of file diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml index e6d0eed..b05bf7a 100644 --- a/app/src/main/res/values/themes.xml +++ b/app/src/main/res/values/themes.xml @@ -5,6 +5,7 @@ <item name="colorPrimary">@color/purple_500</item> <item name="colorPrimaryVariant">@color/purple_700</item> <item name="colorOnPrimary">@color/white</item> + <!-- Secondary brand color. --> <item name="colorSecondary">@color/teal_200</item> <item name="colorSecondaryVariant">@color/teal_700</item> @@ -12,5 +13,6 @@ <!-- Status bar color. --> <item name="android:statusBarColor">?attr/colorPrimaryVariant</item> <!-- Customize your theme here. --> + </style> </resources> \ No newline at end of file -- GitLab