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

4
mastodon/src/main/res/color/boost_icon.xml
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="@color/boost_selected" android:state_selected="true"/>
<item android:color="@color/text_secondary" android:state_enabled="true"/>
<item android:color="@color/text_secondary_alpha50"/>
<item android:color="?android:textColorSecondary" android:state_enabled="true"/>
<item android:color="?android:textColorSecondary" android:alpha="0.3"/>
</selector>

4
mastodon/src/main/res/color/button_bg.xml
View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="@color/gray_800" android:state_enabled="true"/>
<item android:color="@color/gray_800_alpha50"/>
<item android:color="?colorButtonPrimary" android:state_enabled="true"/>
<item android:color="?colorButtonPrimary" android:alpha="0.5"/>
</selector>

5
mastodon/src/main/res/color/button_bg_secondary.xml Normal file
View File

@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="?colorButtonSecondary" android:state_enabled="true"/>
<item android:color="?colorButtonSecondary" android:alpha="0.5"/>
</selector>

2
mastodon/src/main/res/color/favorite_icon.xml
View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="@color/favorite_selected" android:state_selected="true"/>
<item android:color="@color/text_secondary"/>
<item android:color="?android:textColorSecondary"/>
</selector>

2
mastodon/src/main/res/drawable/bg_button_secondary.xml
View File

@@ -4,7 +4,7 @@
<ripple android:color="@color/highlight_over_dark">
<item>
<shape>
<solid android:color="@color/gray_600"/>
<solid android:color="@color/button_bg_secondary"/>
<corners android:radius="10dp"/>
<padding android:left="16dp" android:right="16dp" android:top="8dp" android:bottom="8dp"/>
</shape>

2
mastodon/src/main/res/drawable/bg_fab.xml
View File

@@ -3,7 +3,7 @@
android:color="?android:colorControlHighlight">
<item>
<shape>
<solid android:color="@color/secondary"/>
<solid android:color="?colorSecondary"/>
<corners android:radius="16dp"/>
</shape>
</item>

2
mastodon/src/main/res/drawable/bg_poll_option.xml
View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="@color/gray_100"/>
<solid android:color="?android:colorBackground"/>
<corners android:radius="10dp"/>
</shape>

2
mastodon/src/main/res/drawable/bg_poll_option_clickable.xml
View File

@@ -2,7 +2,7 @@
<ripple xmlns:android="http://schemas.android.com/apk/res/android" android:color="?android:colorControlHighlight">
<item>
<shape>
<solid android:color="@color/gray_100"/>
<solid android:color="?android:colorBackground"/>
<corners android:radius="10dp"/>
</shape>
</item>

2
mastodon/src/main/res/drawable/bg_profile_field_edit_text.xml
View File

@@ -5,7 +5,7 @@
<item android:gravity="bottom">
<shape>
<size android:height="1dp"/>
<solid android:color="@color/primary_700"/>
<solid android:color="?android:colorAccent"/>
</shape>
</item>
</layer-list>

1
mastodon/src/main/res/layout/compose_poll_option.xml
View File

@@ -29,6 +29,7 @@
android:paddingEnd="16dp"
android:textAppearance="@style/m3_title_medium"
android:inputType="textCapSentences"
android:saveEnabled="false"
android:singleLine="true"/>
</LinearLayout>

4
mastodon/src/main/res/layout/display_item_footer.xml
View File

@@ -19,7 +19,7 @@
android:layout_gravity="center"
android:drawableStart="@drawable/ic_fluent_chat_multiple_24_regular"
android:drawablePadding="8dp"
android:drawableTint="@color/text_secondary"
android:drawableTint="?android:textColorSecondary"
android:gravity="center_vertical"
android:textAppearance="@style/m3_label_large"
tools:text="123"/>
@@ -89,7 +89,7 @@
android:layout_height="24dp"
android:layout_gravity="center"
android:src="@drawable/ic_fluent_share_24_regular"
android:tint="@color/text_secondary"
android:tint="?android:textColorSecondary"
android:gravity="center_vertical"/>
</FrameLayout>

1
mastodon/src/main/res/layout/display_item_header.xml
View File

@@ -34,6 +34,7 @@
android:ellipsize="end"
android:singleLine="true"
android:textAppearance="@style/m3_title_medium"
android:textAlignment="viewStart"
tools:text="Eugen" />
<org.joinmastodon.android.ui.views.HeaderSubtitleLinearLayout

2
mastodon/src/main/res/layout/display_item_poll_footer.xml
View File

@@ -6,4 +6,4 @@
android:paddingRight="16dp"
android:paddingBottom="8dp"
android:textAppearance="@style/m3_label_large"
android:textColor="@color/gray_800" />
android:textColor="?android:textColorPrimary" />

