mirrors/Fedilab
1
0
Fork 1
mirror of https://codeberg.org/tom79/Fedilab.git synced 2025-01-07 00:20:08 +02:00
Code Issues Projects Releases Packages Wiki Activity

Replacements

Browse source
This commit is contained in:
Thomas 2022-11-28 16:34:59 +01:00
parent 8a883de5a0
commit abf1da579c
2 changed files with 69 additions and 62 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

73
app/src/main/res/layout/drawer_status_compose.xml
View file

@ -20,8 +20,6 @@
android:id="@+id/cardview_container" android:id="@+id/cardview_container"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginHorizontal="12dp"
android:layout_marginTop="12dp"
android:clipChildren="false" android:clipChildren="false"
android:clipToPadding="false" android:clipToPadding="false"
app:cardElevation="5dp" app:cardElevation="5dp"
@ -37,10 +35,13 @@
<com.google.android.material.button.MaterialButton <com.google.android.material.button.MaterialButton
android:id="@+id/add_remove_status" android:id="@+id/add_remove_status"
style="@style/Widget.Material3.Button.OutlinedButton.Icon" style="@style/Widget.Material3.Button.OutlinedButton.Icon"
android:layout_width="24dp" android:layout_width="36dp"
android:layout_height="24dp" android:layout_height="36dp"
android:layout_marginEnd="6dp"
android:contentDescription="@string/add_status" android:contentDescription="@string/add_status"
android:padding="0dp" android:padding="0dp"
app:iconGravity="textStart"
app:iconPadding="0dp"
app:icon="@drawable/ic_compose_thread_add_status" app:icon="@drawable/ic_compose_thread_add_status"
app:strokeColor="?colorPrimary" app:strokeColor="?colorPrimary"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
@ -72,8 +73,9 @@
<androidx.appcompat.widget.LinearLayoutCompat <androidx.appcompat.widget.LinearLayoutCompat
android:id="@+id/emoji_container" android:id="@+id/emoji_container"
android:layout_width="40dp" android:layout_width="36dp"
android:layout_height="0dp" android:layout_height="0dp"
android:layout_marginEnd="6dp"
android:orientation="vertical" android:orientation="vertical"
app:layout_constraintBottom_toBottomOf="@id/content" app:layout_constraintBottom_toBottomOf="@id/content"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
@ -82,18 +84,24 @@
<com.google.android.material.button.MaterialButton <com.google.android.material.button.MaterialButton
android:id="@+id/button_emoji" android:id="@+id/button_emoji"
style="@style/Widget.Material3.Button.OutlinedButton.Icon" style="@style/Widget.Material3.Button.OutlinedButton.Icon"
android:layout_width="48dp" android:layout_width="36dp"
android:layout_height="48dp" android:layout_height="36dp"
android:padding="0dp"
android:layout_marginTop="6dp" android:layout_marginTop="6dp"
app:iconGravity="textStart"
app:iconPadding="0dp"
android:contentDescription="@string/emoji_picker" android:contentDescription="@string/emoji_picker"
app:icon="@drawable/ic_compose_emoji" /> app:icon="@drawable/ic_compose_emoji" />
<com.google.android.material.button.MaterialButton <com.google.android.material.button.MaterialButton
android:id="@+id/button_emoji_one" android:id="@+id/button_emoji_one"
style="@style/Widget.Material3.Button.OutlinedButton.Icon" style="@style/Widget.Material3.Button.OutlinedButton.Icon"
android:layout_width="48dp" android:layout_width="36dp"
android:layout_height="48dp" android:layout_height="36dp"
android:layout_marginTop="6dp" android:layout_marginTop="6dp"
android:padding="0dp"
app:iconGravity="textStart"
app:iconPadding="0dp"
android:contentDescription="@string/emoji_picker" android:contentDescription="@string/emoji_picker"
app:icon="@drawable/ic_baseline_insert_emoticon_24" app:icon="@drawable/ic_baseline_insert_emoticon_24"
android:visibility="gone" android:visibility="gone"
@ -139,16 +147,22 @@
android:layout_marginHorizontal="6dp" android:layout_marginHorizontal="6dp"
app:layout_constraintTop_toBottomOf="@id/attachments_list_container" /> app:layout_constraintTop_toBottomOf="@id/attachments_list_container" />
<com.google.android.material.button.MaterialButtonToggleGroup
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/action_container"
android:layout_marginStart="6dp"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/text_area_divider">
<com.google.android.material.button.MaterialButton <com.google.android.material.button.MaterialButton
android:id="@+id/button_attach" android:id="@+id/button_attach"
style="@style/Widget.Material3.Button.OutlinedButton.Icon" style="@style/Widget.Material3.Button.OutlinedButton.Icon"
android:layout_width="48dp" android:layout_width="48dp"
android:layout_height="48dp" android:layout_height="48dp"
android:layout_marginStart="6dp"
android:layout_marginTop="6dp"
app:icon="@drawable/ic_compose_attach" app:icon="@drawable/ic_compose_attach"
app:layout_constraintStart_toStartOf="parent" app:iconGravity="textStart"
app:layout_constraintTop_toBottomOf="@id/text_area_divider" /> app:iconPadding="0dp" />
<com.google.android.material.button.MaterialButton <com.google.android.material.button.MaterialButton
android:id="@+id/button_sensitive" android:id="@+id/button_sensitive"
@ -157,34 +171,28 @@
android:layout_height="48dp" android:layout_height="48dp"
android:layout_marginTop="6dp" android:layout_marginTop="6dp"
app:icon="@drawable/ic_compose_sensitive" app:icon="@drawable/ic_compose_sensitive"
app:layout_constraintStart_toEndOf="@id/button_attach" app:iconGravity="textStart"
app:layout_constraintTop_toBottomOf="@id/text_area_divider" /> app:iconPadding="0dp" />
<com.google.android.material.button.MaterialButton <com.google.android.material.button.MaterialButton
android:id="@+id/button_visibility" android:id="@+id/button_visibility"
style="@style/Widget.Material3.Button.OutlinedButton.Icon" style="@style/Widget.Material3.Button.OutlinedButton.Icon"
android:layout_width="48dp" android:layout_width="48dp"
android:layout_height="48dp" android:layout_height="48dp"
android:layout_marginTop="6dp"
app:icon="@drawable/ic_compose_visibility_public" app:icon="@drawable/ic_compose_visibility_public"
app:layout_constraintStart_toEndOf="@id/button_sensitive" app:iconGravity="textStart"
app:layout_constraintTop_toBottomOf="@id/text_area_divider" /> app:iconPadding="0dp" />
<androidx.appcompat.widget.AppCompatTextView <com.google.android.material.button.MaterialButton
android:id="@+id/button_language" android:id="@+id/button_language"
style="@style/Widget.Material3.Button.OutlinedButton" style="@style/Widget.Material3.Button.OutlinedButton.Icon"
android:layout_marginTop="6dp" android:layout_width="60dp"
android:layout_width="wrap_content"
android:textColor="?colorPrimary"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="center" android:textColor="?colorPrimary"
android:textAlignment="center" app:iconGravity="textStart"
android:textSize="16sp" app:iconPadding="0dp"
android:textStyle="bold"
app:layout_constraintBottom_toBottomOf="@+id/button_visibility"
app:layout_constraintStart_toEndOf="@id/button_visibility"
app:layout_constraintTop_toBottomOf="@id/text_area_divider"
tools:text="EN" /> tools:text="EN" />
</com.google.android.material.button.MaterialButtonToggleGroup>
<com.google.android.material.textview.MaterialTextView <com.google.android.material.textview.MaterialTextView
@ -195,7 +203,7 @@
android:text="0" android:text="0"
app:layout_constraintBottom_toTopOf="@id/character_progress" app:layout_constraintBottom_toTopOf="@id/character_progress"
app:layout_constraintEnd_toStartOf="@id/button_post" app:layout_constraintEnd_toStartOf="@id/button_post"
app:layout_constraintStart_toEndOf="@id/button_language" app:layout_constraintStart_toEndOf="@id/action_container"
app:layout_constraintTop_toBottomOf="@id/text_area_divider" app:layout_constraintTop_toBottomOf="@id/text_area_divider"
app:layout_constraintVertical_chainStyle="packed" app:layout_constraintVertical_chainStyle="packed"
tools:ignore="HardcodedText" /> tools:ignore="HardcodedText" />
@ -207,7 +215,7 @@
android:layout_height="12dp" android:layout_height="12dp"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@id/button_post" app:layout_constraintEnd_toStartOf="@id/button_post"
app:layout_constraintStart_toEndOf="@id/button_language" app:layout_constraintStart_toEndOf="@id/action_container"
app:layout_constraintTop_toBottomOf="@id/character_count" /> app:layout_constraintTop_toBottomOf="@id/character_count" />
<com.google.android.material.button.MaterialButton <com.google.android.material.button.MaterialButton
@ -215,7 +223,6 @@
style="@style/Widget.Material3.Button.Icon" style="@style/Widget.Material3.Button.Icon"
android:layout_width="48dp" android:layout_width="48dp"
android:layout_height="48dp" android:layout_height="48dp"
android:layout_marginTop="6dp"
android:layout_marginEnd="6dp" android:layout_marginEnd="6dp"
app:icon="@drawable/ic_compose_post" app:icon="@drawable/ic_compose_post"
app:iconTint="?colorControlNormal" app:iconTint="?colorControlNormal"

