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

Better toot layouts, char counter in compose

Browse Source
This commit is contained in:
Grishka
2022-02-01 08:56:13 +03:00
parent a4a514d37a
commit b9bdf7caec
33 changed files with 2744 additions and 140 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
mastodon/src/main/res/animator/fab_shadow.xml Normal file
View File

@@ -0,0 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_pressed="true">
<set>
<objectAnimator android:propertyName="translationZ"
android:duration="@android:integer/config_shortAnimTime"
android:valueTo="4dp"
android:valueType="floatType"/>
</set>
</item>
<item android:state_pressed="false">
<set>
<objectAnimator android:propertyName="translationZ"
android:duration="100"
android:valueTo="2dp"
android:valueType="floatType"/>
</set>
</item>
</selector>

10
mastodon/src/main/res/drawable/bg_fab.xml Normal file
View File

@@ -0,0 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<ripple xmlns:android="http://schemas.android.com/apk/res/android"
android:color="?android:colorControlHighlight">
<item>
<shape>
<solid android:color="@color/secondary"/>
<corners android:radius="16dp"/>
</shape>
</item>
</ripple>

5
mastodon/src/main/res/drawable/ic_edit_34.xml Normal file
View File

@@ -0,0 +1,5 @@
<vector android:height="34dp"
android:viewportHeight="24" android:viewportWidth="24"
android:width="34dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="@android:color/white" android:pathData="M3,17.25V21h3.75L17.81,9.94l-3.75,-3.75L3,17.25zM20.71,7.04c0.39,-0.39 0.39,-1.02 0,-1.41l-2.34,-2.34c-0.39,-0.39 -1.02,-0.39 -1.41,0l-1.83,1.83 3.75,3.75 1.83,-1.83z"/>
</vector>

3
mastodon/src/main/res/drawable/ic_fluent_arrow_repeat_all_20_filled.xml Normal file
View File

@@ -0,0 +1,3 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="20dp" android:height="20dp" android:viewportWidth="20" android:viewportHeight="20">
<path android:pathData="M15.75 6.01c0.18 0 0.344 0.063 0.473 0.168 1.088 0.914 1.78 2.287 1.78 3.822 0 2.689-2.122 4.882-4.783 4.995L13.003 15H8.56l1.22 1.22c0.266 0.266 0.29 0.683 0.072 0.976L9.781 17.28c-0.267 0.267-0.683 0.29-0.977 0.073L8.72 17.28l-2.5-2.5c-0.266-0.266-0.29-0.683-0.072-0.976L6.22 13.72l2.5-2.5c0.293-0.293 0.768-0.293 1.06 0 0.267 0.266 0.291 0.683 0.073 0.976L9.781 12.28 8.56 13.5h4.442c1.868 0 3.395-1.464 3.495-3.308L16.503 10c0-1.081-0.49-2.048-1.26-2.69C15.093 7.175 15 6.98 15 6.76c0-0.414 0.335-0.75 0.75-0.75zm-5.53-3.29c0.266-0.267 0.683-0.29 0.977-0.073L11.28 2.72l2.5 2.5 0.072 0.084c0.194 0.26 0.197 0.619 0.008 0.882L13.78 6.28l-2.5 2.5-0.084 0.073c-0.261 0.194-0.62 0.196-0.883 0.007L10.22 8.78l-0.072-0.084C9.954 8.436 9.95 8.077 10.14 7.814l0.08-0.094 1.22-1.22H7c-1.87 0-3.396 1.464-3.496 3.308L3.498 10c0 1.083 0.492 2.051 1.265 2.693C4.909 12.83 5 13.023 5 13.24c0 0.414-0.335 0.75-0.75 0.75-0.19 0-0.365-0.072-0.498-0.19-1.073-0.913-1.754-2.277-1.754-3.8 0-2.689 2.122-4.882 4.783-4.995L6.998 5h4.441L10.22 3.78l-0.072-0.084C9.93 3.403 9.954 2.986 10.22 2.72z" android:fillColor="@color/fluent_default_icon_tint"/>
</vector>

