Mastodon
/
fedilab-Android-App
mirror of https://codeberg.org/tom79/Fedilab
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'origin/fetch_more_both_direction' into fetch_more_both_direction

This commit is contained in:
Thomas 2022-07-09 11:14:55 +02:00
parent e7a451da8d ba2c4f1fc4
commit 82681f1af5
3 changed files with 22 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/res/drawable/ic_baseline_arrow_circle_down_24.xml → app/src/main/res/drawable/ic_fetch_more_arrow_downward.xml
View File

@ -6,5 +6,5 @@
android:viewportHeight="24"> android:viewportHeight="24">
<path <path
android:fillColor="@android:color/white" android:fillColor="@android:color/white"
android:pathData="M12,4c4.41,0 8,3.59 8,8s-3.59,8 -8,8s-8,-3.59 -8,-8S7.59,4 12,4M12,2C6.48,2 2,6.48 2,12c0,5.52 4.48,10 10,10c5.52,0 10,-4.48 10,-10C22,6.48 17.52,2 12,2L12,2zM13,12l0,-4h-2l0,4H8l4,4l4,-4H13z" /> android:pathData="M20,8l-1.41,-1.41L13,12.17V0h-2v12.17l-5.58,-5.59L4,8l8,8 8,-8z" />
</vector> </vector>

2
app/src/main/res/drawable/ic_baseline_arrow_circle_up_24.xml → app/src/main/res/drawable/ic_fetch_more_arrow_upward.xml
View File

@ -6,5 +6,5 @@
android:viewportHeight="24"> android:viewportHeight="24">
<path <path
android:fillColor="@android:color/white" android:fillColor="@android:color/white"
android:pathData="M12,20c-4.41,0 -8,-3.59 -8,-8s3.59,-8 8,-8s8,3.59 8,8S16.41,20 12,20M12,22c5.52,0 10,-4.48 10,-10c0,-5.52 -4.48,-10 -10,-10C6.48,2 2,6.48 2,12C2,17.52 6.48,22 12,22L12,22zM11,12l0,4h2l0,-4h3l-4,-4l-4,4H11z" /> android:pathData="M4,16l1.41,1.41L11,11.83V24h2V11.83l5.58,5.59L20,16l-8,-8 -8,8z" />
</vector> </vector>

32
app/src/main/res/layout/drawer_fetch_more.xml
View File

@ -1,36 +1,44 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<androidx.appcompat.widget.LinearLayoutCompat xmlns:android="http://schemas.android.com/apk/res/android" <androidx.appcompat.widget.LinearLayoutCompat xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/fetch_more_container"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:id="@+id/fetch_more_container"
android:layout_gravity="center" android:layout_gravity="center"
android:orientation="horizontal" android:orientation="horizontal"
android:padding="6dp"> android:paddingHorizontal="6dp">
<androidx.appcompat.widget.AppCompatImageButton <com.google.android.material.button.MaterialButton
android:id="@+id/fetch_more_min" android:id="@+id/fetch_more_min"
style="@style/MyOutlinedButton" style="@style/Widget.App.Button.IconOnly.Outline"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:src="@drawable/ic_baseline_arrow_circle_up_24" android:layout_marginHorizontal="6dp"
android:text="@string/fetch_more_messages" android:layout_marginTop="6dp"
android:tint="?colorAccent" /> android:contentDescription="@string/fetch_more_messages"
app:icon="@drawable/ic_fetch_more_arrow_upward"
app:iconPadding="0dp" />
<androidx.appcompat.widget.AppCompatTextView <androidx.appcompat.widget.AppCompatTextView
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center" android:layout_gravity="center"
android:layout_margin="6dp"
android:layout_weight="1" android:layout_weight="1"
android:text="@string/fetch_more_messages" android:text="@string/fetch_more_messages"
android:textAlignment="center"
android:textColor="?colorAccent" android:textColor="?colorAccent"
android:textSize="18sp" /> android:textSize="18sp" />
<androidx.appcompat.widget.AppCompatImageButton <com.google.android.material.button.MaterialButton
android:id="@+id/fetch_more_max" android:id="@+id/fetch_more_max"
style="@style/MyOutlinedButton" style="@style/Widget.App.Button.IconOnly.Outline"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:src="@drawable/ic_baseline_arrow_circle_down_24" android:layout_marginHorizontal="6dp"
android:text="@string/fetch_more_messages" android:layout_marginBottom="6dp"
android:tint="?colorAccent" /> android:contentDescription="@string/fetch_more_messages"
app:icon="@drawable/ic_fetch_more_arrow_downward"
app:iconPadding="0dp" />
</androidx.appcompat.widget.LinearLayoutCompat> </androidx.appcompat.widget.LinearLayoutCompat>