2
mastodon/src/main/res/layout/display_item_reblog_or_reply_line.xml
View File

@@ -13,7 +13,7 @@
android:layout_height="wrap_content"
android:textAppearance="@style/m3_title_small"
android:drawableStart="@drawable/ic_fluent_arrow_repeat_all_20_filled"
android:drawableTint="@color/gray_500"
android:drawableTint="?android:textColorSecondary"
android:drawablePadding="6dp"
android:singleLine="true"
android:ellipsize="end"/>

8
mastodon/src/main/res/layout/fragment_compose.xml
View File

@@ -25,7 +25,7 @@
android:layout_marginTop="16dp"
android:textAppearance="@style/m3_title_small"
android:drawableStart="@drawable/ic_fluent_arrow_reply_20_filled"
android:drawableTint="@color/gray_500"
android:drawableTint="?android:textColorSecondary"
android:drawablePadding="6dp"
android:singleLine="true"
android:ellipsize="end"/>
@@ -117,7 +117,7 @@
android:layout_marginRight="16dp"
android:layout_marginBottom="8dp"
android:textAppearance="@style/m3_label_large"
android:textColor="@color/gray_800"
android:textColor="?android:textColorPrimary"
tools:text="Duration: 7 days"/>
</LinearLayout>
@@ -135,7 +135,7 @@
android:layout_height="48dp"
android:orientation="horizontal"
android:gravity="center_vertical"
android:background="@color/gray_25"
android:background="?colorBackgroundLightest"
android:elevation="2dp"
android:outlineProvider="bounds"
android:paddingLeft="16dp"
@@ -207,7 +207,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="@style/m3_body_large"
android:textColor="@color/gray_500"
android:textColor="?android:textColorSecondary"
tools:text="500"/>
</LinearLayout>

6
mastodon/src/main/res/layout/fragment_profile.xml
View File

@@ -147,7 +147,7 @@
style="?android:progressBarStyleSmall"
android:elevation="10dp"
android:outlineProvider="none"
android:indeterminateTint="@color/text_button"
android:indeterminateTint="?colorButtonText"
android:visibility="gone"/>
</FrameLayout>
@@ -161,6 +161,7 @@
android:layout_marginTop="16dp"
android:layout_toStartOf="@id/profile_action_btn_wrap"
android:textAppearance="@style/m3_headline_small"
android:textAlignment="viewStart"
tools:text="Eugen" />
<TextView
@@ -171,7 +172,7 @@
android:layout_marginStart="16dp"
android:layout_toStartOf="@id/profile_action_btn_wrap"
android:textAppearance="@style/m3_title_medium"
android:textColor="@color/light_ui_action_button"
android:textColor="?android:textColorSecondary"
tools:text="\@Gargron"/>
<org.joinmastodon.android.ui.views.LinkedTextView
@@ -227,6 +228,7 @@
app:tabMinWidth="0dp"
app:tabIndicator="@drawable/tab_indicator_inset"
app:tabIndicatorAnimationMode="elastic"
app:tabIndicatorColor="?android:textColorPrimary"
app:tabMode="scrollable"
app:tabGravity="start"/>
<androidx.viewpager2.widget.ViewPager2

2
mastodon/src/main/res/layout/item_emoji_section.xml
View File

@@ -7,7 +7,7 @@
android:ellipsize="end"
android:fontFamily="sans-serif-medium"
android:textSize="12dp"
android:textColor="@color/gray_500"
android:textColor="?android:textColorSecondary"
android:textAllCaps="true"
android:paddingTop="24dp"
android:paddingBottom="12dp"

2
mastodon/src/main/res/layout/item_profile_about.xml
View File

@@ -4,7 +4,7 @@
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/gray_50"
android:background="?colorBackgroundLight"
android:elevation="2dp"
android:outlineProvider="background"
android:padding="16dp">

2
mastodon/src/main/res/layout/item_profile_about_add_row.xml
View File

@@ -10,7 +10,7 @@
android:layout_height="24dp"
android:layout_gravity="start|center_vertical"
android:layout_marginStart="16dp"
android:backgroundTint="@color/gray_900"
android:backgroundTint="?colorDarkIcon"
android:background="@drawable/ic_fluent_add_circle_24_regular"/>
</FrameLayout>

2
mastodon/src/main/res/layout/item_profile_about_editable.xml
View File

@@ -4,7 +4,7 @@
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/gray_50"
android:background="?colorBackgroundLight"
android:elevation="2dp"
android:outlineProvider="background"
android:padding="16dp">

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">