3
mastodon/src/main/res/drawable/ic_fluent_arrow_repeat_all_24_regular.xml Normal file
View File

@@ -0,0 +1,3 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24">
<path android:pathData="M14.61 2.47l-0.077-0.067C14.24 2.18 13.818 2.201 13.55 2.47l-0.068 0.077c-0.223 0.296-0.201 0.718 0.068 0.988l1.971 1.977H8.5L8.267 5.516C4.785 5.639 2 8.51 2 12.036c0 1.69 0.64 3.23 1.692 4.39l0.072 0.069c0.131 0.111 0.3 0.179 0.486 0.179 0.414 0 0.75-0.337 0.75-0.753 0-0.173-0.058-0.332-0.156-0.46l-0.2-0.23C3.93 14.363 3.5 13.249 3.5 12.035c0-2.771 2.239-5.018 5-5.018h6.881l-1.832 1.84-0.067 0.078C13.26 9.23 13.281 9.653 13.55 9.922c0.292 0.294 0.767 0.294 1.06 0l3.182-3.194 0.067-0.077c0.224-0.295 0.202-0.717-0.067-0.987L14.61 2.471zm5.62 5.101c-0.13-0.109-0.297-0.174-0.48-0.174-0.414 0-0.75 0.337-0.75 0.752 0 0.187 0.068 0.358 0.18 0.488 0.82 0.894 1.32 2.088 1.32 3.398 0 2.772-2.239 5.019-5 5.019H8.558l1.905-1.911 0.074-0.086c0.197-0.267 0.195-0.636-0.007-0.902l-0.067-0.077-0.084-0.073c-0.267-0.199-0.635-0.197-0.9 0.006l-0.076 0.067-3.182 3.194-0.073 0.085c-0.198 0.267-0.196 0.636 0.006 0.902l0.067 0.077 3.182 3.194 0.084 0.072c0.293 0.22 0.71 0.195 0.976-0.073 0.269-0.269 0.291-0.692 0.068-0.987l-0.068-0.077-1.899-1.906H15.5l0.233-0.004C19.215 18.432 22 15.56 22 12.035c0-1.693-0.643-3.236-1.697-4.395L20.23 7.57z" android:fillColor="@color/fluent_default_icon_tint"/>
</vector>

3
mastodon/src/main/res/drawable/ic_fluent_chat_multiple_24_regular.xml Normal file
View File

@@ -0,0 +1,3 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24">
<path android:pathData="M9.562 3c-4.143 0-7.5 3.358-7.5 7.5 0 1.133 0.251 2.209 0.702 3.173L2.04 16.515c-0.233 0.913 0.59 1.744 1.504 1.524 0.75-0.18 1.903-0.457 2.93-0.702C7.417 17.763 8.463 18 9.563 18c4.142 0 7.5-3.358 7.5-7.5 0-4.142-3.358-7.5-7.5-7.5zm-6 7.5c0-3.314 2.686-6 6-6 3.313 0 6 2.686 6 6s-2.687 6-6 6c-0.961 0-1.867-0.225-2.67-0.625l-0.244-0.121-0.264 0.063c-0.923 0.22-1.99 0.475-2.788 0.667l0.69-2.708 0.07-0.276-0.13-0.253C3.8 12.425 3.562 11.49 3.562 10.5zm11 10.5c-1.97 0-3.762-0.759-5.1-2h0.1c0.718 0 1.415-0.089 2.08-0.257 0.865 0.482 1.86 0.757 2.92 0.757 0.96 0 1.866-0.225 2.67-0.625l0.243-0.121 0.264 0.063c0.922 0.22 1.966 0.445 2.74 0.61-0.175-0.751-0.414-1.756-0.642-2.651l-0.07-0.276 0.13-0.253c0.425-0.822 0.665-1.755 0.665-2.747 0-2.115-1.094-3.974-2.747-5.042-0.179-0.724-0.45-1.41-0.8-2.048 2.937 1.017 5.047 3.807 5.047 7.09 0 1.133-0.252 2.21-0.703 3.174 0.253 1.008 0.509 2.1 0.671 2.803 0.205 0.885-0.575 1.686-1.467 1.5-0.727-0.152-1.87-0.396-2.913-0.64C16.706 20.763 15.66 21 14.561 21z" android:fillColor="@color/fluent_default_icon_tint"/>
</vector>

