chinwag/chinwag-android
chinwag/chinwag-android
2
0
Fork 0
Code Issues Pull requests Releases Activity

Provide default text sizes in TuskyBaseTheme (#3108)

Browse source 
These aren't necessary for the app, and are overwritten with the actual style
in `BaseActivity.onCreate()`.

But if they're missing the Android Studio layout preview renderer crashes.
This commit is contained in:
Nik Clayton 2022-12-30 13:11:26 +01:00 • committed by GitHub
parent 62a8a4a60a
commit 0def7e7230
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/com/keylesspalace/tusky/BaseActivity.java
View file

@ -82,7 +82,7 @@ public abstract class BaseActivity extends AppCompatActivity implements Injectab
setTaskDescription(new ActivityManager.TaskDescription(appName, appIcon, recentsBackgroundColor)); setTaskDescription(new ActivityManager.TaskDescription(appName, appIcon, recentsBackgroundColor));
int style = textStyle(preferences.getString("statusTextSize", "medium")); int style = textStyle(preferences.getString("statusTextSize", "medium"));
getTheme().applyStyle(style, false); getTheme().applyStyle(style, true);
if(requiresLogin()) { if(requiresLogin()) {
redirectIfNotLoggedIn(); redirectIfNotLoggedIn();

7
app/src/main/res/values/styles.xml
View file

@ -41,6 +41,13 @@
<style name="TuskyDialogActivityTheme" parent="@style/TuskyTheme" /> <style name="TuskyDialogActivityTheme" parent="@style/TuskyTheme" />
<style name="TuskyBaseTheme" parent="Theme.MaterialComponents.DayNight.NoActionBar"> <style name="TuskyBaseTheme" parent="Theme.MaterialComponents.DayNight.NoActionBar">
<!-- Provide default text sizes. These are overwritten in BaseActivity, but
if they are missing then the Android Studio layout preview crashes
with java.lang.reflect.InvocationTargetException -->
<item name="status_text_small">14sp</item>
<item name="status_text_medium">16sp</item>
<item name="status_text_large">18sp</item>
<item name="colorPrimary">@color/tusky_blue</item> <item name="colorPrimary">@color/tusky_blue</item>
<item name="colorOnPrimary">@color/white</item> <item name="colorOnPrimary">@color/white</item>