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

Fix state save/restore and move colors to attrs

Browse Source
This commit is contained in:
Grishka
2022-02-13 16:16:20 +03:00
parent 6d0f38eca6
commit a91538582a
35 changed files with 255 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
mastodon/src/main/res/values/attrs.xml Normal file
View File

@@ -0,0 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<attr name="colorButtonPrimary" format="color"/>
<attr name="colorButtonSecondary" format="color"/>
<attr name="colorButtonText" format="color"/>
<attr name="colorSecondary" format="color"/>
<attr name="colorBackgroundLight" format="color"/>
<attr name="colorBackgroundLightest" format="color"/>
<attr name="colorDarkIcon" format="color"/>
</resources>

2
mastodon/src/main/res/values/colors.xml
View File

@@ -26,8 +26,6 @@
<color name="gray_800_alpha50">#80282C37</color>
<color name="light_ui_action_button">#606984</color>
<color name="text_primary">@color/gray_800</color>
<color name="text_secondary">@color/gray_500</color>
<color name="secondary">#E9EDF2</color>
<color name="base">#282C37</color>
<color name="text_secondary_alpha50">#80667085</color>

5
mastodon/src/main/res/values/ids.xml
View File

@@ -1,4 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<item name="header" type="id"/>
<item name="profile_posts" type="id"/>
<item name="profile_posts_with_replies" type="id"/>
<item name="profile_media" type="id"/>
<item name="profile_about" type="id"/>
</resources>

52
mastodon/src/main/res/values/styles.xml
View File

@@ -9,14 +9,25 @@
<item name="android:windowBackground">@color/white</item>
<item name="android:statusBarColor">@color/actionbar_bg</item>
<item name="android:navigationBarColor">@color/navigation_bar_bg</item>
<item name="android:colorAccent">@color/gray_800</item>
<item name="android:colorPrimary">@color/gray_800</item>
<item name="android:colorBackground">@color/gray_100</item>
<item name="android:actionBarTheme">@style/Theme.Mastodon.Toolbar</item>
<item name="android:buttonStyle">@style/Widget.Mastodon.Button</item>
<item name="android:alertDialogTheme">@style/Theme.Mastodon.Dialog.Alert</item>
<item name="appkitBackDrawable">@drawable/ic_fluent_arrow_left_24_regular</item>
<item name="android:splitMotionEvents">false</item>
<!-- colors -->
<item name="android:colorAccent">@color/primary_700</item>
<item name="android:colorPrimary">@color/gray_800</item>
<item name="android:colorBackground">@color/gray_100</item>
<item name="android:textColorPrimary">@color/gray_800</item>
<item name="android:textColorSecondary">@color/gray_500</item>
<item name="colorButtonPrimary">@color/gray_800</item>
<item name="colorButtonSecondary">@color/gray_600</item>
<item name="colorButtonText">@color/gray_50</item>
<item name="colorSecondary">#E9EDF2</item>
<item name="colorBackgroundLight">@color/gray_50</item>
<item name="colorBackgroundLightest">@color/gray_25</item>
<item name="colorDarkIcon">@color/gray_900</item>
</style>
<style name="Theme.Mastodon.Toolbar" parent="android:ThemeOverlay.Material.ActionBar">
@@ -40,7 +51,7 @@
<item name="android:textAllCaps">false</item>
<item name="android:background">@drawable/bg_button</item>
<item name="android:textAppearance">@style/m3_label_large</item>
<item name="android:textColor">@color/gray_50</item>
<item name="android:textColor">?colorButtonText</item>
<item name="android:minHeight">36dp</item>
<item name="android:minWidth">0px</item>
</style>
@@ -53,8 +64,21 @@
<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:colorBackground">@color/gray_100</item>
<item name="android:buttonBarButtonStyle">@style/Widget.Mastodon.ButtonBarButton</item>
<!-- colors -->
<item name="android:colorAccent">@color/primary_700</item>
<item name="android:colorPrimary">@color/gray_800</item>
<item name="android:colorBackground">@color/gray_100</item>
<item name="android:textColorPrimary">@color/gray_800</item>
<item name="android:textColorSecondary">@color/gray_500</item>
<item name="colorButtonPrimary">@color/gray_800</item>
<item name="colorButtonSecondary">@color/gray_600</item>
<item name="colorButtonText">@color/gray_50</item>
<item name="colorSecondary">#E9EDF2</item>
<item name="colorBackgroundLight">@color/gray_50</item>
<item name="colorBackgroundLightest">@color/gray_25</item>
<item name="colorDarkIcon">@color/gray_900</item>
</style>
<style name="Widget.Mastodon.ButtonBarButton" parent="android:Widget.Material.Button.Borderless">
@@ -64,11 +88,11 @@
<item name="android:minWidth">0px</item>
<item name="android:background">@drawable/bg_alert_button</item>
<item name="android:textAppearance">@style/m3_label_large</item>
<item name="android:textColor">@color/text_primary</item>
<item name="android:textColor">?android:textColorPrimary</item>
</style>
<style name="alert_title">
<item name="android:textColor">@color/text_primary</item>
<item name="android:textColor">?android:textColorPrimary</item>
<item name="android:textSize">24dp</item>
<item name="android:minHeight">38dp</item>
<item name="android:gravity">bottom</item>
@@ -76,43 +100,43 @@
<style name="m3_body_large">
<item name="android:textSize">16dp</item>
<item name="android:textColor">@color/text_primary</item>
<item name="android:textColor">?android:textColorPrimary</item>
</style>
<style name="m3_body_medium">
<item name="android:textSize">14dp</item>
<item name="android:textColor">@color/text_primary</item>
<item name="android:textColor">?android:textColorPrimary</item>
</style>
<style name="m3_title_medium">
<item name="android:fontFamily">sans-serif-medium</item>
<item name="android:textSize">16dp</item>
<item name="android:textColor">@color/text_primary</item>
<item name="android:textColor">?android:textColorPrimary</item>
</style>
<style name="m3_title_small">
<item name="android:fontFamily">sans-serif-medium</item>
<item name="android:textSize">14dp</item>
<item name="android:textColor">@color/text_secondary</item>
<item name="android:textColor">?android:textColorSecondary</item>
</style>
<style name="m3_label_medium">
<item name="android:fontFamily">sans-serif-medium</item>
<item name="android:textSize">12dp</item>
<item name="android:textColor">@color/text_primary</item>
<item name="android:textColor">?android:textColorPrimary</item>
<item name="android:lineSpacingMultiplier">1.14</item>
</style>
<style name="m3_label_large">
<item name="android:fontFamily">sans-serif-medium</item>
<item name="android:textColor">@color/text_secondary</item>
<item name="android:textColor">?android:textColorSecondary</item>
<item name="android:textSize">14dp</item>
</style>
<style name="m3_title_large">
<item name="android:fontFamily">sans-serif-medium</item>
<item name="android:textSize">22dp</item>
<item name="android:textColor">@color/text_primary</item>
<item name="android:textColor">?android:textColorPrimary</item>
</style>
<style name="m3_headline_small">