3
mastodon/src/main/res/drawable/ic_fluent_share_24_regular.xml Normal file
View File

@@ -0,0 +1,3 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24">
<path android:pathData="M6.747 4h3.464c0.414 0 0.75 0.335 0.75 0.75 0 0.38-0.282 0.693-0.648 0.743L10.21 5.499H6.747c-1.191 0-2.166 0.926-2.245 2.097L4.497 7.75v9.5c0 1.19 0.925 2.165 2.096 2.244L6.747 19.5h9.5c1.191 0 2.166-0.926 2.245-2.096l0.005-0.154v-0.498c0-0.415 0.336-0.75 0.75-0.75 0.38 0 0.694 0.282 0.744 0.648l0.006 0.102v0.498c0 2.004-1.572 3.64-3.55 3.744L16.247 21h-9.5c-2.005 0-3.642-1.573-3.745-3.551l-0.005-0.2v-9.5c0-2.004 1.572-3.64 3.55-3.744l0.2-0.006h3.464-3.464zM14.5 6.52V3.75c0-0.624 0.706-0.96 1.187-0.61l0.082 0.068 5.994 5.75c0.28 0.269 0.306 0.7 0.077 0.998l-0.077 0.085-5.994 5.752c-0.45 0.432-1.182 0.154-1.262-0.435L14.5 15.251v-2.725l-0.344 0.03c-2.4 0.25-4.7 1.331-6.915 3.26-0.519 0.453-1.322 0.025-1.236-0.658C6.67 9.838 9.452 6.907 14.2 6.54l0.3-0.02V3.75v2.77zM16 5.507V7.25C16 7.663 15.665 8 15.25 8c-3.874 0-6.274 1.676-7.312 5.157L7.86 13.435l0.352-0.237C10.45 11.737 12.798 11 15.251 11c0.38 0 0.693 0.283 0.743 0.649l0.006 0.1v1.743L20.16 9.5 16 5.508z" android:fillColor="@color/fluent_default_icon_tint"/>
</vector>

3
mastodon/src/main/res/drawable/ic_fluent_star_24_filled.xml Normal file
View File

@@ -0,0 +1,3 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24">
<path android:pathData="M10.788 3.102c0.495-1.003 1.926-1.003 2.421 0l2.358 4.778 5.273 0.766c1.107 0.16 1.549 1.522 0.748 2.303l-3.816 3.719 0.901 5.25c0.19 1.104-0.968 1.945-1.959 1.424l-4.716-2.48-4.715 2.48c-0.99 0.52-2.148-0.32-1.96-1.423l0.901-5.251-3.815-3.72c-0.801-0.78-0.359-2.141 0.748-2.302L8.43 7.88l2.358-4.778z" android:fillColor="@color/fluent_default_icon_tint"/>
</vector>

3
mastodon/src/main/res/drawable/ic_fluent_star_24_regular.xml Normal file
View File

@@ -0,0 +1,3 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24">
<path android:pathData="M10.788 3.102c0.495-1.003 1.926-1.003 2.421 0l2.358 4.778 5.273 0.766c1.107 0.16 1.549 1.522 0.748 2.303l-3.816 3.719 0.901 5.25c0.19 1.104-0.968 1.945-1.959 1.424l-4.716-2.48-4.715 2.48c-0.99 0.52-2.148-0.32-1.96-1.423l0.901-5.251-3.815-3.72c-0.801-0.78-0.359-2.141 0.748-2.302L8.43 7.88l2.358-4.778zm1.21 0.937L9.74 8.614C9.543 9.013 9.163 9.29 8.724 9.353l-5.05 0.734 3.654 3.562c0.318 0.31 0.463 0.757 0.388 1.195l-0.862 5.029 4.516-2.375c0.394-0.207 0.863-0.207 1.257 0l4.516 2.375-0.862-5.03c-0.075-0.438 0.07-0.884 0.388-1.194l3.654-3.562-5.05-0.734c-0.44-0.064-0.82-0.34-1.016-0.739l-2.259-4.576z" android:fillColor="@color/fluent_default_icon_tint"/>
</vector>

