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

fix inconsistent styles, fix non-sp font 

closes sk22#862
This commit is contained in:
sk 2023-10-13 22:17:45 +02:00
parent 638e1bf8e9
commit db661b56cb
2 changed files with 81 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -291,20 +291,18 @@
android:id="@+id/profile_counters" android:id="@+id/profile_counters"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="8dp" android:layout_marginHorizontal="4dp">
android:layout_marginRight="8dp">
<LinearLayout <LinearLayout
style="@style/Widget.Mastodon.M3.Button.Text"
android:id="@+id/followers_btn" android:id="@+id/followers_btn"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="48dp" android:layout_height="wrap_content"
android:background="@drawable/bg_button_borderless_rounded" android:minHeight="48dp"
android:gravity="center_horizontal" android:gravity="center_horizontal"
android:orientation="horizontal" android:orientation="horizontal"
android:paddingLeft="8dp" android:paddingStart="12dp"
android:paddingTop="4dp" android:paddingEnd="12dp">
android:paddingRight="8dp"
android:paddingBottom="4dp">
<TextView <TextView
android:id="@+id/followers_count" android:id="@+id/followers_count"
@ -335,6 +333,7 @@
android:id="@+id/profile_counters_separator" android:id="@+id/profile_counters_separator"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="48dp" android:layout_height="48dp"
android:layout_marginHorizontal="-4dp"
android:gravity="center" android:gravity="center"
android:text="@string/sk_separator" android:text="@string/sk_separator"
android:textAppearance="@style/m3_label_large" android:textAppearance="@style/m3_label_large"
@ -342,16 +341,15 @@
android:textColor="?colorM3OnSurfaceVariant" /> android:textColor="?colorM3OnSurfaceVariant" />
<LinearLayout <LinearLayout
style="@style/Widget.Mastodon.M3.Button.Text"
android:id="@+id/following_btn" android:id="@+id/following_btn"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="48dp" android:layout_height="wrap_content"
android:background="@drawable/bg_button_borderless_rounded" android:minHeight="48dp"
android:gravity="center_horizontal" android:gravity="center_horizontal"
android:orientation="horizontal" android:orientation="horizontal"
android:paddingLeft="8dp" android:paddingStart="12dp"
android:paddingTop="4dp" android:paddingEnd="12dp">
android:paddingRight="8dp"
android:paddingBottom="4dp">
<TextView <TextView
android:id="@+id/following_count" android:id="@+id/following_count"
@ -359,11 +357,11 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_marginEnd="4dp" android:layout_marginEnd="4dp"
android:ellipsize="end" android:ellipsize="end"
android:textAppearance="@style/m3_label_large"
android:fontFamily="sans-serif-black" android:fontFamily="sans-serif-black"
android:gravity="center_vertical" android:gravity="center_vertical"
android:singleLine="true" android:singleLine="true"
android:textColor="?colorM3OnSurfaceVariant" android:textColor="?colorM3OnSurfaceVariant"
android:textSize="14dp"
tools:text="123" /> tools:text="123" />
<TextView <TextView

110
mastodon/src/main/res/layout/item_discover_account.xml
View File

@ -130,7 +130,7 @@
android:layout_marginBottom="16dp" android:layout_marginBottom="16dp"
android:layout_marginStart="16dp" android:layout_marginStart="16dp"
android:layout_gravity="bottom" android:layout_gravity="bottom"
android:paddingTop="4dp" android:paddingTop="6dp"
android:gravity="center_vertical" android:gravity="center_vertical"
android:minHeight="44dp"> android:minHeight="44dp">
@ -142,23 +142,66 @@
android:layout_marginEnd="8dp" android:layout_marginEnd="8dp"
android:gravity="center_vertical" android:gravity="center_vertical"
android:orientation="horizontal"> android:orientation="horizontal">
<TextView <TextView
android:id="@+id/posts_count" android:id="@+id/posts_count"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="match_parent"
android:textAppearance="@style/m3_title_medium" android:layout_marginEnd="4dp"
android:singleLine="true"
android:ellipsize="end" android:ellipsize="end"
android:textAppearance="@style/m3_label_large"
android:fontFamily="sans-serif-black"
android:gravity="center_vertical"
android:singleLine="true"
android:textColor="?colorM3OnSurfaceVariant"
tools:text="123" /> tools:text="123" />
<TextView <TextView
android:id="@+id/posts_label" android:id="@+id/posts_label"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="match_parent"
android:layout_marginStart="4sp"
android:textAppearance="@style/m3_body_large"
android:singleLine="true"
android:ellipsize="middle" android:ellipsize="middle"
android:gravity="center_vertical"
android:singleLine="true"
android:textAppearance="@style/m3_label_large"
android:textColor="?colorM3OnSurfaceVariant"
tools:text="posts" /> tools:text="posts" />
</LinearLayout>
<LinearLayout
android:id="@+id/followers_btn"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="2dp"
android:layout_marginEnd="8dp"
android:orientation="horizontal"
android:gravity="center_vertical">
<TextView
android:id="@+id/followers_count"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_marginEnd="4dp"
android:ellipsize="end"
android:textAppearance="@style/m3_label_large"
android:fontFamily="sans-serif-black"
android:gravity="center_vertical"
android:singleLine="true"
android:textColor="?colorM3OnSurfaceVariant"
tools:text="123" />
<TextView
android:id="@+id/followers_label"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:ellipsize="middle"
android:gravity="center_vertical"
android:singleLine="true"
android:textAppearance="@style/m3_label_large"
android:textColor="?colorM3OnSurfaceVariant"
tools:text="followers" />
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
@ -169,50 +212,33 @@
android:layout_marginEnd="8dp" android:layout_marginEnd="8dp"
android:orientation="horizontal" android:orientation="horizontal"
android:gravity="center_vertical"> android:gravity="center_vertical">
<TextView <TextView
android:id="@+id/following_count" android:id="@+id/following_count"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="match_parent"
android:textAppearance="@style/m3_title_medium" android:layout_marginEnd="4dp"
android:singleLine="true"
android:ellipsize="end" android:ellipsize="end"
tools:text="123"/> android:textAppearance="@style/m3_label_large"
android:fontFamily="sans-serif-black"
android:gravity="center_vertical"
android:singleLine="true"
android:textColor="?colorM3OnSurfaceVariant"
tools:text="123" />
<TextView <TextView
android:id="@+id/following_label" android:id="@+id/following_label"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="match_parent"
android:layout_marginStart="4sp"
android:textAppearance="@style/m3_body_large"
android:singleLine="true"
android:ellipsize="middle" android:ellipsize="middle"
tools:text="following"/> android:gravity="center_vertical"
android:singleLine="true"
android:textAppearance="@style/m3_label_large"
android:textColor="?colorM3OnSurfaceVariant"
tools:text="following" />
</LinearLayout> </LinearLayout>
<LinearLayout
android:id="@+id/followers_btn"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="2dp"
android:orientation="horizontal"
android:gravity="center_vertical">
<TextView
android:id="@+id/followers_count"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="@style/m3_title_medium"
android:singleLine="true"
android:ellipsize="end"
tools:text="123"/>
<TextView
android:id="@+id/followers_label"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="4sp"
android:textAppearance="@style/m3_body_large"
android:singleLine="true"
android:ellipsize="middle"
tools:text="followers"/>
</LinearLayout>
</org.joinmastodon.android.ui.views.AutoOrientationLinearLayout> </org.joinmastodon.android.ui.views.AutoOrientationLinearLayout>
<FrameLayout <FrameLayout