fix black theme on Android 12
This commit is contained in:
parent
f570aba492
commit
2286706fdb
|
@ -66,13 +66,15 @@ public abstract class BaseActivity extends AppCompatActivity implements Injectab
|
||||||
|
|
||||||
SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(this);
|
SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(this);
|
||||||
|
|
||||||
/* There isn't presently a way to globally change the theme of a whole application at
|
if (!setsTheme()) {
|
||||||
* runtime, just individual activities. So, each activity has to set its theme before any
|
/* There isn't presently a way to globally change the theme of a whole application at
|
||||||
* views are created. */
|
* runtime, just individual activities. So, each activity has to set its theme before any
|
||||||
String theme = preferences.getString("appTheme", ThemeUtils.APP_THEME_DEFAULT);
|
* views are created. */
|
||||||
Log.d("activeTheme", theme);
|
String theme = preferences.getString("appTheme", ThemeUtils.APP_THEME_DEFAULT);
|
||||||
if (theme.equals("black")) {
|
Log.d("activeTheme", theme);
|
||||||
setTheme(R.style.TuskyBlackTheme);
|
if (theme.equals("black")) {
|
||||||
|
setTheme(R.style.TuskyBlackTheme);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/* set the taskdescription programmatically, the theme would turn it blue */
|
/* set the taskdescription programmatically, the theme would turn it blue */
|
||||||
|
@ -101,6 +103,12 @@ public abstract class BaseActivity extends AppCompatActivity implements Injectab
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* override this in your activity if it does set it's own theme
|
||||||
|
and BaseActivity should not handle it*/
|
||||||
|
protected boolean setsTheme() {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
private static int textStyle(String name) {
|
private static int textStyle(String name) {
|
||||||
int style;
|
int style;
|
||||||
switch (name) {
|
switch (name) {
|
||||||
|
|
|
@ -81,6 +81,7 @@ import com.keylesspalace.tusky.settings.PrefKeys
|
||||||
import com.keylesspalace.tusky.util.ThemeUtils
|
import com.keylesspalace.tusky.util.ThemeUtils
|
||||||
import com.keylesspalace.tusky.util.deleteStaleCachedMedia
|
import com.keylesspalace.tusky.util.deleteStaleCachedMedia
|
||||||
import com.keylesspalace.tusky.util.emojify
|
import com.keylesspalace.tusky.util.emojify
|
||||||
|
import com.keylesspalace.tusky.util.getNonNullString
|
||||||
import com.keylesspalace.tusky.util.hide
|
import com.keylesspalace.tusky.util.hide
|
||||||
import com.keylesspalace.tusky.util.removeShortcut
|
import com.keylesspalace.tusky.util.removeShortcut
|
||||||
import com.keylesspalace.tusky.util.updateShortcut
|
import com.keylesspalace.tusky.util.updateShortcut
|
||||||
|
@ -160,7 +161,13 @@ class MainActivity : BottomSheetActivity(), ActionButtonActivity, HasAndroidInje
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun onCreate(savedInstanceState: Bundle?) {
|
override fun onCreate(savedInstanceState: Bundle?) {
|
||||||
|
val theme = preferences.getNonNullString("appTheme", ThemeUtils.APP_THEME_DEFAULT)
|
||||||
|
if (theme == "black") {
|
||||||
|
setTheme(R.style.BlackSplashTheme)
|
||||||
|
}
|
||||||
|
|
||||||
installSplashScreen()
|
installSplashScreen()
|
||||||
|
|
||||||
super.onCreate(savedInstanceState)
|
super.onCreate(savedInstanceState)
|
||||||
|
|
||||||
// delete old notification channels
|
// delete old notification channels
|
||||||
|
@ -278,6 +285,8 @@ class MainActivity : BottomSheetActivity(), ActionButtonActivity, HasAndroidInje
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
override fun setsTheme() = true
|
||||||
|
|
||||||
override fun onResume() {
|
override fun onResume() {
|
||||||
super.onResume()
|
super.onResume()
|
||||||
NotificationHelper.clearNotificationsForActiveAccount(this, accountManager)
|
NotificationHelper.clearNotificationsForActiveAccount(this, accountManager)
|
||||||
|
|
|
@ -36,6 +36,12 @@
|
||||||
<item name="postSplashScreenTheme">@style/TuskyTheme</item>
|
<item name="postSplashScreenTheme">@style/TuskyTheme</item>
|
||||||
</style>
|
</style>
|
||||||
|
|
||||||
|
<style name="BlackSplashTheme" parent="Theme.SplashScreen">
|
||||||
|
<item name="windowSplashScreenAnimatedIcon">@drawable/ic_splash</item>
|
||||||
|
<item name="windowSplashScreenBackground">@color/black</item>
|
||||||
|
<item name="postSplashScreenTheme">@style/TuskyBlackTheme</item>
|
||||||
|
</style>
|
||||||
|
|
||||||
<style name="TuskyTheme" parent="TuskyBaseTheme" />
|
<style name="TuskyTheme" parent="TuskyBaseTheme" />
|
||||||
|
|
||||||
<style name="TuskyDialogActivityTheme" parent="@style/TuskyTheme" />
|
<style name="TuskyDialogActivityTheme" parent="@style/TuskyTheme" />
|
||||||
|
|
Loading…
Reference in New Issue