Commit 82681f1a authored by Thomas's avatar Thomas
Browse files

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

parents e7a451da ba2c4f1f

app/src/main/res/drawable/ic_baseline_arrow_circle_down_24.xml→app/src/main/res/drawable/ic_fetch_more_arrow_downward.xml

+1 −1
Original line number Diff line number Diff line
@@ -6,5 +6,5 @@ 
    android:viewportHeight="24">

    <path

        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>

app/src/main/res/drawable/ic_baseline_arrow_circle_up_24.xml→app/src/main/res/drawable/ic_fetch_more_arrow_upward.xml

+1 −1
Original line number Diff line number Diff line
@@ -6,5 +6,5 @@ 
    android:viewportHeight="24">

    <path

        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>

app/src/main/res/layout/drawer_fetch_more.xml

+20 −12
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<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_height="wrap_content"

    android:id="@+id/fetch_more_container"

    android:layout_gravity="center"

    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"

        style="@style/MyOutlinedButton"

        style="@style/Widget.App.Button.IconOnly.Outline"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:src="@drawable/ic_baseline_arrow_circle_up_24"

        android:text="@string/fetch_more_messages"

        android:tint="?colorAccent" />

        android:layout_marginHorizontal="6dp"

        android:layout_marginTop="6dp"

        android:contentDescription="@string/fetch_more_messages"

        app:icon="@drawable/ic_fetch_more_arrow_upward"

        app:iconPadding="0dp" />



    <androidx.appcompat.widget.AppCompatTextView

        android:layout_width="0dp"

        android:layout_height="wrap_content"

        android:layout_gravity="center"

        android:layout_margin="6dp"

        android:layout_weight="1"

        android:text="@string/fetch_more_messages"

        android:textAlignment="center"

        android:textColor="?colorAccent"

        android:textSize="18sp" />



    <androidx.appcompat.widget.AppCompatImageButton

    <com.google.android.material.button.MaterialButton

        android:id="@+id/fetch_more_max"

        style="@style/MyOutlinedButton"

        style="@style/Widget.App.Button.IconOnly.Outline"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:src="@drawable/ic_baseline_arrow_circle_down_24"

        android:text="@string/fetch_more_messages"

        android:tint="?colorAccent" />

        android:layout_marginHorizontal="6dp"

        android:layout_marginBottom="6dp"

        android:contentDescription="@string/fetch_more_messages"

        app:icon="@drawable/ic_fetch_more_arrow_downward"

        app:iconPadding="0dp" />



</androidx.appcompat.widget.LinearLayoutCompat>