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

app/src/main/res/drawable/ic_compose_attachment_play.xml

+3 −3

Original line number	Diff line number	Diff line
		@@ -4,9 +4,9 @@
		android:viewportWidth="24"
		android:viewportHeight="24">
		<path
		android:fillColor="?attr/colorControlNormal"
		android:fillColor="?attr/colorTertiary"
		android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2z" />
		<path
		android:fillColor="?attr/colorPrimary"
		android:pathData="M10,16.5v-9l6,4.5 -6,4.5z" />
		android:fillColor="?attr/colorOnTertiary"
		android:pathData="M10,15.5v-7c0,-0.41 0.47,-0.65 0.8,-0.4l4.67,3.5c0.27,0.2 0.27,0.6 0,0.8l-4.67,3.5c-0.33,0.25 -0.8,0.01 -0.8,-0.4z" />
		</vector>

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

+26 −40

Original line number	Diff line number	Diff line
		@@ -15,7 +15,7 @@
		<androidx.appcompat.widget.AppCompatImageView
		android:id="@+id/preview"
		android:layout_width="0dp"
		android:layout_height="100dp"
		android:layout_height="108dp"
		android:adjustViewBounds="true"
		android:scaleType="centerCrop"
		app:layout_constraintEnd_toEndOf="parent"
		@@ -23,18 +23,12 @@
		app:layout_constraintTop_toTopOf="parent"
		tools:src="@tools:sample/backgrounds/scenic" />


		<com.google.android.material.button.MaterialButton
		<androidx.appcompat.widget.AppCompatImageView
		android:id="@+id/button_play"
		style="@style/Widget.AppCompat.Button.Borderless"
		android:layout_width="48dp"
		android:layout_height="48dp"
		android:adjustViewBounds="true"
		android:padding="0dp"
		app:icon="@drawable/ic_compose_attachment_play"
		app:iconGravity="textStart"
		app:srcCompat="@drawable/ic_compose_attachment_play"
		android:layout_width="36dp"
		android:layout_height="36dp"
		android:scaleType="fitCenter"
		app:iconPadding="0dp"
		app:layout_constraintBottom_toBottomOf="@id/preview"
		app:layout_constraintEnd_toEndOf="@id/preview"
		app:layout_constraintStart_toStartOf="@id/preview"
		@@ -42,37 +36,31 @@

		<com.google.android.material.button.MaterialButton
		android:id="@+id/edit_preview"
		style="@style/Widget.Material3.Button.Icon"
		android:layout_width="36dp"
		android:layout_height="36dp"
		style="@style/Widget.Material3.Button.IconButton.Filled"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:adjustViewBounds="true"
		android:padding="0dp"
		app:iconGravity="textStart"
		app:iconPadding="0dp"
		android:backgroundTint="@color/editColor"
		app:icon="@drawable/ic_baseline_mode_edit_24"
		app:iconGravity="textStart"
		app:layout_constraintStart_toStartOf="parent"
		app:layout_constraintTop_toTopOf="parent" />

		<com.google.android.material.button.MaterialButton
		android:id="@+id/button_remove"
		android:padding="0dp"
		app:iconGravity="textStart"
		app:iconPadding="0dp"
		style="@style/Widget.Material3.Button.Icon"
		android:layout_width="36dp"
		android:layout_height="36dp"
		android:adjustViewBounds="true"
		style="@style/Widget.Material3.Button.IconButton.Filled"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:backgroundTint="@color/errorColor"
		app:icon="@drawable/ic_compose_attachment_remove"
		app:iconGravity="textStart"
		app:layout_constraintEnd_toEndOf="parent"
		app:layout_constraintTop_toTopOf="parent" />

		<com.google.android.material.button.MaterialButton
		android:id="@+id/button_order_up"
		style="@style/Widget.Material3.Button.Icon"
		android:layout_width="48dp"
		android:layout_height="48dp"
		style="@style/Widget.Material3.Button.IconButton"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:adjustViewBounds="true"
		app:icon="@drawable/ic_compose_attachment_order_up"
		app:layout_constraintStart_toStartOf="parent"
		@@ -80,26 +68,24 @@

		<com.google.android.material.button.MaterialButton
		android:id="@+id/button_description"
		style="@style/Widget.Material3.Button"
		android:layout_width="match_parent"
		android:layout_height="48dp"
		android:layout_height="wrap_content"
		android:layout_marginStart="2dp"
		android:layout_marginEnd="2dp"
		android:text="@string/description"
		android:textColor="@color/black"
		android:textAlignment="textStart"
		android:textColor="@color/black"
		app:backgroundTint="@color/no_description"
		app:icon="@drawable/ic_baseline_warning_24"
		app:iconGravity="end"
		app:iconGravity="textStart"
		app:iconTint="@color/black"
		app:layout_constraintEnd_toStartOf="@id/button_order_down"
		app:layout_constraintStart_toEndOf="@id/button_order_up"
		app:layout_constraintTop_toBottomOf="@id/preview" />


		<com.google.android.material.button.MaterialButton
		android:id="@+id/button_order_down"
		style="@style/Widget.Material3.Button.Icon"
		style="@style/Widget.Material3.Button.IconButton"
		android:layout_width="48dp"
		android:layout_height="48dp"
		android:adjustViewBounds="true"

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

+179 −249

File changed.

Preview size limit exceeded, changes collapsed.

app/src/main/res/values/themes.xml

+5 −0

Original line number	Diff line number	Diff line
		@@ -240,4 +240,9 @@
		<item name="colorPrimaryInverse">@color/solarized_md_theme_light_inversePrimary</item>
		</style>

		<style name="Fedilab.SmallIconButton" parent="Widget.Material3.Button.IconButton">
		<item name="android:layout_width">36dp</item>
		<item name="android:layout_height">36dp</item>
		<item name="android:padding">4dp</item>
		</style>
		</resources>