Merge remote-tracking branch 'origin/develop' into develop (3c13bf71) · Commits · Android-smartphones / Fedilab

app/src/main/res/drawables/mastodon/drawable/ic_baseline_navigate_next_24.xml→app/src/main/res/drawables/mastodon/drawable/ic_navigate_before.xml

+2 −2

Original line number	Diff line number	Diff line
		@@ -2,10 +2,10 @@
		android:width="24dp"
		android:height="24dp"
		android:autoMirrored="true"
		android:tint="?attr/colorControlNormal"
		android:tint="?colorControlNormal"
		android:viewportWidth="24"
		android:viewportHeight="24">
		<path
		android:fillColor="@android:color/white"
		android:pathData="M10,6L8.59,7.41 13.17,12l-4.58,4.59L10,18l6,-6z" />
		android:pathData="M14.91,6.71c-0.39,-0.39 -1.02,-0.39 -1.41,0L8.91,11.3c-0.39,0.39 -0.39,1.02 0,1.41l4.59,4.59c0.39,0.39 1.02,0.39 1.41,0 0.39,-0.39 0.39,-1.02 0,-1.41L11.03,12l3.88,-3.88c0.38,-0.39 0.38,-1.03 0,-1.41z" />
		</vector>

app/src/main/res/drawables/mastodon/drawable/ic_navigate_next.xml

0 → 100644

+11 −0

Original line number	Diff line number	Diff line
		<vector xmlns:android="http://schemas.android.com/apk/res/android"
		android:width="24dp"
		android:height="24dp"
		android:autoMirrored="true"
		android:tint="?colorControlNormal"
		android:viewportWidth="24"
		android:viewportHeight="24">
		<path
		android:fillColor="@android:color/white"
		android:pathData="M9.31,6.71c-0.39,0.39 -0.39,1.02 0,1.41L13.19,12l-3.88,3.88c-0.39,0.39 -0.39,1.02 0,1.41 0.39,0.39 1.02,0.39 1.41,0l4.59,-4.59c0.39,-0.39 0.39,-1.02 0,-1.41L10.72,6.7c-0.38,-0.38 -1.02,-0.38 -1.41,0.01z" />
		</vector>

app/src/main/res/layouts/mastodon/layout/activity_actions.xml

+6 −6

Original line number	Diff line number	Diff line
		@@ -21,7 +21,7 @@
		android:text="@string/bookmarks"
		android:textAlignment="textStart"
		android:textColor="?attr/colorAccent"
		app:icon="@drawable/ic_baseline_navigate_next_24"
		app:icon="@drawable/ic_navigate_next"
		app:iconGravity="end"
		app:iconTint="?attr/colorAccent"
		app:strokeColor="?attr/colorAccent" />
		@@ -36,7 +36,7 @@
		android:text="@string/muted_menu"
		android:textAlignment="textStart"
		android:textColor="?attr/colorAccent"
		app:icon="@drawable/ic_baseline_navigate_next_24"
		app:icon="@drawable/ic_navigate_next"
		app:iconGravity="end"
		app:iconTint="?attr/colorAccent"
		app:strokeColor="?attr/colorAccent" />
		@@ -51,7 +51,7 @@
		android:text="@string/muted_menu_home"
		android:textAlignment="textStart"
		android:textColor="?attr/colorAccent"
		app:icon="@drawable/ic_baseline_navigate_next_24"
		app:icon="@drawable/ic_navigate_next"
		app:iconGravity="end"
		app:iconTint="?attr/colorAccent"
		app:strokeColor="?attr/colorAccent" />
		@@ -66,7 +66,7 @@
		android:text="@string/blocked_menu"
		android:textAlignment="textStart"
		android:textColor="?attr/colorAccent"
		app:icon="@drawable/ic_baseline_navigate_next_24"
		app:icon="@drawable/ic_navigate_next"
		app:iconGravity="end"
		app:iconTint="?attr/colorAccent"
		app:strokeColor="?attr/colorAccent" />
		@@ -82,7 +82,7 @@
		android:text="@string/favourite"
		android:textAlignment="textStart"
		android:textColor="?attr/colorAccent"
		app:icon="@drawable/ic_baseline_navigate_next_24"
		app:icon="@drawable/ic_navigate_next"
		app:iconGravity="end"
		app:iconTint="?attr/colorAccent"
		app:strokeColor="?attr/colorAccent" />
		@@ -98,7 +98,7 @@
		android:text="@string/blocked_domains"
		android:textAlignment="textStart"
		android:textColor="?attr/colorAccent"
		app:icon="@drawable/ic_baseline_navigate_next_24"
		app:icon="@drawable/ic_navigate_next"
		app:iconGravity="end"
		app:iconTint="?attr/colorAccent"
		app:strokeColor="?attr/colorAccent" />

app/src/main/res/layouts/mastodon/layout/activity_admin_actions.xml

+3 −3