9
mastodon/src/main/res/drawable/ic_post_more.xml Normal file
View File

@@ -0,0 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="16dp"
android:height="4dp"
android:viewportWidth="16"
android:viewportHeight="4">
<path
android:pathData="M4,2C4,3.1046 3.1046,4 2,4C0.8954,4 0,3.1046 0,2C0,0.8954 0.8954,0 2,0C3.1046,0 4,0.8954 4,2ZM10,2C10,3.1046 9.1046,4 8,4C6.8954,4 6,3.1046 6,2C6,0.8954 6.8954,0 8,0C9.1046,0 10,0.8954 10,2ZM14,4C15.1046,4 16,3.1046 16,2C16,0.8954 15.1046,0 14,0C12.8954,0 12,0.8954 12,2C12,3.1046 12.8954,4 14,4Z"
android:fillColor="@color/gray_500"/>
</vector>

91
mastodon/src/main/res/layout/display_item_footer.xml Normal file
View File

@@ -0,0 +1,91 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:orientation="horizontal"
android:layout_width="match_parent"
android:layout_height="48dp"
android:paddingTop="12dp"
android:paddingLeft="20dp"
android:paddingRight="20dp">
<FrameLayout
android:layout_width="wrap_content"
android:layout_height="24dp"
android:minWidth="56dp">
<CheckedTextView
android:id="@+id/reply"
android:layout_width="wrap_content"
android:layout_height="24dp"
android:layout_gravity="center_horizontal"
android:drawableStart="@drawable/ic_fluent_chat_multiple_24_regular"
android:drawablePadding="8dp"
android:drawableTint="@color/text_secondary"
android:gravity="center_vertical"
android:textAppearance="@style/m3_label_large"
tools:text="123"/>
</FrameLayout>
<View
android:layout_width="0px"
android:layout_height="1px"
android:layout_weight="1"/>
<FrameLayout
android:layout_width="wrap_content"
android:layout_height="24dp"
android:minWidth="56dp">
<CheckedTextView
android:id="@+id/boost"
android:layout_width="wrap_content"
android:layout_height="24dp"
android:layout_gravity="center_horizontal"
android:drawableStart="@drawable/ic_fluent_arrow_repeat_all_24_regular"
android:drawablePadding="8dp"
android:drawableTint="@color/text_secondary"
android:gravity="center_vertical"
android:textAppearance="@style/m3_label_large"
tools:text="123"/>
</FrameLayout>
<View
android:layout_width="0px"
android:layout_height="1px"
android:layout_weight="1"/>
<FrameLayout
android:layout_width="wrap_content"
android:layout_height="24dp"
android:minWidth="56dp">
<CheckedTextView
android:id="@+id/favorite"
android:layout_width="wrap_content"
android:layout_height="24dp"
android:layout_gravity="center_horizontal"
android:drawableStart="@drawable/ic_fluent_star_24_regular"
android:drawablePadding="8dp"
android:drawableTint="@color/text_secondary"
android:gravity="center_vertical"
android:textAppearance="@style/m3_label_large"
tools:text="123"/>
</FrameLayout>
<View
android:layout_width="0px"
android:layout_height="1px"
android:layout_weight="1"/>
<FrameLayout
android:layout_width="wrap_content"
android:layout_height="24dp"
android:minWidth="56dp">
<ImageView
android:id="@+id/share"
android:layout_width="wrap_content"
android:layout_height="24dp"
android:layout_gravity="center_horizontal"
android:src="@drawable/ic_fluent_share_24_regular"
android:tint="@color/text_secondary"
android:gravity="center_vertical"/>
</FrameLayout>
</LinearLayout>

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

