Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 66560b6f authored by Moez Bhatti's avatar Moez Bhatti
Browse files

White background for compose

parent 056e992b

presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeActivity.kt

+0 −1
Original line number Diff line number Diff line
@@ -156,7 +156,6 @@ class ComposeActivity : QkThemedActivity(), ComposeView { 
        // These theme attributes don't apply themselves on API 21

        if (Build.VERSION.SDK_INT <= 22) {

            messageBackground.setBackgroundTint(resolveThemeColor(R.attr.bubbleColor))

            composeBackground.setBackgroundTint(resolveThemeColor(R.attr.composeBackground))

        }

    }

presentation/src/main/java/com/moez/QKSMS/feature/qkreply/QkReplyActivity.kt

+4 −3
Original line number Diff line number Diff line
@@ -62,6 +62,7 @@ class QkReplyActivity : QkThemedActivity(), QkReplyView { 


        setFinishOnTouchOutside(prefs.qkreplyTapDismiss.get())

        setContentView(R.layout.qkreply_activity)

        window.setBackgroundDrawable(null)

        window.clearFlags(WindowManager.LayoutParams.FLAG_DIM_BEHIND)

        window.setLayout(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT)

        viewModel.bindView(this)
@@ -77,10 +78,10 @@ class QkReplyActivity : QkThemedActivity(), QkReplyView { 
        // These theme attributes don't apply themselves on API 21

        if (Build.VERSION.SDK_INT <= 22) {

            toolbar.setBackgroundTint(resolveThemeColor(R.attr.colorPrimary))

            background.setBackgroundTint(resolveThemeColor(R.attr.composeBackground))

            background.setBackgroundTint(resolveThemeColor(android.R.attr.windowBackground))

            messageBackground.setBackgroundTint(resolveThemeColor(R.attr.bubbleColor))

            composeBackgroundGradient.setBackgroundTint(resolveThemeColor(R.attr.composeBackground))

            composeBackgroundSolid.setBackgroundTint(resolveThemeColor(R.attr.composeBackground))

            composeBackgroundGradient.setBackgroundTint(resolveThemeColor(android.R.attr.windowBackground))

            composeBackgroundSolid.setBackgroundTint(resolveThemeColor(android.R.attr.windowBackground))

        }

    }

presentation/src/main/res/drawable/compose_bar_background.xml

deleted100644 → 0
+0 −28
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>

  ~

  ~ This file is part of QKSMS.

  ~

  ~ QKSMS is free software: you can redistribute it and/or modify

  ~ it under the terms of the GNU General Public License as published by

  ~ the Free Software Foundation, either version 3 of the License, or

  ~ (at your option) any later version.

  ~

  ~ QKSMS is distributed in the hope that it will be useful,

  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of

  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

  ~ GNU General Public License for more details.

  ~

  ~ You should have received a copy of the GNU General Public License

  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.

  -->

<shape xmlns:android="http://schemas.android.com/apk/res/android"

    android:shape="rectangle">



    <gradient

        android:angle="90"

        android:endColor="#00000000"

        android:startColor="#ff000000" />



</shape>
 
 No newline at end of file

presentation/src/main/res/layout/compose_activity.xml

+23 −35
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ 
    android:id="@+id/contentView"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:background="?attr/composeBackground"

    android:background="?android:attr/windowBackground"

    android:orientation="vertical"

    tools:context="com.moez.QKSMS.feature.compose.ComposeActivity">
@@ -31,12 +31,12 @@ 
        android:id="@+id/messageList"

        android:layout_width="0dp"

        android:layout_height="0dp"

        android:layout_marginBottom="12dp"

        android:clipChildren="false"

        android:clipToPadding="false"

        android:paddingTop="8dp"

        android:paddingBottom="16dp"

        app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"

        app:layout_constraintBottom_toBottomOf="@id/composeBackground"

        app:layout_constraintBottom_toTopOf="@id/messageBackground"

        app:layout_constraintEnd_toEndOf="parent"

        app:layout_constraintStart_toStartOf="parent"

        app:layout_constraintTop_toBottomOf="@id/sendAsGroupBackground"
@@ -135,31 +135,29 @@ 
        android:id="@+id/composeBar"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        app:constraint_referenced_ids="composeBackground,messageBackground,attachments,attach,message,counter,send" />

        app:constraint_referenced_ids="messageBackground,attachments,attach,message,counter,send" />



    <View

        android:id="@+id/composeBackground"

        android:layout_width="0dp"

        android:layout_height="8dp"

        android:layout_marginTop="8dp"

        android:background="@drawable/compose_bar_background"

        android:backgroundTint="?attr/composeBackground"

        app:layout_constraintEnd_toEndOf="parent"

        app:layout_constraintStart_toStartOf="parent"

        app:layout_constraintTop_toTopOf="@id/messageBackground" />

        android:id="@+id/composeDivider"

        android:layout_width="match_parent"

        android:layout_height="1dp"

        android:layout_marginBottom="12dp"

        android:background="?android:attr/divider"

        android:visibility="gone"

        app:layout_constraintBottom_toTopOf="@id/messageBackground"

        app:layout_goneMarginBottom="12dp" />



    <View

        android:id="@+id/messageBackground"

        android:layout_width="0dp"

        android:layout_height="0dp"

        android:layout_marginStart="8dp"

        android:layout_marginStart="12dp"

        android:layout_marginEnd="8dp"

        android:layout_marginBottom="8dp"

        android:layout_marginBottom="12dp"

        android:background="@drawable/rounded_rectangle_22dp"

        android:backgroundTint="?attr/bubbleColor"

        android:elevation="4dp"

        app:layout_constraintBottom_toBottomOf="parent"

        app:layout_constraintEnd_toEndOf="parent"

        app:layout_constraintEnd_toStartOf="@id/send"

        app:layout_constraintStart_toEndOf="@id/attach"

        app:layout_constraintTop_toTopOf="@id/scheduledCancel" />
@@ -174,7 +172,6 @@ 
        android:id="@+id/scheduledTitle"

        android:layout_width="0dp"

        android:layout_height="wrap_content"

        android:elevation="4dp"

        android:paddingStart="16dp"

        android:paddingEnd="16dp"

        android:text="@string/compose_scheduled_for"
@@ -191,7 +188,6 @@ 
        android:id="@+id/scheduledTime"

        android:layout_width="0dp"

        android:layout_height="wrap_content"

        android:elevation="4dp"

        android:paddingStart="16dp"

        android:paddingEnd="16dp"

        android:textColor="?android:attr/textColorTertiary"
@@ -206,7 +202,6 @@ 
        android:id="@+id/scheduledCancel"

        android:layout_width="44dp"

        android:layout_height="56dp"

        android:elevation="4dp"

        android:padding="10dp"

        android:src="@drawable/ic_cancel_black_24dp"

        android:tint="?android:attr/textColorSecondary"
@@ -218,7 +213,6 @@ 
        android:layout_width="0dp"

        android:layout_height="1dp"

        android:background="?android:attr/divider"

        android:elevation="4dp"

        app:layout_constraintBottom_toTopOf="@id/attachments"

        app:layout_constraintEnd_toEndOf="@id/messageBackground"

        app:layout_constraintStart_toStartOf="@id/messageBackground" />
@@ -229,7 +223,6 @@ 
        android:layout_height="wrap_content"

        android:clipChildren="false"

        android:clipToPadding="false"

        android:elevation="4dp"

        android:orientation="horizontal"

        android:paddingStart="8dp"

        android:paddingEnd="8dp"
@@ -246,7 +239,6 @@ 
        android:layout_height="wrap_content"

        android:layout_weight="1"

        android:background="@null"

        android:elevation="4dp"

        android:gravity="center_vertical"

        android:hint="@string/compose_hint"

        android:inputType="textLongMessage|textCapSentences|textMultiLine"
@@ -263,12 +255,11 @@ 


    <ImageView

        android:id="@+id/sim"

        android:layout_width="44dp"

        android:layout_height="44dp"

        android:layout_width="40dp"

        android:layout_height="40dp"

        android:background="?attr/selectableItemBackground"

        android:contentDescription="@string/compose_sim_cd"

        android:elevation="4dp"

        android:padding="10dp"

        android:padding="8dp"

        android:src="@drawable/ic_sim_card_black_24dp"

        android:tint="?android:attr/textColorSecondary"

        android:visibility="gone"
@@ -279,7 +270,6 @@ 
        android:id="@+id/simIndex"

        android:layout_width="0dp"

        android:layout_height="0dp"

        android:elevation="4dp"

        android:gravity="center"

        android:textColor="?android:attr/textColorPrimaryInverse"

        android:textSize="14dp"
@@ -296,7 +286,6 @@ 
        android:layout_width="0dp"

        android:layout_height="wrap_content"

        android:layout_marginBottom="4dp"

        android:elevation="4dp"

        android:gravity="center"

        android:textColor="?android:attr/textColorSecondary"

        app:layout_constraintBottom_toTopOf="@id/send"
@@ -309,14 +298,14 @@ 
        android:id="@+id/send"

        android:layout_width="44dp"

        android:layout_height="44dp"

        android:layout_marginEnd="8dp"

        android:background="?android:attr/selectableItemBackgroundBorderless"

        android:contentDescription="@string/compose_send_cd"

        android:elevation="4dp"

        android:padding="10dp"

        android:src="@drawable/ic_send_black_24dp"

        android:tint="?android:textColorSecondary"

        app:layout_constraintBottom_toBottomOf="@id/messageBackground"

        app:layout_constraintEnd_toEndOf="@id/messageBackground"

        tools:backgroundTint="@color/tools_theme" />

        app:layout_constraintEnd_toEndOf="parent" />



    <androidx.appcompat.widget.Toolbar

        android:id="@+id/toolbar"
@@ -531,14 +520,13 @@ 
        android:id="@+id/attach"

        android:layout_width="44dp"

        android:layout_height="44dp"

        android:layout_marginStart="8dp"

        android:layout_marginBottom="8dp"

        android:layout_marginStart="12dp"

        android:background="@drawable/circle"

        android:contentDescription="@string/compose_attach_cd"

        android:elevation="4dp"

        android:padding="10dp"

        android:src="@drawable/ic_add_black_24dp"

        app:layout_constraintBottom_toBottomOf="parent"

        app:layout_constraintBottom_toBottomOf="@id/messageBackground"

        app:layout_constraintStart_toStartOf="parent"

        tools:backgroundTint="@color/tools_theme"

        tools:tint="@color/textPrimaryDark" />

presentation/src/main/res/layout/contact_chip.xml

+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ 
        android:layout_height="36dp"

        android:layout_margin="4dp"

        android:background="@drawable/chip_background"

        android:backgroundTint="?attr/composeBackground"

        android:backgroundTint="?attr/bubbleColor"

        android:orientation="horizontal">



        <com.moez.QKSMS.common.widget.AvatarView