Original line number	Diff line number	Diff line
		@@ -20,7 +20,7 @@
		android:paddingVertical="12dp"
		android:text="@string/reports"
		android:textAlignment="textStart"
		app:icon="@drawable/ic_baseline_navigate_next_24"
		app:icon="@drawable/ic_navigate_next"
		app:iconGravity="end" />

		<com.google.android.material.button.MaterialButton
		@@ -32,7 +32,7 @@
		android:paddingVertical="12dp"
		android:text="@string/accounts"
		android:textAlignment="textStart"
		app:icon="@drawable/ic_baseline_navigate_next_24"
		app:icon="@drawable/ic_navigate_next"
		app:iconGravity="end" />

		<com.google.android.material.button.MaterialButton
		@@ -44,7 +44,7 @@
		android:paddingVertical="12dp"
		android:text="@string/blocked_domains"
		android:textAlignment="textStart"
		app:icon="@drawable/ic_baseline_navigate_next_24"
		app:icon="@drawable/ic_navigate_next"
		app:iconGravity="end" />

		</androidx.appcompat.widget.LinearLayoutCompat>

app/src/main/res/layouts/mastodon/layout/datetime_picker.xml

+27 −36

Original line number	Diff line number	Diff line
		@@ -16,15 +16,15 @@
		-->
		<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
		xmlns:app="http://schemas.android.com/apk/res-auto"
		xmlns:tools="http://schemas.android.com/tools"
		android:layout_width="match_parent"
		android:layout_height="match_parent">
		android:layout_height="wrap_content">

		<DatePicker
		android:id="@+id/date_picker"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:calendarViewShown="true"
		android:spinnersShown="false"
		android:datePickerMode="calendar"
		app:layout_constraintEnd_toEndOf="parent"
		app:layout_constraintStart_toStartOf="parent"
		app:layout_constraintTop_toTopOf="parent" />
		@@ -47,67 +47,58 @@

		<com.google.android.material.button.MaterialButton
		android:id="@+id/date_time_cancel"
		style="@style/Widget.Material3.Button.OutlinedButton"
		android:layout_width="wrap_content"
		android:layout_height="40dp"
		android:layout_margin="10dp"
		android:layout_height="wrap_content"
		android:layout_marginVertical="12dp"
		android:layout_marginStart="12dp"
		android:text="@string/cancel"
		app:layout_constraintBottom_toBottomOf="parent"
		app:layout_constraintEnd_toStartOf="@id/date_time_previous"
		app:layout_constraintHorizontal_chainStyle="packed"
		app:layout_constraintStart_toStartOf="parent"
		app:layout_constraintTop_toBottomOf="@id/barrier_date_time_bottom" />

		<com.google.android.material.button.MaterialButton
		android:id="@+id/date_time_previous"
		style="@style/Widget.Material3.Button.Icon"
		android:layout_width="40dp"
		android:layout_height="40dp"
		android:layout_margin="10dp"
		style="@style/Widget.Material3.Button.IconButton.Outlined"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_margin="12dp"
		android:contentDescription="@string/previous"
		android:padding="0dp"
		android:visibility="gone"
		app:icon="@drawable/ic_baseline_skip_previous_24"
		app:iconGravity="textStart"
		app:iconPadding="0dp"
		app:icon="@drawable/ic_navigate_before"
		app:layout_constraintBottom_toBottomOf="parent"
		app:layout_constraintEnd_toStartOf="@id/date_time_next"
		app:layout_constraintHorizontal_chainStyle="packed"
		app:layout_constraintStart_toEndOf="@id/date_time_cancel"
		app:layout_constraintTop_toBottomOf="@id/barrier_date_time_bottom" />
		app:layout_constraintTop_toBottomOf="@id/barrier_date_time_bottom"
		tools:visibility="visible" />

		<com.google.android.material.button.MaterialButton
		android:id="@+id/date_time_next"
		style="@style/Widget.Material3.Button.Icon"
		android:layout_width="40dp"
		android:layout_height="40dp"
		android:layout_margin="10dp"
		style="@style/Widget.Material3.Button.IconButton.Filled"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_margin="12dp"
		android:contentDescription="@string/next"
		android:padding="0dp"
		app:icon="@drawable/ic_baseline_skip_next_24"
		app:iconGravity="textStart"
		app:iconPadding="0dp"
		app:icon="@drawable/ic_navigate_next"
		app:layout_constraintBottom_toBottomOf="parent"
		app:layout_constraintEnd_toStartOf="@id/date_time_set"
		app:layout_constraintHorizontal_chainStyle="packed"
		app:layout_constraintStart_toEndOf="@id/date_time_previous"
		app:layout_constraintTop_toBottomOf="@id/barrier_date_time_bottom" />

		<com.google.android.material.button.MaterialButton
		android:id="@+id/date_time_set"
		style="@style/Widget.Material3.Button.Icon"
		android:layout_width="40dp"
		android:layout_height="40dp"
		android:layout_margin="10dp"
		android:contentDescription="@string/validate"
		android:padding="0dp"
		style="@style/Widget.Material3.Button.IconButton.Filled"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_marginVertical="12dp"
		android:layout_marginEnd="12dp"
		android:contentDescription="@string/schedule"
		android:visibility="gone"
		app:icon="@drawable/ic_baseline_check_24"
		app:iconGravity="textStart"
		app:iconPadding="0dp"
		app:layout_constraintBottom_toBottomOf="parent"
		app:layout_constraintEnd_toEndOf="parent"
		app:layout_constraintHorizontal_chainStyle="packed"
		app:layout_constraintStart_toEndOf="@id/date_time_next"
		app:layout_constraintTop_toBottomOf="@id/barrier_date_time_bottom" />
		app:layout_constraintTop_toBottomOf="@id/barrier_date_time_bottom"
		tools:visibility="visible" />

		</androidx.constraintlayout.widget.ConstraintLayout>
		No newline at end of file