Merge branch 'material3_dynamic_color_theme'

README.md

@@ -61,17 +61,12 @@ To bookmark a post, press the button between the Favorite and Share buttons on t
 
 ## Installation
 
-**Press the download button above to download the APK. Open the downloaded file on your Android device to install it. Megalodon will automatically notify you about new updates inside the app.**
+**Press the download button above to download the APK. Open the downloaded file on your Android device to install it. Moshidon will automatically notify you about new updates inside the app.**
 
-To install this app on your Android device, download the [latest release from GitHub](https://github.com/sk22/megalodon/releases/latest/download/megalodon.apk) and open it. You might have to accept installing APK files from your browser when trying to install it. You can also take a look at all releases on the [Releases](https://github.com/sk22/megalodon/releases) page.
+To install this app on your Android device, download the [latest release from GitHub](https://github.com/LucasGGamerM/moshidon/releases/latest/download/moshidon.apk) and open it. You might have to accept installing APK files from your browser when trying to install it. You can also take a look at all releases on the [Releases](https://github.com/LucasGGamerM/moshidon/releases) page.
 
-Megalodon makes use of [Mastodon for Android](https://github.com/mastodon/mastodon-android)’s automatic update checker. Megalodon will check for new updates available on GitHub and offer to download and install them. You can also manually press “Check for updates” at the bottom of the settings page!
+Moshidon makes use of [Mastodon for Android](https://github.com/mastodon/mastodon-android)’s automatic update checker. Megalodon will check for new updates available on GitHub and offer to download and install them. You can also manually press “Check for updates” at the bottom of the settings page!
 
-### Other sources
-
-* **[Izzy's F-Droid repository](https://apt.izzysoft.de/fdroid/repo)**: https://apt.izzysoft.de/fdroid/index/apk/org.joinmastodon.android.sk
-
----
 
 
 ## Release variants
@@ -80,7 +75,7 @@ All downloads can be found on the [Releases](https://github.com/LucasGGamerM/mos
 
 **`moshidon.apk`**
 
-Variant with an integrated updater. If you download Megalodon from here (and not from an app store), just download the regular `megalodon.apk`.
+Variant with an integrated updater. If you download Moshidon from here (and not from an app store), just download the regular `moshidon.apk`.
 
 ---
 

mastodon/build.gradle

@@ -9,8 +9,8 @@ android {
 		applicationId "org.joinmastodon.android.moshinda"
 		minSdk 23
 		targetSdk 33
-		versionCode 61
+		versionCode 62
-		versionName "1.1.4+fork.61.moshinda"
+		versionName "1.1.4+fork.62.moshinda"
 		testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 		resConfigs "en", "ar-rSA", "bs-rBA", "ca-rES", "cs-rCZ", "de-rDE", "el-rGR", "es-rES",
 				"eu-rES", "fi-rFI", "fr-rFR", "gl-rES", "hr-rHR", "hy-rAM", "it-rIT", "iw-rIL",

mastodon/src/main/java/org/joinmastodon/android/GlobalUserPreferences.java

@@ -62,7 +62,8 @@ public class GlobalUserPreferences{
 		GREEN,
 		BLUE,
 		ORANGE,
-		YELLOW
+		YELLOW,
+		MATERIAL3
 	}
 
 	public enum ThemePreference{

mastodon/src/main/java/org/joinmastodon/android/fragments/SettingsFragment.java

@@ -237,6 +237,7 @@ public class SettingsFragment extends MastodonToolbarFragment{
 	}
 
 	private void onColorPreferenceClick(GlobalUserPreferences.ColorPreference color){
+
 		GlobalUserPreferences.color=color;
 		GlobalUserPreferences.save();
 		restartActivityToApplyNewTheme();
@@ -704,6 +705,15 @@ public class SettingsFragment extends MastodonToolbarFragment{
 					pref = GlobalUserPreferences.ColorPreference.YELLOW;
 					onColorPreferenceClick(pref);
 				}
+				else if(id==R.id.m3_color) {
+					if (android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
+						pref = GlobalUserPreferences.ColorPreference.MATERIAL3;
+						onColorPreferenceClick(pref);
+					}else{
+						Toast.makeText(getActivity(), R.string.sk_not_supported,
+								Toast.LENGTH_LONG).show();
+					}
+				}
 				else
 					return false;
 				return true;
@@ -723,6 +733,7 @@ public class SettingsFragment extends MastodonToolbarFragment{
 				case BLUE -> R.string.sk_color_theme_blue;
 				case ORANGE -> R.string.sk_color_theme_brown;
 				case YELLOW -> R.string.sk_color_theme_yellow;
+				case MATERIAL3 -> R.string.sk_color_theme_material_you;
 			});
 		}
 	}

mastodon/src/main/java/org/joinmastodon/android/ui/utils/UiUtils.java

@@ -718,6 +718,16 @@ public class UiUtils{
 							GlobalUserPreferences.trueBlackTheme ? R.style.Theme_Mastodon_Dark_TrueBlack_Yellow : R.style.Theme_Mastodon_Dark_Yellow;
 				});
 				break;
+			case MATERIAL3:
+				context.setTheme(switch(GlobalUserPreferences.theme){
+					case AUTO ->
+							GlobalUserPreferences.trueBlackTheme ? R.style.Theme_Mastodon_AutoLightDark_TrueBlack_Material3 : R.style.Theme_Mastodon_AutoLightDark_Material3;
+					case LIGHT ->
+							R.style.Theme_Mastodon_Light_Material3;
+					case DARK ->
+							GlobalUserPreferences.trueBlackTheme ? R.style.Theme_Mastodon_Dark_TrueBlack_Material3 : R.style.Theme_Mastodon_Dark_Material3;
+				});
+				break;
 		}
 
 	}

mastodon/src/main/res/menu/color_picker.xml

@@ -6,4 +6,5 @@
     <item android:id="@+id/blue_color" android:title="@string/sk_color_theme_blue"/>
     <item android:id="@+id/orange_color" android:title="@string/sk_color_theme_brown"/>
     <item android:id="@+id/yellow_color" android:title="@string/sk_color_theme_yellow"/>
+    <item android:id="@+id/m3_color" android:title="@string/sk_color_theme_material_you"/>
 </menu>

mastodon/src/main/res/values-night/styles.xml

@@ -17,4 +17,7 @@
 
 	<style name="Theme.Mastodon.AutoLightDark.Yellow" parent="Theme.Mastodon.Dark.Yellow"/>
 	<style name="Theme.Mastodon.AutoLightDark.TrueBlack.Yellow" parent="Theme.Mastodon.Dark.TrueBlack.Yellow"/>
+
+	<style name="Theme.Mastodon.AutoLightDark.Material3" parent="Theme.Mastodon.Dark.Material3"/>
+	<style name="Theme.Mastodon.AutoLightDark.TrueBlack.Material3" parent="Theme.Mastodon.Dark.TrueBlack.Material3"/>
 </resources>

mastodon/src/main/res/values-v31/colors.xml

@@ -2,6 +2,35 @@
 <resources>
 	<!-- M3 dynamic colors -->
 
+	<color name="m3_navigation_bar_bg">@android:color/system_neutral1_50</color>
+
+	<color name="m3_gray_900">@android:color/system_neutral1_900</color>
+	<color name="m3_gray_800t">@android:color/system_neutral1_800</color>
+	<color name="m3_gray_800">@android:color/system_neutral1_800</color>
+	<color name="m3_gray_700">@android:color/system_neutral1_700</color>
+	<color name="m3_gray_600">@android:color/system_neutral1_600</color>
+	<color name="m3_gray_500">@android:color/system_neutral1_500</color>
+	<color name="m3_gray_400">@android:color/system_neutral1_400</color>
+	<color name="m3_gray_300">@android:color/system_neutral1_300</color>
+	<color name="m3_gray_200">@android:color/system_neutral1_200</color>
+	<color name="m3_gray_100">@android:color/system_neutral1_100</color>
+	<color name="m3_gray_50t">@android:color/system_neutral1_50</color>
+	<color name="m3_gray_50">@android:color/system_neutral1_50</color>
+	<color name="m3_gray_25">@android:color/system_neutral1_10</color>
+
+	<color name="m3_primary_25">@android:color/system_accent1_10</color>
+	<color name="m3_primary_50">@android:color/system_accent1_50</color>
+	<color name="m3_primary_100">@android:color/system_accent1_100</color>
+	<color name="m3_primary_200">@android:color/system_accent1_200</color>
+	<color name="m3_primary_300">@android:color/system_accent1_300</color>
+	<color name="m3_primary_400">@android:color/system_accent1_400</color>
+	<color name="m3_primary_500">@android:color/system_accent1_500</color>
+	<color name="m3_primary_600">@android:color/system_accent1_600</color>
+	<color name="m3_primary_700">@android:color/system_accent1_700</color>
+	<color name="m3_primary_800">@android:color/system_accent1_800</color>
+	<color name="m3_primary_900">@android:color/system_accent1_900</color>
+
+
 	<!-- light theme -->
 	<color name="m3_sys_light_primary">@android:color/system_accent1_600</color>
 	<color name="m3_sys_light_on_primary">#FFF</color>

mastodon/src/main/res/values/strings_sk.xml

@@ -47,4 +47,6 @@
   <string name="sk_color_theme_blue">Blue</string>
   <string name="sk_color_theme_brown">Orange</string>
   <string name="sk_color_theme_yellow">Yellow</string>
+  <string name="sk_color_theme_material_you">Material You</string>
+  <string name="sk_not_supported">Not supported on your device</string>
 </resources>

mastodon/src/main/res/values/styles.xml

@@ -204,6 +204,122 @@
 		<item name="colorBackgroundLightest">@color/black</item>
 	</style>
 
+	<style name="Theme.Mastodon.Light.Material3" parent="Theme.Mastodon.Light.CustomBase">
+		<!-- needed to disable scrim on API 29+ -->
+		<item name="android:colorPrimary">@color/m3_gray_800</item>
+		<item name="android:textColorPrimary">@color/m3_gray_800</item>
+		<item name="android:textColorSecondary">@color/m3_gray_500</item>
+		<item name="colorDarkIcon">@color/m3_gray_900</item>
+		<item name="colorSearchHint">@color/m3_gray_600</item>
+		<item name="profileHeaderBackground">@color/m3_gray_500</item>
+
+		<item name="android:colorAccent">@color/m3_primary_700</item>
+		<item name="android:colorBackground">@color/m3_gray_100</item>
+		<item name="colorButtonText">@color/m3_gray_50</item>
+		<item name="colorBackgroundLight">@color/m3_gray_50</item>
+		<item name="colorBackgroundLightest">@color/m3_gray_25</item>
+		<item name="android:statusBarColor">@color/m3_gray_50</item>
+		<item name="android:navigationBarColor">@color/m3_navigation_bar_bg</item>
+		<item name="android:actionBarTheme">@style/Theme.Mastodon.Toolbar.M3</item>
+		<item name="android:alertDialogTheme">@style/Theme.Mastodon.Dialog.Alert.M3</item>
+		<item name="colorPollMostVoted">@color/m3_primary_500</item>
+		<item name="colorPollVoted">@color/m3_gray_300</item>
+		<item name="colorAccentLight">@color/m3_primary_600</item>
+		<item name="colorSearchField">@color/m3_gray_200</item>
+		<item name="colorTabInactive">@color/m3_gray_400</item>
+		<item name="colorAccentLightest">@color/m3_primary_100</item>
+		<item name="colorSecondary">@color/m3_gray_50</item>
+	</style>
+
+	<style name="Theme.Mastodon.Dark.Material3" parent="Theme.Mastodon.Dark.CustomBase">
+		<!-- needed to disable scrim on API 29+ -->
+		<item name="android:colorBackground">@color/m3_gray_700</item>
+		<item name="colorButtonText">@color/m3_gray_800</item>
+		<item name="colorBackgroundLight">@color/m3_gray_700</item>
+		<item name="colorBackgroundLightest">@color/m3_gray_900</item>
+		<item name="colorBackgroundPopup">@color/m3_gray_900</item>
+		<item name="colorDarkIcon">@color/m3_gray_25</item>
+		<item name="colorWindowBackground">@color/m3_gray_800</item>
+		<item name="android:statusBarColor">@color/m3_gray_800</item>
+		<item name="android:navigationBarColor">@color/m3_gray_800</item>
+		<item name="colorPollVoted">@color/m3_gray_600</item>
+		<item name="profileHeaderBackground">?colorWindowBackground</item>
+		<item name="android:actionBarTheme">@style/Theme.Mastodon.Toolbar.Dark.CustomBase</item>
+
+		<item name="android:colorAccent">@color/m3_primary_400</item>
+		<item name="android:colorPrimary">@color/m3_gray_50</item>
+		<item name="android:textColorPrimary">@color/m3_gray_50</item>
+		<item name="android:textColorSecondary">@color/m3_gray_400</item>
+		<item name="android:alertDialogTheme">@style/Theme.Mastodon.Dialog.Alert.Dark.M3</item>
+		<item name="colorPollMostVoted">@color/m3_primary_700</item>
+		<item name="colorAccentLight">@color/m3_primary_600</item>
+		<item name="colorAccentLightest">@color/m3_primary_800</item>
+		<item name="colorTabInactive">@color/m3_gray_400</item>
+		<item name="colorSearchHint">@color/m3_gray_300</item>
+		<item name="colorSecondary">@color/m3_gray_50</item>
+
+		<!-- TODO dark colors -->
+		<item name="colorSearchField">@color/m3_gray_700</item>
+	</style>
+
+	<style name="Theme.Mastodon.Dark.TrueBlack.Material3" parent="Theme.Mastodon.Dark.Material3">
+		<item name="android:colorAccent">@color/m3_primary_400</item>
+		<item name="colorPollMostVoted">@color/m3_primary_700</item>
+		<item name="colorAccentLight">@color/m3_primary_600</item>
+		<item name="colorAccentLightest">@color/m3_primary_800</item>
+		<item name="colorSecondary">@color/m3_gray_50</item>
+
+		<item name="colorPollVoted">@color/m3_gray_800</item>
+		<item name="colorSearchField">@color/m3_gray_900</item>
+		<item name="colorBackgroundPopup">@color/m3_gray_900</item>
+		<item name="android:navigationBarColor">@color/black</item>
+		<item name="android:colorBackground">@color/black</item>
+		<item name="android:statusBarColor">@color/black</item>
+		<item name="android:actionBarTheme">@style/Theme.Mastodon.Toolbar.Dark.TrueBlack</item>
+		<item name="colorBackgroundLight">@color/black</item>
+		<item name="colorWindowBackground">@color/black</item>
+		<item name="colorButtonText">@color/black</item>
+		<item name="colorBackgroundLightest">@color/black</item>
+	</style>
+
+	<style name="Theme.Mastodon.AutoLightDark.Material3" parent="Theme.Mastodon.Light.Material3"/>
+	<style name="Theme.Mastodon.AutoLightDark.TrueBlack.Material3" parent="Theme.Mastodon.Light.Material3"/>
+
+	<style name="Theme.Mastodon.Dialog.Alert.Dark.M3" parent="android:Theme.Material.Dialog.Alert">
+		<item name="android:windowTitleStyle">@style/alert_title</item>
+		<item name="android:dialogPreferredPadding">24dp</item>
+		<item name="android:windowBackground">@drawable/bg_alert</item>
+		<item name="android:buttonBarButtonStyle">@style/Widget.Mastodon.ButtonBarButton</item>
+
+		<!-- colors -->
+		<item name="android:colorAccent">@color/m3_primary_600</item>
+		<item name="android:colorPrimary">@color/m3_gray_50</item>
+		<item name="android:colorBackground">@color/m3_gray_700</item>
+		<item name="android:textColorPrimary">@color/m3_gray_50</item>
+		<item name="android:textColorSecondary">@color/m3_gray_400</item>
+	</style>
+
+	<style name="Theme.Mastodon.Dialog.Alert.M3" parent="android:Theme.Material.Light.Dialog.Alert">
+		<item name="android:windowTitleStyle">@style/alert_title</item>
+		<item name="android:dialogPreferredPadding">24dp</item>
+		<item name="android:windowBackground">@drawable/bg_alert</item>
+		<item name="android:buttonBarButtonStyle">@style/Widget.Mastodon.ButtonBarButton</item>
+
+		<!-- colors -->
+		<item name="android:colorAccent">@color/m3_primary_700</item>
+		<item name="android:colorPrimary">@color/m3_gray_800</item>
+		<item name="android:colorBackground">@color/m3_gray_100</item>
+		<item name="android:textColorPrimary">@color/m3_gray_800</item>
+		<item name="android:textColorSecondary">@color/m3_gray_500</item>
+	</style>
+
+	<style name="Theme.Mastodon.Toolbar.M3" parent="android:ThemeOverlay.Material.ActionBar">
+		<item name="android:colorPrimary">@color/m3_gray_50</item>
+		<item name="android:textColorPrimary">@color/m3_gray_800</item>
+		<item name="android:textColorSecondary">@color/m3_gray_800</item>
+	</style>
+
+
 	<style name="Theme.Mastodon.Light.Green" parent="Theme.Mastodon.Light.CustomBase">
 		<item name="android:colorAccent">@color/green_primary_700</item>
 		<item name="android:colorBackground">@color/green_gray_100</item>
@@ -610,6 +726,12 @@
 		<item name="android:textColorSecondary">@color/gray_50</item>
 	</style>
 
+	<style name="Theme.Mastodon.Toolbar.Dark.Material3" parent="android:ThemeOverlay.Material.Dark.ActionBar">
+		<item name="android:colorPrimary">@color/m3_gray_800</item>
+		<item name="android:textColorPrimary">@color/m3_gray_50</item>
+		<item name="android:textColorSecondary">@color/m3_gray_50</item>
+	</style>
+
 	<style name="Theme.Mastodon.Toolbar.Dark.TrueBlack" parent="android:ThemeOverlay.Material.Dark.ActionBar">
 		<item name="android:colorPrimary">@color/black</item>
 	</style>