Commit abf1da57 authored by Thomas's avatar Thomas
Browse files

Replacements

parent 8a883de5

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

+60 −53
Original line number Diff line number Diff line
@@ -20,8 +20,6 @@ 
    android:id="@+id/cardview_container"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:layout_marginHorizontal="12dp"

    android:layout_marginTop="12dp"

    android:clipChildren="false"

    android:clipToPadding="false"

    app:cardElevation="5dp"
@@ -37,10 +35,13 @@ 
        <com.google.android.material.button.MaterialButton

            android:id="@+id/add_remove_status"

            style="@style/Widget.Material3.Button.OutlinedButton.Icon"

            android:layout_width="24dp"

            android:layout_height="24dp"

            android:layout_width="36dp"

            android:layout_height="36dp"

            android:layout_marginEnd="6dp"

            android:contentDescription="@string/add_status"

            android:padding="0dp"

            app:iconGravity="textStart"

            app:iconPadding="0dp"

            app:icon="@drawable/ic_compose_thread_add_status"

            app:strokeColor="?colorPrimary"

            app:layout_constraintEnd_toEndOf="parent"
@@ -72,8 +73,9 @@ 


        <androidx.appcompat.widget.LinearLayoutCompat

            android:id="@+id/emoji_container"

            android:layout_width="40dp"

            android:layout_width="36dp"

            android:layout_height="0dp"

            android:layout_marginEnd="6dp"

            android:orientation="vertical"

            app:layout_constraintBottom_toBottomOf="@id/content"

            app:layout_constraintEnd_toEndOf="parent"
@@ -82,18 +84,24 @@ 
            <com.google.android.material.button.MaterialButton

                android:id="@+id/button_emoji"

                style="@style/Widget.Material3.Button.OutlinedButton.Icon"

                android:layout_width="48dp"

                android:layout_height="48dp"

                android:layout_width="36dp"

                android:layout_height="36dp"

                android:padding="0dp"

                android:layout_marginTop="6dp"

                app:iconGravity="textStart"

                app:iconPadding="0dp"

                android:contentDescription="@string/emoji_picker"

                app:icon="@drawable/ic_compose_emoji" />



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

                android:id="@+id/button_emoji_one"

                style="@style/Widget.Material3.Button.OutlinedButton.Icon"

                android:layout_width="48dp"

                android:layout_height="48dp"

                android:layout_width="36dp"

                android:layout_height="36dp"

                android:layout_marginTop="6dp"

                android:padding="0dp"

                app:iconGravity="textStart"

                app:iconPadding="0dp"

                android:contentDescription="@string/emoji_picker"

                app:icon="@drawable/ic_baseline_insert_emoticon_24"

                android:visibility="gone"
@@ -139,16 +147,22 @@ 
            android:layout_marginHorizontal="6dp"

            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

                android:id="@+id/button_attach"

                style="@style/Widget.Material3.Button.OutlinedButton.Icon"

                android:layout_width="48dp"

                android:layout_height="48dp"

            android:layout_marginStart="6dp"

            android:layout_marginTop="6dp"

                app:icon="@drawable/ic_compose_attach"

            app:layout_constraintStart_toStartOf="parent"

            app:layout_constraintTop_toBottomOf="@id/text_area_divider" />

                app:iconGravity="textStart"

                app:iconPadding="0dp" />



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

                android:id="@+id/button_sensitive"
@@ -157,34 +171,28 @@ 
                android:layout_height="48dp"

                android:layout_marginTop="6dp"

                app:icon="@drawable/ic_compose_sensitive"

            app:layout_constraintStart_toEndOf="@id/button_attach"

            app:layout_constraintTop_toBottomOf="@id/text_area_divider" />

                app:iconGravity="textStart"

                app:iconPadding="0dp" />



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

                android:id="@+id/button_visibility"

                style="@style/Widget.Material3.Button.OutlinedButton.Icon"

                android:layout_width="48dp"

                android:layout_height="48dp"

            android:layout_marginTop="6dp"

                app:icon="@drawable/ic_compose_visibility_public"

            app:layout_constraintStart_toEndOf="@id/button_sensitive"

            app:layout_constraintTop_toBottomOf="@id/text_area_divider" />

                app:iconGravity="textStart"

                app:iconPadding="0dp" />



        <androidx.appcompat.widget.AppCompatTextView

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

                android:id="@+id/button_language"

            style="@style/Widget.Material3.Button.OutlinedButton"

            android:layout_marginTop="6dp"

            android:layout_width="wrap_content"

            android:textColor="?colorPrimary"

                style="@style/Widget.Material3.Button.OutlinedButton.Icon"

                android:layout_width="60dp"

                android:layout_height="wrap_content"

            android:gravity="center"

            android:textAlignment="center"

            android:textSize="16sp"

            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"

                android:textColor="?colorPrimary"

                app:iconGravity="textStart"

                app:iconPadding="0dp"

                tools:text="EN" />

        </com.google.android.material.button.MaterialButtonToggleGroup>





        <com.google.android.material.textview.MaterialTextView
@@ -195,7 +203,7 @@ 
            android:text="0"

            app:layout_constraintBottom_toTopOf="@id/character_progress"

            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_constraintVertical_chainStyle="packed"

            tools:ignore="HardcodedText" />
@@ -207,7 +215,7 @@ 
            android:layout_height="12dp"

            app:layout_constraintBottom_toBottomOf="parent"

            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" />



        <com.google.android.material.button.MaterialButton
@@ -215,7 +223,6 @@ 
            style="@style/Widget.Material3.Button.Icon"

            android:layout_width="48dp"

            android:layout_height="48dp"

            android:layout_marginTop="6dp"

            android:layout_marginEnd="6dp"

            app:icon="@drawable/ic_compose_post"

            app:iconTint="?colorControlNormal"

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

+6 −6
Original line number Diff line number Diff line
@@ -3,11 +3,11 @@ 
    <style name="AppTheme" parent="Theme.Material3.Light.NoActionBar">

        <item name="colorPrimary">@color/deep_purple_700</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="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>
@@ -51,11 +51,11 @@ 


        <item name="colorPrimary">@color/deep_purple_700</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="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>
@@ -65,11 +65,11 @@ 
    <style name="AppThemeBarDark" parent="Theme.Material3.Dark">

        <item name="colorPrimary">@color/deep_purple_700</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="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>