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

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