@@ -3,32 +3,73 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:padding="8dp">
android:paddingTop="16dp"
android:paddingRight="16dp"
android:paddingLeft="16dp">
<ImageView
android:id="@+id/more"
android:layout_width="24dp"
android:layout_height="24dp"
android:layout_alignParentTop="true"
android:layout_alignParentEnd="true"
android:background="?android:selectableItemBackgroundBorderless"
android:scaleType="center"
android:src="@drawable/ic_post_more"/>
<ImageView
android:id="@+id/avatar"
android:layout_width="48dp"
android:layout_height="48dp"
android:layout_marginEnd="8dp"
android:layout_width="46dp"
android:layout_height="46dp"
android:layout_alignParentStart="true"
android:layout_alignParentTop="true"/>
android:layout_alignParentTop="true"
android:layout_marginEnd="12dp" />
<TextView
android:id="@+id/name"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_height="24dp"
android:layout_toEndOf="@id/avatar"
android:textStyle="bold"
android:singleLine="true"
android:layout_toStartOf="@id/more"
android:ellipsize="end"
tools:text="Eugen"/>
android:singleLine="true"
android:textAppearance="@style/m3_title_medium"
tools:text="Eugen" />
<TextView
android:id="@+id/subtitle"
<org.joinmastodon.android.ui.views.HeaderSubtitleLinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_height="20dp"
android:layout_below="@id/name"
android:layout_toEndOf="@id/avatar"
android:layout_alignBottom="@id/avatar"
tools:text="\@Gargron . 1d"/>
android:layoutDirection="locale"
android:orientation="horizontal">
<TextView
android:id="@+id/username"
android:layout_width="wrap_content"
android:layout_height="20dp"
android:ellipsize="end"
android:singleLine="true"
android:textAppearance="@style/m3_title_small"
tools:text="\@Gargron" />
<TextView
android:id="@+id/separator"
android:layout_width="wrap_content"
android:layout_height="20dp"
android:layout_marginLeft="4dp"
android:layout_marginRight="4dp"
android:text="·"
android:textAppearance="@style/m3_title_small" />
<TextView
android:id="@+id/timestamp"
android:layout_width="wrap_content"
android:layout_height="20dp"
android:textAppearance="@style/m3_title_small"
android:singleLine="true"
tools:text="3h" />
</org.joinmastodon.android.ui.views.HeaderSubtitleLinearLayout>
</RelativeLayout>

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

@@ -2,12 +2,19 @@
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:padding="8dp">
android:layout_marginBottom="-6dp"
android:paddingLeft="16dp"
android:paddingRight="16dp"
android:paddingTop="16dp">
<TextView
android:id="@+id/text"
android:layout_width="match_parent"
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:drawablePadding="6dp"
android:singleLine="true"
android:ellipsize="end"/>

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

@@ -2,11 +2,15 @@
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:padding="8dp">
android:paddingLeft="16dp"
android:paddingRight="16dp"
android:paddingTop="10dp"
android:paddingBottom="12dp">
<org.joinmastodon.android.ui.views.LinkedTextView
android:id="@+id/text"
android:layout_width="match_parent"
android:layout_height="wrap_content"/>
android:layout_height="wrap_content"
android:textAppearance="@style/m3_body_large"/>
</FrameLayout>

74
mastodon/src/main/res/layout/fragment_compose.xml Normal file
View File

