Apply text color directly from theme attr

This commit is contained in:
moezbhatti
2019-08-11 20:33:13 +02:00
parent b7e78b79aa
commit f5bf212c76
19 changed files with 104 additions and 132 deletions
@@ -27,7 +27,6 @@ import com.moez.QKSMS.common.util.TextViewStyler.Companion.SIZE_SECONDARY
import com.moez.QKSMS.common.util.TextViewStyler.Companion.SIZE_TERTIARY
import com.moez.QKSMS.common.util.TextViewStyler.Companion.SIZE_TOOLBAR
import com.moez.QKSMS.common.util.extensions.getColorCompat
import com.moez.QKSMS.common.util.extensions.resolveThemeColor
import com.moez.QKSMS.common.widget.QkEditText
import com.moez.QKSMS.common.widget.QkTextView
import com.moez.QKSMS.util.Preferences
@@ -40,13 +39,10 @@ class TextViewStyler @Inject constructor(
) {
companion object {
const val COLOR_PRIMARY = 0
const val COLOR_SECONDARY = 1
const val COLOR_TERTIARY = 2
const val COLOR_PRIMARY_ON_THEME = 3
const val COLOR_SECONDARY_ON_THEME = 4
const val COLOR_TERTIARY_ON_THEME = 5
const val COLOR_THEME = 6
const val COLOR_THEME = 0
const val COLOR_PRIMARY_ON_THEME = 1
const val COLOR_SECONDARY_ON_THEME = 2
const val COLOR_TERTIARY_ON_THEME = 3
const val SIZE_PRIMARY = 0
const val SIZE_SECONDARY = 1
@@ -75,9 +71,6 @@ class TextViewStyler @Inject constructor(
else -> return
}
setTextColor(when (colorAttr) {
COLOR_PRIMARY -> context.getColorCompat(R.color.textPrimary)
COLOR_SECONDARY -> context.getColorCompat(R.color.textSecondary)
COLOR_TERTIARY -> context.getColorCompat(R.color.textTertiary)
COLOR_PRIMARY_ON_THEME -> context.getColorCompat(R.color.textPrimaryDark)
COLOR_SECONDARY_ON_THEME -> context.getColorCompat(R.color.textSecondaryDark)
COLOR_TERTIARY_ON_THEME -> context.getColorCompat(R.color.textTertiaryDark)
@@ -125,13 +118,10 @@ class TextViewStyler @Inject constructor(
}
setTextColor(when (colorAttr) {
COLOR_PRIMARY -> context.resolveThemeColor(android.R.attr.textColorPrimary)
COLOR_SECONDARY -> context.resolveThemeColor(android.R.attr.textColorSecondary)
COLOR_TERTIARY -> context.resolveThemeColor(android.R.attr.textColorTertiary)
COLOR_THEME -> colors.theme().theme
COLOR_PRIMARY_ON_THEME -> colors.theme().textPrimary
COLOR_SECONDARY_ON_THEME -> colors.theme().textSecondary
COLOR_TERTIARY_ON_THEME -> colors.theme().textTertiary
COLOR_THEME -> colors.theme().theme
else -> currentTextColor
})
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
<?xml version="1.0" encoding="utf-8"?><!--
~ Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
~
~ This file is part of QKSMS.
@@ -31,11 +30,11 @@
android:layout_marginTop="16dp"
android:layout_marginEnd="24dp"
android:text="@string/changelog_title"
android:textColor="?android:attr/textColorPrimary"
android:textStyle="bold"
app:layout_constraintBottom_toTopOf="@id/version"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_weight="1"
app:textColor="primary"
app:textSize="dialog" />
<com.moez.QKSMS.common.widget.QkTextView
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
<?xml version="1.0" encoding="utf-8"?><!--
~ Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
~
~ This file is part of QKSMS.
@@ -25,6 +24,6 @@
android:layout_height="wrap_content"
android:orientation="vertical"
android:paddingBottom="4dp"
app:textColor="primary"
android:textColor="?android:attr/textColorPrimary"
app:textSize="secondary"
tools:text="- Changelog item" />
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
<?xml version="1.0" encoding="utf-8"?><!--
~ Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
~
~ This file is part of QKSMS.
@@ -25,6 +24,6 @@
android:imeOptions="flagNoExtractUi"
android:inputType="textFilter|textNoSuggestions"
android:privateImeOptions="nm"
android:textColor="?android:attr/textColorPrimary"
android:textColorHint="?android:attr/textColorTertiary"
app:textColor="primary"
app:textSize="primary" />
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
<?xml version="1.0" encoding="utf-8"?><!--
~ Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
~
~ This file is part of QKSMS.
@@ -52,9 +51,9 @@
android:layout_marginEnd="56dp"
android:gravity="center"
android:text="@string/compose_messages_empty"
android:textColor="?android:attr/textColorTertiary"
android:visibility="gone"
app:layout_constraintTop_toBottomOf="@id/toolbar"
app:textColor="tertiary"
app:textSize="secondary" />
<ProgressBar
@@ -315,10 +314,10 @@
android:layout_marginBottom="4dp"
android:elevation="4dp"
android:gravity="center"
android:textColor="?android:attr/textColorSecondary"
app:layout_constraintBottom_toTopOf="@id/send"
app:layout_constraintEnd_toEndOf="@id/send"
app:layout_constraintStart_toStartOf="@id/send"
app:textColor="secondary"
app:textSize="tertiary"
tools:text="108 / 2" />
@@ -362,8 +361,8 @@
<com.moez.QKSMS.common.widget.QkTextView
android:id="@+id/toolbarSubtitle"
style="@style/ToolbarText"
android:textColor="?android:attr/textColorTertiary"
android:visibility="gone"
app:textColor="tertiary"
app:textSize="secondary"
tools:text="3 of 9 results" />
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
<?xml version="1.0" encoding="utf-8"?><!--
~ Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
~
~ This file is part of QKSMS.
@@ -17,10 +16,10 @@
~ You should have received a copy of the GNU General Public License
~ along with QKSMS. If not, see <http://www.gnu.org/licenses/>.
-->
<RelativeLayout android:id="@+id/container"
xmlns:android="http://schemas.android.com/apk/res/android"
<RelativeLayout 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:id="@+id/container"
android:layout_width="wrap_content"
android:layout_height="wrap_content">
@@ -45,8 +44,8 @@
android:layout_gravity="center_vertical"
android:layout_marginLeft="8dp"
android:layout_marginRight="12dp"
android:textColor="?android:attr/textColorPrimary"
android:textStyle="bold"
app:textColor="primary"
app:textSize="secondary"
tools:text="Moez Bhatti" />
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
<?xml version="1.0" encoding="utf-8"?><!--
~ Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
~
~ This file is part of QKSMS.
@@ -39,8 +38,8 @@
style="@style/TextPrimary"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginEnd="16dp"
android:layout_marginStart="16dp"
android:layout_marginEnd="16dp"
app:layout_constraintBottom_toTopOf="@id/address"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0"
@@ -53,16 +52,16 @@
android:id="@+id/address"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginEnd="16dp"
android:layout_marginStart="16dp"
android:layout_marginTop="2dp"
android:layout_marginEnd="16dp"
android:layout_weight="1"
android:gravity="center_vertical"
android:textColor="?android:attr/textColorSecondary"
app:layout_constraintBottom_toBottomOf="@id/avatar"
app:layout_constraintEnd_toStartOf="@id/type"
app:layout_constraintStart_toEndOf="@id/avatar"
app:layout_constraintTop_toBottomOf="@id/name"
app:textColor="secondary"
app:textSize="secondary"
tools:text="(123) 456-7890"
tools:textColor="@color/textSecondary" />
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
<?xml version="1.0" encoding="utf-8"?><!--
~ Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
~
~ This file is part of QKSMS.
@@ -30,7 +29,7 @@
android:layout_height="40dp"
android:layout_weight="1"
android:gravity="center_vertical"
app:textColor="secondary"
android:textColor="?android:attr/textColorSecondary"
app:textSize="secondary"
tools:text="(123) 456-7890"
tools:textColor="@color/textSecondary" />
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
<?xml version="1.0" encoding="utf-8"?><!--
~ Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
~
~ This file is part of QKSMS.
@@ -28,8 +27,8 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:paddingBottom="8dp"
android:paddingTop="8dp">
android:paddingTop="8dp"
android:paddingBottom="8dp">
<LinearLayout
android:id="@+id/inbox"
@@ -66,8 +65,8 @@
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginBottom="8dp"
android:layout_marginTop="8dp"
android:layout_marginBottom="8dp"
android:background="?android:attr/divider" />
<LinearLayout
@@ -142,8 +141,8 @@
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginBottom="8dp"
android:layout_marginTop="8dp"
android:layout_marginBottom="8dp"
android:background="?android:attr/divider" />
<LinearLayout
@@ -210,9 +209,9 @@
android:id="@+id/plusBanner"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
android:layout_marginEnd="8dp"
android:background="@drawable/rounded_rectangle_outline_2dp"
android:backgroundTint="?android:attr/divider"
android:foreground="?attr/selectableItemBackground"
@@ -232,14 +231,14 @@
android:id="@+id/plusTitle"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginEnd="16dp"
android:layout_marginStart="16dp"
android:layout_marginEnd="16dp"
android:text="@string/drawer_plus_banner_title"
android:textColor="?android:attr/textColorPrimary"
android:textStyle="bold"
app:layout_constraintEnd_toStartOf="@id/plusNext"
app:layout_constraintStart_toEndOf="@id/plusIcon"
app:layout_constraintTop_toTopOf="parent"
app:textColor="primary"
app:textSize="primary" />
<com.moez.QKSMS.common.widget.QkTextView
@@ -248,10 +247,10 @@
android:layout_height="wrap_content"
android:layout_marginTop="2dp"
android:text="@string/drawer_plus_banner_summary"
android:textColor="?android:attr/textColorSecondary"
app:layout_constraintEnd_toEndOf="@id/plusTitle"
app:layout_constraintStart_toStartOf="@id/plusTitle"
app:layout_constraintTop_toBottomOf="@id/plusTitle"
app:textColor="secondary"
app:textSize="secondary" />
<ImageView
@@ -270,9 +269,9 @@
android:id="@+id/rateLayout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
android:layout_marginEnd="8dp"
android:background="@drawable/rounded_rectangle_outline_2dp"
android:backgroundTint="?android:attr/divider">
@@ -291,28 +290,28 @@
android:id="@+id/rateTitle"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginEnd="16dp"
android:layout_marginStart="16dp"
android:layout_marginTop="16dp"
android:layout_marginEnd="16dp"
android:text="@string/rate_title"
android:textColor="?android:attr/textColorPrimary"
android:textStyle="bold"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/rateIcon"
app:layout_constraintTop_toTopOf="parent"
app:textColor="primary"
app:textSize="primary" />
<com.moez.QKSMS.common.widget.QkTextView
android:id="@+id/rateSummary"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginEnd="16dp"
android:layout_marginTop="2dp"
android:layout_marginEnd="16dp"
android:text="@string/rate_summary"
android:textColor="?android:attr/textColorSecondary"
app:layout_constraintEnd_toEndOf="@id/rateTitle"
app:layout_constraintStart_toStartOf="@id/rateTitle"
app:layout_constraintTop_toBottomOf="@id/rateTitle"
app:textColor="secondary"
app:textSize="secondary" />
<com.moez.QKSMS.common.widget.QkTextView
@@ -321,29 +320,29 @@
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginTop="8dp"
android:paddingBottom="16dp"
android:paddingStart="16dp"
android:paddingTop="16dp"
android:paddingBottom="16dp"
android:text="@string/rate_dismiss"
android:textColor="?android:attr/textColorTertiary"
android:textStyle="bold"
app:layout_constraintEnd_toStartOf="@id/rateOkay"
app:layout_constraintTop_toBottomOf="@id/rateSummary"
app:textColor="tertiary"
app:textSize="secondary" />
<com.moez.QKSMS.common.widget.QkTextView
android:id="@+id/rateOkay"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="8dp"
android:layout_marginTop="8dp"
android:layout_marginEnd="8dp"
android:background="?attr/selectableItemBackground"
android:padding="16dp"
android:text="@string/rate_okay"
android:textColor="?android:attr/textColorSecondary"
android:textStyle="bold"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@id/rateSummary"
app:textColor="secondary"
app:textSize="secondary" />
</androidx.constraintlayout.widget.ConstraintLayout>
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
<?xml version="1.0" encoding="utf-8"?><!--
~ Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
~
~ This file is part of QKSMS.
@@ -29,12 +28,12 @@
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:paddingTop="16dp"
android:textColor="?android:attr/textColorPrimary"
android:textStyle="bold"
app:layout_constraintBottom_toTopOf="@id/snackbarMessage"
app:layout_constraintEnd_toStartOf="@id/snackbarButton"
app:layout_constraintHorizontal_bias="0"
app:layout_constraintStart_toStartOf="parent"
app:textColor="primary"
app:textSize="primary"
tools:text="Love texting again" />
@@ -45,11 +44,11 @@
android:layout_marginStart="16dp"
android:layout_marginTop="2dp"
android:paddingBottom="16dp"
android:textColor="?android:attr/textColorSecondary"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@id/snackbarButton"
app:layout_constraintHorizontal_bias="0"
app:layout_constraintStart_toStartOf="parent"
app:textColor="secondary"
app:textSize="secondary"
tools:text="Make QKSMS your default SMS app" />
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
<?xml version="1.0" encoding="utf-8"?><!--
~ Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
~
~ This file is part of QKSMS.
@@ -65,8 +64,8 @@
android:id="@+id/attachments"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="12dp"
android:layout_marginStart="12dp"
android:layout_marginEnd="12dp"
android:nestedScrollingEnabled="false"
android:orientation="vertical"
app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
@@ -91,17 +90,17 @@
style="@style/TextPrimary"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="12dp"
android:layout_marginStart="12dp"
android:layout_marginTop="2dp"
android:layout_marginEnd="12dp"
android:autoLink="email|phone|web"
android:background="@drawable/message_only"
android:gravity="start|center_vertical"
android:minHeight="36dp"
android:paddingBottom="8dp"
android:paddingEnd="12dp"
android:paddingStart="12dp"
android:paddingTop="8dp"
android:paddingEnd="12dp"
android:paddingBottom="8dp"
app:layout_constrainedWidth="true"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0"
@@ -115,13 +114,13 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="start"
android:layout_marginBottom="4dp"
android:layout_marginStart="72dp"
android:layout_marginTop="4dp"
android:layout_marginBottom="4dp"
android:textColor="?android:attr/textColorSecondary"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/body"
app:textColor="secondary"
app:textSize="tertiary"
tools:text="Sending..." />
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
<?xml version="1.0" encoding="utf-8"?><!--
~ Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
~
~ This file is part of QKSMS.
@@ -66,8 +65,8 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="end"
android:layout_marginEnd="12dp"
android:layout_marginStart="60dp"
android:layout_marginEnd="12dp"
android:gravity="end"
android:nestedScrollingEnabled="false"
android:orientation="vertical"
@@ -84,18 +83,18 @@
style="@style/TextPrimary"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="12dp"
android:layout_marginStart="60dp"
android:layout_marginTop="2dp"
android:layout_marginEnd="12dp"
android:autoLink="email|phone|web"
android:background="@drawable/message_only"
android:backgroundTint="?attr/bubbleColor"
android:gravity="start|center_vertical"
android:minHeight="36dp"
android:paddingBottom="8dp"
android:paddingEnd="12dp"
android:paddingStart="12dp"
android:paddingTop="8dp"
android:paddingEnd="12dp"
android:paddingBottom="8dp"
app:layout_constrainedWidth="true"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="1"
@@ -139,13 +138,13 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="end"
android:layout_marginBottom="4dp"
android:layout_marginEnd="24dp"
android:layout_marginTop="4dp"
android:layout_marginEnd="24dp"
android:layout_marginBottom="4dp"
android:textColor="?android:attr/textColorSecondary"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@id/body"
app:textColor="secondary"
app:textSize="tertiary"
tools:text="Sending..." />
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
<?xml version="1.0" encoding="utf-8"?><!--
~ Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
~
~ This file is part of QKSMS.
@@ -137,10 +136,10 @@
android:layout_marginBottom="4dp"
android:elevation="4dp"
android:gravity="center"
android:textColor="?android:attr/textColorSecondary"
app:layout_constraintBottom_toTopOf="@id/send"
app:layout_constraintEnd_toEndOf="@id/send"
app:layout_constraintStart_toStartOf="@id/send"
app:textColor="secondary"
app:textSize="tertiary"
tools:text="108 / 2" />
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
<?xml version="1.0" encoding="utf-8"?><!--
~ Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
~
~ This file is part of QKSMS.
@@ -41,17 +40,17 @@
android:id="@+id/toUpgrade"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="32dp"
android:layout_marginEnd="32dp"
android:layout_marginStart="32dp"
android:layout_marginEnd="32dp"
android:layout_marginBottom="32dp"
android:orientation="vertical">
<com.moez.QKSMS.common.widget.QkTextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/qksms_plus_description_title"
android:textColor="?android:attr/textColorPrimary"
android:textStyle="bold"
app:textColor="primary"
app:textSize="primary" />
<com.moez.QKSMS.common.widget.QkTextView
@@ -59,7 +58,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/qksms_plus_description_summary"
app:textColor="secondary"
android:textColor="?android:attr/textColorSecondary"
app:textSize="secondary" />
<com.moez.QKSMS.common.widget.QkTextView
@@ -78,7 +77,7 @@
android:background="@drawable/rounded_rectangle_outline_2dp"
android:backgroundTint="?android:attr/divider"
android:text="@string/qksms_plus_upgrade_donate"
app:textColor="primary"
android:textColor="?android:attr/textColorPrimary"
tools:backgroundTint="@color/separatorLight" />
</LinearLayout>
@@ -87,9 +86,9 @@
android:id="@+id/upgraded"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="24dp"
android:layout_marginEnd="24dp"
android:layout_marginStart="24dp"
android:layout_marginEnd="24dp"
android:layout_marginBottom="24dp"
android:background="@drawable/rounded_rectangle_2dp"
android:backgroundTint="?android:attr/divider"
android:padding="16dp"
@@ -110,20 +109,20 @@
android:layout_height="wrap_content"
android:layout_marginStart="24dp"
android:text="@string/qksms_plus_thanks_title"
android:textColor="?android:attr/textColorPrimary"
android:textStyle="bold"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/thanksIcon"
app:textColor="primary"
app:textSize="secondary" />
<com.moez.QKSMS.common.widget.QkTextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:text="@string/qksms_plus_thanks_summary"
android:textColor="?android:attr/textColorSecondary"
app:layout_constraintEnd_toEndOf="@id/thanksTitle"
app:layout_constraintStart_toStartOf="@id/thanksTitle"
app:layout_constraintTop_toBottomOf="@id/thanksTitle"
app:textColor="secondary"
app:textSize="secondary" />
</androidx.constraintlayout.widget.ConstraintLayout>
@@ -132,16 +131,16 @@
android:id="@+id/free"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="24dp"
android:layout_marginEnd="32dp"
android:layout_marginStart="32dp"
android:layout_marginEnd="32dp"
android:layout_marginBottom="24dp"
android:orientation="vertical">
<com.moez.QKSMS.common.widget.QkTextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/qksms_plus_free_title"
app:textColor="secondary"
android:textColor="?android:attr/textColorSecondary"
app:textSize="secondary" />
<com.moez.QKSMS.common.widget.QkTextView
@@ -211,13 +210,13 @@
<com.moez.QKSMS.common.widget.QkTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="8dp"
android:layout_marginLeft="16dp"
android:layout_marginRight="16dp"
android:layout_marginTop="24dp"
android:layout_marginRight="16dp"
android:layout_marginBottom="8dp"
android:text="@string/qksms_plus_coming_soon"
android:textColor="?android:attr/textColorPrimary"
android:textStyle="bold"
app:textColor="primary"
app:textSize="primary" />
<com.moez.QKSMS.common.widget.PreferenceView
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
<?xml version="1.0" encoding="utf-8"?><!--
~ Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
~
~ This file is part of QKSMS.
@@ -39,8 +38,8 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:paddingEnd="24dp"
android:paddingStart="24dp">
android:paddingStart="24dp"
android:paddingEnd="24dp">
<com.moez.QKSMS.common.widget.QkTextView
style="@style/TextPrimary"
@@ -48,7 +47,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:text="@string/scheduled_empty_description"
app:textColor="secondary" />
android:textColor="?android:attr/textColorSecondary" />
<Space
android:layout_width="match_parent"
@@ -78,8 +77,8 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="end"
android:layout_marginEnd="16dp"
android:layout_marginTop="8dp"
android:layout_marginEnd="16dp"
android:gravity="end"
android:text="@string/scheduled_empty_message_3_timestamp"
android:textColor="?android:attr/textColorSecondary"
@@ -96,8 +95,8 @@
android:id="@+id/messages"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingBottom="8dp"
android:paddingTop="8dp"
android:paddingBottom="8dp"
app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
tools:listitem="@layout/scheduled_message_list_item" />
@@ -142,8 +141,8 @@
android:id="@+id/upgradeLabel"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="16dp"
android:layout_marginStart="16dp"
android:layout_marginEnd="16dp"
android:text="@string/title_qksms_plus"
android:textColor="@color/textPrimaryDark"
android:textStyle="bold"
@@ -44,15 +44,15 @@
android:id="@+id/resultsTitle"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginEnd="16dp"
android:layout_marginStart="16dp"
android:layout_marginTop="16dp"
android:layout_marginEnd="16dp"
android:text="@string/main_message_results_title"
android:textColor="?android:attr/textColorSecondary"
android:textStyle="bold"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/resultsSeparator"
app:textColor="secondary"
app:textSize="secondary" />
<com.moez.QKSMS.common.widget.GroupAvatarView
@@ -60,9 +60,9 @@
android:layout_width="48dp"
android:layout_height="48dp"
android:layout_gravity="top"
android:layout_marginBottom="12dp"
android:layout_marginStart="16dp"
android:layout_marginTop="12dp"
android:layout_marginBottom="12dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/resultsTitle"
@@ -74,8 +74,8 @@
style="@style/TextPrimary"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginEnd="16dp"
android:layout_marginStart="16dp"
android:layout_marginEnd="16dp"
app:layout_constraintBottom_toTopOf="@id/snippet"
app:layout_constraintEnd_toStartOf="@id/date"
app:layout_constraintStart_toEndOf="@id/avatars"
@@ -88,8 +88,8 @@
style="@style/TextSecondary"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginEnd="16dp"
android:layout_marginTop="2dp"
android:layout_marginEnd="16dp"
android:ellipsize="end"
android:maxLines="1"
app:layout_constraintBottom_toBottomOf="parent"
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
<?xml version="1.0" encoding="utf-8"?><!--
~ Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
~
~ This file is part of QKSMS.
@@ -39,8 +38,8 @@
android:layout_height="wrap_content"
android:layout_marginStart="24dp"
android:gravity="center"
android:paddingBottom="8dp"
android:paddingTop="8dp"
android:paddingBottom="8dp"
android:text="@string/theme_hex"
android:textStyle="bold"
android:visibility="gone"
@@ -64,11 +63,11 @@
android:layout_marginStart="16dp"
android:gravity="center"
android:text="#"
android:textColor="?android:attr/textColorPrimary"
android:textStyle="bold"
app:layout_constraintBottom_toBottomOf="@id/hexLabel"
app:layout_constraintStart_toEndOf="@id/hexSeparator"
app:layout_constraintTop_toTopOf="@id/hexLabel"
app:textColor="primary"
app:textSize="secondary"
tools:ignore="HardcodedText" />
@@ -80,11 +79,11 @@
android:gravity="center"
android:paddingEnd="16dp"
android:textAllCaps="true"
android:textColor="?android:attr/textColorPrimary"
android:textStyle="bold"
app:layout_constraintBottom_toBottomOf="@id/hexLabel"
app:layout_constraintStart_toEndOf="@id/hexSign"
app:layout_constraintTop_toTopOf="@id/hexLabel"
app:textColor="primary"
app:textSize="secondary"
tools:text="1B8AE8" />
+4 -7
View File
@@ -20,13 +20,10 @@
<resources>
<attr name="textColor" format="enum">
<enum name="primary" value="0" />
<enum name="secondary" value="1" />
<enum name="tertiary" value="2" />
<enum name="primaryOnTheme" value="3" />
<enum name="secondaryOnTheme" value="4" />
<enum name="tertiaryOnTheme" value="5" />
<enum name="theme" value="6" />
<enum name="theme" value="0" />
<enum name="primaryOnTheme" value="1" />
<enum name="secondaryOnTheme" value="2" />
<enum name="tertiaryOnTheme" value="3" />
</attr>
<attr name="textSize" format="enum">
+5 -5
View File
@@ -19,17 +19,17 @@
<resources>
<style name="TextPrimary">
<item name="textColor">primary</item>
<item name="android:textColor">?android:attr/textColorPrimary</item>
<item name="textSize">primary</item>
</style>
<style name="TextSecondary">
<item name="textColor">tertiary</item>
<item name="android:textColor">?android:attr/textColorSecondary</item>
<item name="textSize">secondary</item>
</style>
<style name="TextTertiary">
<item name="textColor">tertiary</item>
<item name="android:textColor">?android:attr/textColorTertiary</item>
<item name="textSize">tertiary</item>
</style>
@@ -61,7 +61,7 @@
<item name="android:ellipsize">end</item>
<item name="android:gravity">start|center_vertical</item>
<item name="android:maxLines">1</item>
<item name="textColor">primary</item>
<item name="android:textColor">?android:attr/textColorPrimary</item>
<item name="textSize">toolbar</item>
</style>
@@ -116,8 +116,8 @@
<item name="android:layout_width">0dp</item>
<item name="android:layout_weight">1</item>
<item name="android:lines">1</item>
<item name="android:textColor">?android:attr/textColorPrimary</item>
<item name="android:textStyle">bold</item>
<item name="textColor">primary</item>
<item name="textSize">secondary</item>
</style>