Updated

Celestial04 · Mar 29, 2024 · ac23aea · ac23aea
1 parent e7609e9
commit ac23aea
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 17 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -15,7 +15,7 @@ android {
         minSdk 24
         targetSdk 34
         versionCode 6
-        versionName "3"
+        versionName "3.0.1"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }

diff --git a/app/src/main/java/com/hugdev/webapper/MainActivity.java b/app/src/main/java/com/hugdev/webapper/MainActivity.java
@@ -22,7 +22,6 @@
 import android.os.Environment;
 import android.os.Handler;
 import android.preference.PreferenceManager;
-import android.view.KeyEvent;
 import android.view.View;
 import android.view.inputmethod.EditorInfo;
 import android.webkit.CookieManager;
@@ -75,7 +74,7 @@ protected void onCreate(Bundle savedInstanceState) {
             selectedTheme = savedTheme;
         }
         setTheme(selectedTheme);
-        DynamicColors.applyIfAvailable(this);
+        DynamicColors.applyToActivitiesIfAvailable(this.getApplication());
         DynamicColors.applyToActivitiesIfAvailable(getApplication());
         setContentView(R.layout.activity_main);
         AppUpdateManager appUpdateManager = AppUpdateManagerFactory.create(this);
@@ -110,31 +109,26 @@ public boolean shouldOverrideUrlLoading(WebView view, String url) {
         soundButton.setOnClickListener(v -> {
             // Créer une boîte de dialogue avec trois options
             AlertDialog.Builder builder = new AlertDialog.Builder(MainActivity.this);
-            builder.setTitle("Choisir un thème");
+            builder.setTitle("Choisissez un thème");
 
-            String[] options = {"Thème noir", "Thème blanc", "Thème auto de l'appareil"};
+            String[] options = {"Thème sombre", "Thème clair"};
             builder.setItems(options, (dialog, which) -> {
                 // Vérifier quelle option a été sélectionnée et mettre le thème correspondant
                 switch (which) {
                     case 0:
-                        Toast.makeText(getApplicationContext(), "Thème noir activé", Toast.LENGTH_SHORT).show();
+                        Toast.makeText(getApplicationContext(), "Thème sombre activé", Toast.LENGTH_SHORT).show();
                         selectedTheme = R.style.Theme_WebApper_dark;
                         AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES);
                         getDelegate().setLocalNightMode(AppCompatDelegate.MODE_NIGHT_YES);
                         updateTheme();
                         break;
                     case 1:
-                        Toast.makeText(getApplicationContext(), "Thème blanc activé", Toast.LENGTH_SHORT).show();
+                        Toast.makeText(getApplicationContext(), "Thème clair activé", Toast.LENGTH_SHORT).show();
                         selectedTheme = R.style.Theme_WebApper_light;
                         AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_NO);
                         getDelegate().setLocalNightMode(AppCompatDelegate.MODE_NIGHT_NO);
                         updateTheme();
                         break;
-                    case 2:
-                        Toast.makeText(getApplicationContext(), "Thème auto de l'appareil activé", Toast.LENGTH_SHORT).show();
-                        selectedTheme = AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM;
-                        updateTheme();
-                        break;
                 }
             });
             builder.show();

diff --git a/app/src/main/java/com/hugdev/webapper/tuto_1.java b/app/src/main/java/com/hugdev/webapper/tuto_1.java
@@ -2,8 +2,6 @@
 
 import static android.app.usage.UsageEvents.Event.NONE;
 
-import static com.google.android.material.color.DynamicColors.applyIfAvailable;
-
 import android.content.Intent;
 import android.os.Bundle;
 import android.view.View;
@@ -29,7 +27,7 @@ protected void onCreate(Bundle savedInstanceState) {
             selectedTheme = savedTheme;
         }
         setTheme(selectedTheme);
-        applyIfAvailable(this);
+        DynamicColors.applyToActivitiesIfAvailable(this.getApplication());
         setContentView(R.layout.tuto_1);
         AppUpdateManager appUpdateManager = AppUpdateManagerFactory.create(this);
 

diff --git a/app/src/main/java/com/hugdev/webapper/tuto_2.java b/app/src/main/java/com/hugdev/webapper/tuto_2.java
@@ -27,7 +27,7 @@ protected void onCreate(Bundle savedInstanceState) {
             selectedTheme = savedTheme;
         }
         setTheme(selectedTheme);
-        DynamicColors.applyIfAvailable(this);
+        DynamicColors.applyToActivitiesIfAvailable(this.getApplication());
         setContentView(R.layout.tuto_2);
         AppUpdateManager appUpdateManager = AppUpdateManagerFactory.create(this);
 

diff --git a/app/src/main/java/com/hugdev/webapper/tuto_3.java b/app/src/main/java/com/hugdev/webapper/tuto_3.java
@@ -27,7 +27,7 @@ protected void onCreate(Bundle savedInstanceState) {
             selectedTheme = savedTheme;
         }
         setTheme(selectedTheme);
-        DynamicColors.applyIfAvailable(this);
+        DynamicColors.applyToActivitiesIfAvailable(this.getApplication());
         setContentView(R.layout.tuto_3);
 
         AppUpdateManager appUpdateManager = AppUpdateManagerFactory.create(this);