@@ -0,0 +1,74 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent">
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingTop="16dp"
android:paddingRight="16dp"
android:paddingLeft="16dp">
<ImageView
android:id="@+id/avatar"
android:layout_width="46dp"
android:layout_height="46dp"
android:layout_alignParentStart="true"
android:layout_alignParentTop="true"
android:layout_marginEnd="12dp" />
<TextView
android:id="@+id/name"
android:layout_width="match_parent"
android:layout_height="24dp"
android:layout_toEndOf="@id/avatar"
android:ellipsize="end"
android:singleLine="true"
android:textAppearance="@style/m3_title_medium"
tools:text="Eugen" />
<TextView
android:id="@+id/username"
android:layout_width="match_parent"
android:layout_height="20dp"
android:layout_below="@id/name"
android:layout_toEndOf="@id/avatar"
android:ellipsize="end"
android:singleLine="true"
android:textAppearance="@style/m3_title_small"
tools:text="\@Gargron" />
</RelativeLayout>
<EditText
android:id="@+id/toot_text"
android:layout_width="match_parent"
android:layout_height="0px"
android:layout_weight="1"
android:layout_marginTop="10dp"
android:paddingLeft="16dp"
android:paddingRight="16dp"
android:paddingBottom="16dp"
android:textAppearance="@style/m3_body_large"
android:gravity="top"
android:background="@null"
android:inputType="textMultiLine|textCapSentences"/>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:padding="8dp">
<TextView
android:id="@+id/char_counter"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
tools:text="500"/>
</LinearLayout>
</LinearLayout>

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

@@ -1,28 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent">
<EditText
android:id="@+id/toot_text"
android:layout_width="match_parent"
android:layout_height="0px"
android:layout_weight="1"
android:gravity="top"
android:inputType="textMultiLine|textCapSentences"/>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:padding="8dp">
<TextView
android:id="@+id/char_counter"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
</LinearLayout>
</LinearLayout>

37
mastodon/src/main/res/layout/recycler_fragment_with_fab.xml Normal file
View File

@@ -0,0 +1,37 @@
<?xml version="1.0" encoding="utf-8"?>
<me.grishka.appkit.views.RecursiveSwipeRefreshLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/refresh_layout"
android:layout_width="match_parent"
android:layout_height="match_parent">
<FrameLayout
android:id="@+id/content_wrap"
android:layout_width="match_parent"
android:layout_height="match_parent">
<me.grishka.appkit.views.UsableRecyclerView
android:id="@+id/list"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:scrollbars="vertical"
android:clipToPadding="false"/>
<ViewStub android:layout="?emptyViewLayout"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:id="@+id/empty"/>
<ImageButton
android:id="@+id/fab"
android:layout_width="64dp"
android:layout_height="64dp"
android:layout_gravity="end|bottom"
android:layout_marginEnd="16dp"
android:layout_marginBottom="24dp"
android:background="@drawable/bg_fab"
android:tint="@color/base"
android:scaleType="center"
android:stateListAnimator="@animator/fab_shadow"
android:src="@drawable/ic_edit_34"/>
</FrameLayout>
</me.grishka.appkit.views.RecursiveSwipeRefreshLayout>

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

@@ -7,4 +7,15 @@
<color name="teal_700">#FF018786</color>
<color name="black">#FF000000</color>
<color name="white">#FFFFFFFF</color>
<color name="fluent_default_icon_tint">@color/gray_800</color>
<color name="gray_800">#282C37</color>
<color name="gray_500">#667085</color>
<color name="gray_50t">#CCF9FAFB</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>
</resources>

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

@@ -20,4 +20,9 @@
<string name="user_favorited">%s favorited your toot</string>
<string name="poll_ended">Poll you voted in has ended</string>
<string name="user_posted">%s posted</string>
<string name="time_seconds">%ds</string>
<string name="time_minutes">%dm</string>
<string name="time_hours">%dh</string>
<string name="time_days">%dd</string>
</resources>

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

@@ -4,5 +4,30 @@
<!-- needed to disable scrim on API 29+ -->
<item name="android:enforceNavigationBarContrast">false</item>
<item name="android:enforceStatusBarContrast">false</item>
<item name="android:windowLightStatusBar">true</item>
<item name="android:windowBackground">@color/white</item>
</style>
<style name="m3_body_large">
<item name="android:textSize">16dp</item>
<item name="android:textColor">@color/text_primary</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>
</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>
</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:textSize">14dp</item>
</style>
</resources>