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

Thread fragment tweaks part 2

Browse Source
This commit is contained in:
Grishka
2023-11-14 21:27:15 +03:00
parent 5c9ad9286d
commit 45cc531eec
9 changed files with 412 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
mastodon/src/main/res/drawable/bg_rect_ripple.xml Normal file
View File

@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<ripple xmlns:android="http://schemas.android.com/apk/res/android" android:color="@color/m3_on_surface_overlay">
<item android:id="@android:id/mask">
<shape>
<solid android:color="#000"/>
</shape>
</item>
</ripple>

81
mastodon/src/main/res/layout/fragment_thread.xml Normal file
View File

@@ -0,0 +1,81 @@
<?xml version="1.0" encoding="utf-8"?>
<me.grishka.appkit.views.FragmentRootLinearLayout android:layout_width="match_parent"
android:layout_height="match_parent"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:orientation="vertical"
android:id="@+id/appkit_loader_root"
xmlns:android="http://schemas.android.com/apk/res/android"
android:background="?colorM3Surface">
<include layout="@layout/appkit_toolbar"/>
<FrameLayout
android:id="@+id/appkit_loader_content"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1">
<include layout="@layout/loading"
android:id="@+id/loading"/>
<ViewStub android:layout="?errorViewLayout"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:id="@+id/error"
android:visibility="gone"/>
<View
android:layout_width="match_parent"
android:layout_height="match_parent"
android:id="@+id/content_stub"/>
</FrameLayout>
<View
android:layout_width="match_parent"
android:layout_height="0.5dp"
android:background="?colorM3OutlineVariant"/>
<FrameLayout
android:id="@+id/reply_button_wrapper"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/bg_m3_surface2">
<LinearLayout
android:id="@+id/reply_button"
android:layout_width="match_parent"
android:layout_height="40dp"
android:layout_marginHorizontal="16dp"
android:layout_marginVertical="8dp"
android:orientation="horizontal"
android:background="?colorM3SurfaceVariant"
android:foreground="@drawable/bg_rect_4dp_ripple"
android:foregroundTint="?colorM3OnSurfaceVariant"
android:padding="8dp">
<ImageView
android:id="@+id/avatar"
android:layout_width="24dp"
android:layout_height="24dp"
android:layout_marginEnd="8dp"
android:importantForAccessibility="no"
android:scaleType="centerCrop"/>
<TextView
android:id="@+id/reply_btn_text"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:textAppearance="@style/m3_body_medium"
android:textColor="?colorM3OnSurfaceVariant"
android:singleLine="true"
android:ellipsize="end"
tools:text="Reply to ..."/>
</LinearLayout>
</FrameLayout>
</me.grishka.appkit.views.FragmentRootLinearLayout>

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

@@ -15,7 +15,9 @@
<attr name="colorM3Background" format="color"/>
<attr name="colorM3OnBackground" format="color"/>
<attr name="colorM3Surface" format="color"/>
<attr name="colorM3SurfaceInverse" format="color"/>
<attr name="colorM3OnSurface" format="color"/>
<attr name="colorM3OnSurfaceInverse" format="color"/>
<attr name="colorM3SurfaceVariant" format="color"/>
<attr name="colorM3OnSurfaceVariant" format="color"/>
<attr name="colorM3Outline" format="color"/>

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

@@ -656,4 +656,6 @@
<string name="manage_list_members">Manage list members</string>
<string name="list_no_members">No members yet</string>
<string name="list_find_users">Find users to add</string>
<string name="reply_to_user">Reply to %s</string>
<string name="posted_at">Posted at %s</string>
</resources>

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

@@ -53,6 +53,8 @@
<item name="colorM3ErrorContainer">#F9DEDC</item>
<item name="colorM3OnErrorContainer">#410E0B</item>
<item name="colorM3PrimaryInverse">@color/m3_sys_dark_primary</item>
<item name="colorM3SurfaceInverse">@color/m3_sys_dark_surface</item>
<item name="colorM3OnSurfaceInverse">@color/m3_sys_dark_on_surface</item>
<item name="colorWhite">#FFF</item>
<item name="colorFavorite">#8b5000</item>
<item name="colorBoost">#ab332a</item>
@@ -120,6 +122,8 @@
<item name="colorM3ErrorContainer">#8C1D18</item>
<item name="colorM3OnErrorContainer">#F9DEDC</item>
<item name="colorM3PrimaryInverse">@color/m3_sys_light_primary</item>
<item name="colorM3SurfaceInverse">@color/m3_sys_light_surface</item>
<item name="colorM3OnSurfaceInverse">@color/m3_sys_light_on_surface</item>
<item name="colorWhite">#000</item>
<item name="colorFavorite">#ffb871</item>
<item name="colorBoost">#ffb4aa</item>