owen/moshidon
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

IT FINALLY FUCKING COMPILES

Browse Source
This commit is contained in:
LucasGGamerM
2022-12-22 11:27:52 -03:00
parent 66efe750a8
commit f0bd9233b7
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mastodon/src/main/AndroidManifest.xml
View File

@@ -20,7 +20,7 @@
android:localeConfig="@xml/locales_config" android:localeConfig="@xml/locales_config"
android:icon="@mipmap/ic_launcher" android:icon="@mipmap/ic_launcher"
android:roundIcon="@mipmap/ic_launcher_round" android:roundIcon="@mipmap/ic_launcher_round"
android:theme="@style/Theme.Mastodon.AutoLightDark.Original" android:theme="@style/Theme.Mastodon.AutoLightDark"
android:largeHeap="true"> android:largeHeap="true">
<activity android:name=".MainActivity" android:exported="true" android:configChanges="orientation|screenSize" android:windowSoftInputMode="adjustResize" android:launchMode="singleTask"> <activity android:name=".MainActivity" android:exported="true" android:configChanges="orientation|screenSize" android:windowSoftInputMode="adjustResize" android:launchMode="singleTask">

4
mastodon/src/main/java/org/joinmastodon/android/fragments/SettingsFragment.java
View File

@@ -710,7 +710,7 @@ public class SettingsFragment extends MastodonToolbarFragment{
onColorPreferenceClick(pref); onColorPreferenceClick(pref);
} }
else if(id==R.id.orange_color) { else if(id==R.id.orange_color) {
pref = GlobalUserPreferences.ColorPreference.ORANGE; pref = ColorPreference.BROWN;
onColorPreferenceClick(pref); onColorPreferenceClick(pref);
} }
else if(id==R.id.yellow_color) { else if(id==R.id.yellow_color) {
@@ -748,7 +748,7 @@ public class SettingsFragment extends MastodonToolbarFragment{
case PURPLE -> R.string.sk_color_theme_purple; case PURPLE -> R.string.sk_color_theme_purple;
case GREEN -> R.string.sk_color_theme_green; case GREEN -> R.string.sk_color_theme_green;
case BLUE -> R.string.sk_color_theme_blue; case BLUE -> R.string.sk_color_theme_blue;
case ORANGE -> R.string.sk_color_theme_brown; case BROWN -> R.string.sk_color_theme_brown;
case YELLOW -> R.string.sk_color_theme_yellow; case YELLOW -> R.string.sk_color_theme_yellow;
case RED -> R.string.sk_color_theme_red; case RED -> R.string.sk_color_theme_red;
case MATERIAL3 -> R.string.sk_color_theme_material3; case MATERIAL3 -> R.string.sk_color_theme_material3;