Add support for changing font size

This commit is contained in:
Moez Bhatti
2018-04-05 23:23:54 -04:00
parent 740be7030b
commit 933911b3d6
29 changed files with 312 additions and 91 deletions
@@ -19,7 +19,6 @@
-->
<merge android:id="@+id/avatar"
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:layout_width="match_parent"
android:layout_height="match_parent"
@@ -25,6 +25,6 @@
android:imeOptions="flagNoExtractUi"
android:inputType="textFilter|textNoSuggestions"
android:privateImeOptions="nm"
android:textSize="16sp"
app:textColor="primary"
app:textColorHint="tertiary" />
app:textColorHint="tertiary"
app:textSize="primary" />
@@ -1,4 +1,5 @@
<?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.
@@ -38,15 +39,7 @@
<common.widget.QkTextView
android:id="@+id/toolbarTitle"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@null"
android:gravity="start|center_vertical"
android:maxLines="1"
android:singleLine="true"
android:textSize="20sp"
app:textColor="primary"
tools:text="Conversations" />
style="@style/ToolbarText" />
<android.support.v7.widget.RecyclerView
android:id="@+id/chips"
@@ -183,12 +176,12 @@
android:layout_height="0dp"
android:layout_marginBottom="4dp"
android:gravity="center"
android:textSize="12sp"
app:layout_constraintBottom_toTopOf="@id/send"
app:layout_constraintEnd_toEndOf="@id/send"
app:layout_constraintHeight_default="wrap"
app:layout_constraintStart_toStartOf="@id/send"
app:textColor="secondary"
app:textSize="tertiary"
tools:text="108 / 2" />
<ImageView
@@ -44,9 +44,9 @@
android:layout_gravity="center_vertical"
android:layout_marginLeft="8dp"
android:layout_marginRight="12dp"
android:textSize="14sp"
android:textStyle="bold"
app:textColor="primary"
app:textSize="secondary"
tools:text="Moez Bhatti" />
</LinearLayout>
@@ -63,18 +63,17 @@
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="center_vertical"
android:textSize="14sp"
app:textColor="secondary"
app:textSize="secondary"
tools:text="(123) 456-7890"
tools:textColor="@color/textSecondary" />
<common.widget.QkTextView
android:id="@+id/type"
style="@style/TextSecondary"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:textSize="14sp"
app:textColor="tertiary"
tools:text="Mobile"
tools:textColor="@color/textTertiary" />
@@ -31,19 +31,18 @@
android:layout_marginStart="72dp"
android:layout_weight="1"
android:gravity="center_vertical"
android:textSize="14sp"
app:textColor="secondary"
app:textSize="secondary"
tools:text="(123) 456-7890"
tools:textColor="@color/textSecondary" />
<common.widget.QkTextView
android:id="@+id/type"
style="@style/TextSecondary"
android:layout_width="wrap_content"
android:layout_height="40dp"
android:layout_marginEnd="16dp"
android:gravity="center_vertical"
android:textSize="14sp"
app:textColor="tertiary"
tools:text="Mobile"
tools:textColor="@color/textTertiary" />
@@ -38,26 +38,24 @@
<common.widget.QkTextView
android:id="@+id/name"
style="@style/TextPrimary"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:textSize="16sp"
app:layout_constraintBottom_toTopOf="@id/address"
app:layout_constraintStart_toEndOf="@id/avatar"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_chainStyle="packed"
app:textColor="primary"
tools:text="Moez Bhatti" />
<common.widget.QkTextView
android:id="@+id/address"
style="@style/TextSecondary"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:textSize="14sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="@id/name"
app:layout_constraintTop_toBottomOf="@id/name"
app:textColor="tertiary"
tools:text="(123) 456-7890" />
<ImageView
@@ -19,6 +19,7 @@
-->
<FrameLayout android:id="@+id/root"
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:layout_width="match_parent"
android:layout_height="match_parent"
@@ -42,11 +43,11 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@null"
android:gravity="left|center_vertical"
android:gravity="start|center_vertical"
android:maxLines="1"
android:singleLine="true"
android:textColor="@color/textPrimaryDark"
android:textSize="20sp"
app:textSize="toolbar"
tools:text="Conversations" />
</android.support.v7.widget.Toolbar>
@@ -71,6 +71,7 @@
<common.widget.QkTextView
android:id="@+id/syncingLabel"
style="@style/TextSecondary"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginEnd="32dp"
@@ -80,8 +81,7 @@
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/syncingProgress"
app:textColor="tertiary" />
app:layout_constraintTop_toBottomOf="@id/syncingProgress" />
<FrameLayout
android:id="@+id/synced"
@@ -120,8 +120,8 @@
android:layout_gravity="start"
android:layout_marginStart="72dp"
android:layout_marginTop="4dp"
android:textSize="12sp"
app:textColor="secondary"
app:textSize="tertiary"
tools:text="Sending..." />
</LinearLayout>
@@ -114,8 +114,8 @@
android:layout_gravity="end"
android:layout_marginEnd="24dp"
android:layout_marginTop="4dp"
android:textSize="12sp"
app:textColor="secondary"
app:textSize="tertiary"
tools:text="Sending..." />
</LinearLayout>
@@ -74,11 +74,11 @@
android:layout_height="wrap_content"
android:layout_marginBottom="4dp"
android:gravity="center"
android:textSize="12sp"
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" />
<ImageView
@@ -63,9 +63,9 @@
android:layout_marginLeft="32dp"
android:layout_marginRight="32dp"
android:text="@string/qksms_plus_description_title"
android:textSize="16sp"
android:textStyle="bold"
app:textColor="primary" />
app:textColor="primary"
app:textSize="primary" />
<common.widget.QkTextView
android:id="@+id/description"
@@ -74,8 +74,8 @@
android:layout_marginLeft="32dp"
android:layout_marginRight="32dp"
android:text="@string/qksms_plus_description_summary"
android:textSize="14sp"
app:textColor="secondary" />
app:textColor="secondary"
app:textSize="secondary" />
<android.support.constraint.ConstraintLayout
android:id="@+id/thanks"
@@ -100,21 +100,21 @@
android:layout_height="wrap_content"
android:layout_marginStart="24dp"
android:text="@string/qksms_plus_thanks_title"
android:textSize="14sp"
android:textStyle="bold"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/thanksIcon"
app:textColor="primary" />
app:textColor="primary"
app:textSize="secondary" />
<common.widget.QkTextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:text="@string/qksms_plus_thanks_summary"
android:textSize="14sp"
app:layout_constraintEnd_toEndOf="@id/thanksTitle"
app:layout_constraintStart_toStartOf="@id/thanksTitle"
app:layout_constraintTop_toBottomOf="@id/thanksTitle"
app:textColor="secondary" />
app:textColor="secondary"
app:textSize="secondary" />
</android.support.constraint.ConstraintLayout>
@@ -175,9 +175,9 @@
android:layout_marginRight="16dp"
android:layout_marginTop="24dp"
android:text="@string/qksms_plus_coming_soon"
android:textSize="16sp"
android:textStyle="bold"
app:textColor="primary" />
app:textColor="primary"
app:textSize="primary" />
<common.widget.PreferenceView
android:layout_width="match_parent"
@@ -156,6 +156,12 @@
app:title="@string/settings_qkreply_title"
app:widget="@layout/settings_switch_widget" />
<common.widget.PreferenceView
android:id="@+id/textSize"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:title="@string/settings_text_size_title" />
<common.widget.PreferenceView
android:id="@+id/unicode"
android:layout_width="match_parent"
@@ -34,17 +34,16 @@
android:layout_height="wrap_content"
android:gravity="center"
android:text="@string/setup_title"
android:textSize="20sp"
app:textColor="primary" />
app:textColor="primary"
app:textSize="toolbar" />
<common.widget.QkTextView
style="@style/TextSecondary"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="4dp"
android:gravity="center"
android:text="@string/setup_summary"
android:textSize="14sp"
app:textColor="tertiary" />
android:text="@string/setup_summary" />
<Space
android:layout_width="match_parent"
@@ -57,6 +56,7 @@
<common.widget.QkTextView
android:id="@+id/skip"
style="@style/TextSecondary"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
@@ -64,9 +64,7 @@
android:gravity="center"
android:text="@string/setup_skip"
android:textAllCaps="true"
android:textSize="14sp"
android:textStyle="bold"
app:textColor="tertiary" />
android:textStyle="bold" />
<common.widget.QkTextView
android:id="@+id/next"
@@ -77,9 +75,9 @@
android:gravity="center"
android:text="@string/setup_next"
android:textAllCaps="true"
android:textSize="14sp"
android:textStyle="bold"
app:textColor="primary" />
app:textColor="primary"
app:textSize="secondary" />
</LinearLayout>
@@ -19,6 +19,7 @@
-->
<common.widget.QkTextView android:id="@+id/label"
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:background="@drawable/ripple"
@@ -27,5 +28,5 @@
android:paddingEnd="12dp"
android:paddingStart="12dp"
android:textAllCaps="true"
android:textSize="14sp"
android:textStyle="bold" />
android:textStyle="bold"
app:textSize="secondary" />
@@ -17,6 +17,7 @@
<common.widget.QkTextView
android:id="@+id/hexLabel"
style="@style/TextSecondary"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="24dp"
@@ -24,12 +25,10 @@
android:paddingBottom="8dp"
android:paddingTop="8dp"
android:text="@string/theme_hex"
android:textSize="14sp"
android:textStyle="bold"
android:visibility="gone"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/picker"
app:textColor="tertiary" />
app:layout_constraintTop_toBottomOf="@id/picker" />
<common.widget.Separator
android:id="@+id/hexSeparator"
@@ -47,12 +46,12 @@
android:layout_marginStart="16dp"
android:gravity="center"
android:text="#"
android:textSize="14sp"
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" />
<common.widget.QkEditText
@@ -63,12 +62,12 @@
android:gravity="center"
android:paddingEnd="16dp"
android:textAllCaps="true"
android:textSize="14sp"
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" />
<android.support.constraint.Group
@@ -28,12 +28,21 @@
<enum name="tertiaryOnTheme" value="5" />
</attr>
<attr name="textSize" format="enum">
<enum name="primary" value="0" />
<enum name="secondary" value="1" />
<enum name="tertiary" value="2" />
<enum name="toolbar" value="3" />
</attr>
<declare-styleable name="QkTextView">
<attr name="textColor" />
<attr name="textSize" />
</declare-styleable>
<declare-styleable name="QkEditText">
<attr name="textColor" />
<attr name="textSize" />
<attr name="textColorHint" format="enum">
<enum name="primary" value="0" />
<enum name="secondary" value="1" />
@@ -97,6 +97,7 @@
<string name="settings_delivery_summary">Confirm that messages were sent successfully</string>
<string name="settings_qkreply_title">QK Reply</string>
<string name="settings_qkreply_summary">Popup for new messages</string>
<string name="settings_text_size_title">Font size</string>
<string name="settings_unicode_title">Strip accents</string>
<string name="settings_unicode_summary">Remove accents from characters in outgoing SMS messages</string>
<string name="settings_mms_title">MMS enabled</string>
@@ -182,6 +183,13 @@
<item>Automatic</item>
</string-array>
<string-array name="text_sizes">
<item>Small</item>
<item>Normal</item>
<item>Large</item>
<item>Larger</item>
</string-array>
<string-array name="mms_sizes">
<item>100KB</item>
<item>200KB</item>
+9 -9
View File
@@ -19,18 +19,18 @@
<resources>
<style name="TextPrimary">
<item name="android:textSize">16sp</item>
<item name="textColor">primary</item>
<item name="textSize">primary</item>
</style>
<style name="TextSecondary">
<item name="android:textSize">14sp</item>
<item name="textColor">tertiary</item>
<item name="textSize">secondary</item>
</style>
<style name="TextTertiary">
<item name="android:textSize">12sp</item>
<item name="textColor">tertiary</item>
<item name="textSize">tertiary</item>
</style>
<style name="TextTab">
@@ -41,8 +41,8 @@
<item name="android:paddingEnd">12sp</item>
<item name="android:paddingStart">12sp</item>
<item name="android:textAllCaps">true</item>
<item name="android:textSize">14sp</item>
<item name="android:textStyle">bold</item>
<item name="textSize">secondary</item>
</style>
<style name="TextButton">
@@ -52,8 +52,8 @@
<item name="android:paddingLeft">16dp</item>
<item name="android:paddingRight">16dp</item>
<item name="android:gravity">center</item>
<item name="android:textSize">14sp</item>
<item name="android:textStyle">bold</item>
<item name="textSize">secondary</item>
</style>
<style name="Toolbar">
@@ -73,8 +73,8 @@
<item name="android:gravity">start|center_vertical</item>
<item name="android:maxLines">1</item>
<item name="android:singleLine">true</item>
<item name="android:textSize">20sp</item>
<item name="textColor">primary</item>
<item name="textSize">toolbar</item>
</style>
<style name="PreferenceCategory">
@@ -84,13 +84,13 @@
<item name="android:layout_marginEnd">24dp</item>
<item name="android:layout_marginStart">24dp</item>
<item name="android:layout_marginTop">16dp</item>
<item name="android:textSize">14sp</item>
<item name="android:textStyle">bold</item>
<item name="textColor">secondary</item>
<item name="textSize">secondary</item>
</style>
<style name="CollapsingToolbarCollapsedText">
<item name="android:textSize">20sp</item>
<item name="textSize">toolbar</item>
</style>
<style name="CollapsingToolbarExpandedText">
@@ -111,9 +111,9 @@
<item name="android:layout_width">0dp</item>
<item name="android:layout_weight">1</item>
<item name="android:lines">1</item>
<item name="android:textSize">14sp</item>
<item name="android:textStyle">bold</item>
<item name="textColor">primary</item>
<item name="textSize">secondary</item>
</style>
<style name="DrawerIcon">