12
app/src/main/res/values/styles.xml
View file

@ -3,11 +3,11 @@
<style name="AppTheme" parent="Theme.Material3.Light.NoActionBar"> <style name="AppTheme" parent="Theme.Material3.Light.NoActionBar">
<item name="colorPrimary">@color/deep_purple_700</item> <item name="colorPrimary">@color/deep_purple_700</item>
<item name="colorPrimaryVariant">@color/deep_purple_900</item> <item name="colorPrimaryVariant">@color/deep_purple_900</item>
<item name="colorOnPrimary">@color/deep_purple_600</item> <item name="colorOnPrimary">@color/white</item>
<item name="colorSecondary">@color/indigo_700</item> <item name="colorSecondary">@color/indigo_700</item>
<item name="colorSecondaryVariant">@color/indigo_900</item> <item name="colorSecondaryVariant">@color/indigo_900</item>
<item name="colorOnSecondary">@color/indigo_600</item> <item name="colorOnSecondary">@color/white</item>
<item name="colorError">@color/red_900</item> <item name="colorError">@color/red_900</item>
@ -51,11 +51,11 @@
<item name="colorPrimary">@color/deep_purple_700</item> <item name="colorPrimary">@color/deep_purple_700</item>
<item name="colorPrimaryVariant">@color/deep_purple_900</item> <item name="colorPrimaryVariant">@color/deep_purple_900</item>
<item name="colorOnPrimary">@color/deep_purple_600</item> <item name="colorOnPrimary">@color/white</item>
<item name="colorSecondary">@color/indigo_700</item> <item name="colorSecondary">@color/indigo_700</item>
<item name="colorSecondaryVariant">@color/indigo_900</item> <item name="colorSecondaryVariant">@color/indigo_900</item>
<item name="colorOnSecondary">@color/indigo_600</item> <item name="colorOnSecondary">@color/white</item>
<item name="colorError">@color/red_900</item> <item name="colorError">@color/red_900</item>
@ -65,11 +65,11 @@
<style name="AppThemeBarDark" parent="Theme.Material3.Dark"> <style name="AppThemeBarDark" parent="Theme.Material3.Dark">
<item name="colorPrimary">@color/deep_purple_700</item> <item name="colorPrimary">@color/deep_purple_700</item>
<item name="colorPrimaryVariant">@color/deep_purple_900</item> <item name="colorPrimaryVariant">@color/deep_purple_900</item>
<item name="colorOnPrimary">@color/deep_purple_600</item> <item name="colorOnPrimary">@color/white</item>
<item name="colorSecondary">@color/indigo_700</item> <item name="colorSecondary">@color/indigo_700</item>
<item name="colorSecondaryVariant">@color/indigo_900</item> <item name="colorSecondaryVariant">@color/indigo_900</item>
<item name="colorOnSecondary">@color/indigo_600</item> <item name="colorOnSecondary">@color/white</item>
<item name="colorError">@color/red_900</item> <item name="colorError">@color/red_900</item>