mirror of
https://github.com/quik-sms/quik.git
synced 2026-11-19 20:38:53 +01:00
Remove Observables from Views
commit 6bb74ca5201cba2fc5de2db349bb7627c028b617 Author: Moez Bhatti <moez.bhatti@gmail.com> Date: Sun May 27 15:15:27 2018 -0400 Fix crash when tapping on selected contact commit f5a45e2a600a8d373160dcb0273bab232e6cc0c5 Author: Moez Bhatti <moez.bhatti@gmail.com> Date: Sun May 27 15:10:44 2018 -0400 Add missing attributes for dialog themes commit 2188adbe5948b9b71f816dad5fb115829ba57e30 Author: Moez Bhatti <moez.bhatti@gmail.com> Date: Sun May 27 14:59:39 2018 -0400 Refresh settings activity when theme changed commit a9541019c566a3a6e41e64ea8136f7fd50a6d364 Author: Moez Bhatti <moez.bhatti@gmail.com> Date: Sun May 27 14:56:33 2018 -0400 Don't use themed attributes in widget commit 4823a3034848efac624eb82856f692c7f9e775a5 Author: Moez Bhatti <moez.bhatti@gmail.com> Date: Sun May 27 14:29:00 2018 -0400 Refresh adapter in conversation info when theme changed commit 7ea5837b99c2b6eac547dad383515ee7b79ff6e4 Author: Moez Bhatti <moez.bhatti@gmail.com> Date: Fri May 25 18:27:08 2018 -0400 Bundle theme colors into data class commit 6a832fdde98622c5a252aca0cac3150a6eb0f554 Author: Moez Bhatti <moez.bhatti@gmail.com> Date: Fri May 25 17:16:21 2018 -0400 Update conversation UI when theme changed commit ef6948e80ed8734a7fefbec1b00f1b32e8209072 Author: Moez Bhatti <moez.bhatti@gmail.com> Date: Fri May 25 16:15:39 2018 -0400 Fix avatar not respecting theme commit 4ea21b6a9963f91d3b9cdaf0ba4749a6f24e8a74 Author: Moez Bhatti <moez.bhatti@gmail.com> Date: Fri May 25 15:52:40 2018 -0400 Fix checkmark color in theme picker commit 270a9d3037439f165a110c7d7dcaf7dd84dad29f Author: Moez Bhatti <moez.bhatti@gmail.com> Date: Fri May 25 13:39:12 2018 -0400 Update views in MainActivity when theme changed commit cdc1187ccaee800e4305da5fab5d22220d04440f Author: Moez Bhatti <moez.bhatti@gmail.com> Date: Thu May 24 23:36:17 2018 -0400 Remove unnecessary programmatic creation of drawer item background commit bc6fbfa75c66bb81db9591617f8c1de4c0f2746f Author: Moez Bhatti <moez.bhatti@gmail.com> Date: Thu May 24 23:28:44 2018 -0400 Temporarily disable RxJava2Debug commit eae422be0bab8cedb3cb5ddf5f4ae61368ab5d1e Author: Moez Bhatti <moez.bhatti@gmail.com> Date: Thu May 24 21:16:46 2018 -0400 Remove observable usage inside of custom views commit 2e65d55b9b283e74fb395d4828eb310395b4902b Author: Moez Bhatti <moez.bhatti@gmail.com> Date: Thu May 24 02:27:26 2018 -0400 Migrate ripple and text size to no longer use observables
This commit is contained in:
@@ -26,8 +26,7 @@
|
||||
<android.support.v7.widget.Toolbar
|
||||
android:id="@+id/toolbar"
|
||||
style="@style/Toolbar"
|
||||
app:layout_constraintTop_toTopOf="parent"
|
||||
tools:background="@color/white">
|
||||
app:layout_constraintTop_toTopOf="parent">
|
||||
|
||||
<common.widget.QkTextView
|
||||
android:id="@+id/toolbarTitle"
|
||||
@@ -110,10 +109,11 @@
|
||||
android:background="@drawable/ab_shadow"
|
||||
app:layout_constraintTop_toBottomOf="@id/toolbar" />
|
||||
|
||||
<common.widget.Separator
|
||||
<View
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="1dp"
|
||||
android:layout_gravity="bottom"
|
||||
android:background="?android:attr/divider"
|
||||
app:layout_constraintBottom_toBottomOf="parent" />
|
||||
|
||||
</android.support.constraint.ConstraintLayout>
|
||||
@@ -47,8 +47,9 @@
|
||||
android:layout_gravity="top|end"
|
||||
android:layout_margin="2dp"
|
||||
android:background="@drawable/circle"
|
||||
android:backgroundTint="?attr/bubbleColor"
|
||||
android:src="@drawable/ic_cancel_black_24dp"
|
||||
android:tint="@color/textSecondary"
|
||||
android:tint="?android:attr/textColorSecondary"
|
||||
tools:backgroundTint="@color/backgroundLight" />
|
||||
|
||||
</FrameLayout>
|
||||
@@ -65,9 +65,10 @@
|
||||
app:title="@string/settings_should_i_answer_title"
|
||||
app:widget="@layout/settings_switch_widget" />
|
||||
|
||||
<common.widget.Separator
|
||||
<View
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="1dp" />
|
||||
android:layout_height="1dp"
|
||||
android:background="?android:attr/divider" />
|
||||
|
||||
<android.support.v7.widget.RecyclerView
|
||||
android:id="@+id/conversations"
|
||||
|
||||
@@ -22,7 +22,7 @@
|
||||
xmlns:tools="http://schemas.android.com/tools"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:background="@drawable/ripple"
|
||||
android:background="?attr/selectableItemBackground"
|
||||
android:paddingBottom="8dp"
|
||||
android:paddingEnd="16dp"
|
||||
android:paddingStart="16dp"
|
||||
|
||||
@@ -25,6 +25,6 @@
|
||||
android:imeOptions="flagNoExtractUi"
|
||||
android:inputType="textFilter|textNoSuggestions"
|
||||
android:privateImeOptions="nm"
|
||||
android:textColorHint="?android:attr/textColorTertiary"
|
||||
app:textColor="primary"
|
||||
app:textColorHint="tertiary"
|
||||
app:textSize="primary" />
|
||||
@@ -22,8 +22,8 @@
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:animateLayoutChanges="true"
|
||||
android:orientation="vertical"
|
||||
tools:background="@color/backgroundLight">
|
||||
android:background="?attr/composeBackground"
|
||||
android:orientation="vertical">
|
||||
|
||||
<android.support.v7.widget.RecyclerView
|
||||
android:id="@+id/messageList"
|
||||
@@ -57,6 +57,7 @@
|
||||
android:id="@+id/contacts"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="0dp"
|
||||
android:background="?android:attr/windowBackground"
|
||||
android:clipChildren="false"
|
||||
android:clipToPadding="false"
|
||||
android:paddingBottom="8dp"
|
||||
@@ -81,16 +82,17 @@
|
||||
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"
|
||||
tools:backgroundTint="@color/backgroundLight" />
|
||||
app:layout_constraintTop_toTopOf="@id/messageBackground" />
|
||||
|
||||
<View
|
||||
android:id="@+id/messageBackground"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="0dp"
|
||||
android:background="@drawable/rounded_rectangle_shadow"
|
||||
android:backgroundTint="?attr/bubbleColor"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintEnd_toStartOf="@id/send"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
@@ -123,43 +125,44 @@
|
||||
android:contentDescription="@string/compose_attach_cd"
|
||||
android:padding="10dp"
|
||||
android:src="@drawable/ic_add_circle_black_24dp"
|
||||
android:tint="?android:attr/textColorSecondary"
|
||||
app:layout_constraintBottom_toBottomOf="@id/message"
|
||||
app:layout_constraintStart_toStartOf="@id/messageBackground"
|
||||
tools:tint="@color/textSecondary" />
|
||||
app:layout_constraintStart_toStartOf="@id/messageBackground" />
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/camera"
|
||||
android:layout_width="44dp"
|
||||
android:layout_height="44dp"
|
||||
android:background="@drawable/ripple"
|
||||
android:background="?attr/selectableItemBackground"
|
||||
android:contentDescription="@string/compose_camera_cd"
|
||||
android:padding="10dp"
|
||||
android:src="@drawable/ic_camera_alt_black_24dp"
|
||||
android:tint="?android:attr/textColorSecondary"
|
||||
android:visibility="gone"
|
||||
app:layout_constraintBottom_toBottomOf="@id/message"
|
||||
app:layout_constraintStart_toEndOf="@id/attach"
|
||||
tools:tint="@color/textSecondary" />
|
||||
app:layout_constraintStart_toEndOf="@id/attach" />
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/gallery"
|
||||
android:layout_width="44dp"
|
||||
android:layout_height="44dp"
|
||||
android:layout_marginEnd="8dp"
|
||||
android:background="@drawable/ripple"
|
||||
android:background="?attr/selectableItemBackground"
|
||||
android:contentDescription="@string/compose_gallery_cd"
|
||||
android:padding="10dp"
|
||||
android:src="@drawable/ic_insert_photo_black_24dp"
|
||||
android:tint="?android:attr/textColorSecondary"
|
||||
android:visibility="gone"
|
||||
app:layout_constraintBottom_toBottomOf="@id/message"
|
||||
app:layout_constraintStart_toEndOf="@id/camera"
|
||||
tools:tint="@color/textSecondary" />
|
||||
app:layout_constraintStart_toEndOf="@id/camera" />
|
||||
|
||||
<common.widget.Separator
|
||||
<View
|
||||
android:id="@+id/attachSeparator"
|
||||
android:layout_width="1dp"
|
||||
android:layout_height="0dp"
|
||||
android:layout_marginBottom="8dp"
|
||||
android:layout_marginTop="8dp"
|
||||
android:background="?android:attr/divider"
|
||||
app:layout_constraintBottom_toBottomOf="@id/message"
|
||||
app:layout_constraintStart_toEndOf="@id/gallery"
|
||||
app:layout_constraintTop_toBottomOf="@id/attachments" />
|
||||
@@ -179,10 +182,10 @@
|
||||
android:maxLines="6"
|
||||
android:minHeight="44dp"
|
||||
android:padding="12dp"
|
||||
android:textColorHint="?android:attr/textColorTertiary"
|
||||
app:layout_constraintBottom_toBottomOf="@id/messageBackground"
|
||||
app:layout_constraintEnd_toEndOf="@id/messageBackground"
|
||||
app:layout_constraintStart_toEndOf="@id/attachSeparator"
|
||||
app:textColorHint="tertiary" />
|
||||
app:layout_constraintStart_toEndOf="@id/attachSeparator" />
|
||||
|
||||
<common.widget.QkTextView
|
||||
android:id="@+id/counter"
|
||||
@@ -221,8 +224,7 @@
|
||||
android:gravity="center_vertical"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent"
|
||||
tools:background="@color/toolbarLight">
|
||||
app:layout_constraintTop_toTopOf="parent">
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
@@ -264,9 +266,10 @@
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toBottomOf="@id/toolbar" />
|
||||
|
||||
<common.widget.Separator
|
||||
<View
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="1dp"
|
||||
android:background="?android:attr/divider"
|
||||
app:layout_constraintBottom_toBottomOf="parent" />
|
||||
|
||||
</android.support.constraint.ConstraintLayout>
|
||||
@@ -30,6 +30,7 @@
|
||||
android:layout_height="36dp"
|
||||
android:layout_margin="4dp"
|
||||
android:background="@drawable/chip_background"
|
||||
android:backgroundTint="?attr/composeBackground"
|
||||
android:orientation="horizontal">
|
||||
|
||||
<common.widget.AvatarView
|
||||
|
||||
@@ -71,7 +71,7 @@
|
||||
android:id="@+id/delete"
|
||||
android:layout_width="56dp"
|
||||
android:layout_height="56dp"
|
||||
android:background="@drawable/ripple"
|
||||
android:background="?attr/selectableItemBackground"
|
||||
android:padding="16dp"
|
||||
android:src="@drawable/ic_cancel_black_24dp"
|
||||
android:tint="@color/white" />
|
||||
|
||||
@@ -28,7 +28,7 @@
|
||||
android:id="@+id/primary"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:background="@drawable/ripple"
|
||||
android:background="?attr/selectableItemBackground"
|
||||
android:gravity="center_vertical"
|
||||
android:paddingBottom="8dp"
|
||||
android:paddingLeft="16dp"
|
||||
|
||||
@@ -22,7 +22,7 @@
|
||||
xmlns:tools="http://schemas.android.com/tools"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:background="@drawable/ripple">
|
||||
android:background="?attr/selectableItemBackground">
|
||||
|
||||
<common.widget.QkTextView
|
||||
android:id="@+id/address"
|
||||
|
||||
@@ -55,10 +55,11 @@
|
||||
tools:layout_height="72dp"
|
||||
tools:listitem="@layout/conversation_recipient_list_item" />
|
||||
|
||||
<common.widget.Separator
|
||||
<View
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="1dp"
|
||||
android:layout_marginBottom="8dp" />
|
||||
android:layout_marginBottom="8dp"
|
||||
android:background="?android:attr/divider" />
|
||||
|
||||
<common.widget.PreferenceView
|
||||
android:id="@+id/notifications"
|
||||
@@ -95,11 +96,12 @@
|
||||
app:icon="@drawable/ic_delete_black_24dp"
|
||||
app:title="@string/info_delete" />
|
||||
|
||||
<common.widget.Separator
|
||||
<View
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="1dp"
|
||||
android:layout_marginBottom="16dp"
|
||||
android:layout_marginTop="8dp" />
|
||||
android:layout_marginTop="8dp"
|
||||
android:background="?android:attr/divider" />
|
||||
|
||||
<android.support.v7.widget.RecyclerView
|
||||
android:id="@+id/media"
|
||||
@@ -122,9 +124,10 @@
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toBottomOf="@id/toolbar" />
|
||||
|
||||
<common.widget.Separator
|
||||
<View
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="1dp"
|
||||
android:background="?android:attr/divider"
|
||||
app:layout_constraintBottom_toBottomOf="parent" />
|
||||
|
||||
</android.support.constraint.ConstraintLayout>
|
||||
@@ -22,7 +22,7 @@
|
||||
xmlns:tools="http://schemas.android.com/tools"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:background="@drawable/ripple"
|
||||
android:background="?attr/selectableItemBackground"
|
||||
android:gravity="center_vertical"
|
||||
android:orientation="horizontal"
|
||||
android:paddingBottom="12dp"
|
||||
|
||||
@@ -22,5 +22,6 @@
|
||||
xmlns:tools="http://schemas.android.com/tools"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:background="?android:attr/divider"
|
||||
android:scaleType="centerCrop"
|
||||
tools:src="@tools:sample/backgrounds/scenic" />
|
||||
@@ -22,7 +22,7 @@
|
||||
xmlns:tools="http://schemas.android.com/tools"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:background="@drawable/ripple"
|
||||
android:background="?attr/selectableItemBackground"
|
||||
android:paddingBottom="8dp"
|
||||
android:paddingEnd="16dp"
|
||||
android:paddingStart="24dp"
|
||||
@@ -64,9 +64,9 @@
|
||||
android:layout_height="40dp"
|
||||
android:padding="8dp"
|
||||
android:src="@drawable/ic_person_add_black_24dp"
|
||||
android:tint="?android:attr/textColorSecondary"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent"
|
||||
tools:tint="@color/textSecondary" />
|
||||
app:layout_constraintTop_toTopOf="parent" />
|
||||
|
||||
</android.support.constraint.ConstraintLayout>
|
||||
@@ -22,9 +22,9 @@
|
||||
xmlns:tools="http://schemas.android.com/tools"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:background="?android:attr/windowBackground"
|
||||
android:orientation="vertical"
|
||||
android:paddingTop="8dp"
|
||||
tools:background="@color/white">
|
||||
android:paddingTop="8dp">
|
||||
|
||||
<LinearLayout
|
||||
android:id="@+id/inbox"
|
||||
@@ -50,7 +50,7 @@
|
||||
android:id="@+id/archivedIcon"
|
||||
style="@style/DrawerIcon"
|
||||
android:src="@drawable/ic_archive_black_24dp"
|
||||
tools:tint="@color/textSecondary" />
|
||||
tools:tint="?android:attr/textColorSecondary" />
|
||||
|
||||
<common.widget.QkTextView
|
||||
style="@style/DrawerText"
|
||||
@@ -67,7 +67,7 @@
|
||||
android:id="@+id/scheduledIcon"
|
||||
style="@style/DrawerIcon"
|
||||
android:src="@drawable/ic_event_black_24dp"
|
||||
tools:tint="@color/textSecondary" />
|
||||
tools:tint="?android:attr/textColorSecondary" />
|
||||
|
||||
<common.widget.QkTextView
|
||||
style="@style/DrawerText"
|
||||
@@ -75,10 +75,11 @@
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
<common.widget.Separator
|
||||
<View
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="1dp"
|
||||
android:layout_marginTop="8dp" />
|
||||
android:layout_marginTop="8dp"
|
||||
android:background="?android:attr/divider" />
|
||||
|
||||
<common.widget.QkTextView
|
||||
style="@style/TextSecondary"
|
||||
@@ -95,7 +96,7 @@
|
||||
android:id="@+id/settingsIcon"
|
||||
style="@style/DrawerIcon"
|
||||
android:src="@drawable/ic_settings_black_24dp"
|
||||
tools:tint="@color/textSecondary" />
|
||||
tools:tint="?android:attr/textColorSecondary" />
|
||||
|
||||
<common.widget.QkTextView
|
||||
style="@style/DrawerText"
|
||||
@@ -111,7 +112,7 @@
|
||||
android:id="@+id/plusIcon"
|
||||
style="@style/DrawerIcon"
|
||||
android:src="@drawable/ic_star_black_24dp"
|
||||
tools:tint="@color/textSecondary" />
|
||||
tools:tint="?android:attr/textColorSecondary" />
|
||||
|
||||
<common.widget.QkTextView
|
||||
style="@style/DrawerText"
|
||||
@@ -127,7 +128,7 @@
|
||||
android:id="@+id/helpIcon"
|
||||
style="@style/DrawerIcon"
|
||||
android:src="@drawable/ic_help_black_24dp"
|
||||
tools:tint="@color/textSecondary" />
|
||||
tools:tint="?android:attr/textColorSecondary" />
|
||||
|
||||
<common.widget.QkTextView
|
||||
style="@style/DrawerText"
|
||||
@@ -146,7 +147,7 @@
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_margin="16dp"
|
||||
android:background="@drawable/rounded_rectangle_outline_2dp"
|
||||
android:backgroundTint="@color/separatorLight">
|
||||
android:backgroundTint="?android:attr/divider">
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/rateIcon"
|
||||
@@ -206,10 +207,10 @@
|
||||
android:id="@+id/rateOkay"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="8dp"
|
||||
android:background="@drawable/ripple"
|
||||
android:padding="16dp"
|
||||
android:layout_marginEnd="8dp"
|
||||
android:layout_marginTop="8dp"
|
||||
android:background="?attr/selectableItemBackground"
|
||||
android:padding="16dp"
|
||||
android:text="@string/rate_okay"
|
||||
android:textStyle="bold"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
|
||||
@@ -22,8 +22,7 @@
|
||||
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"
|
||||
tools:background="@color/white">
|
||||
android:layout_height="match_parent">
|
||||
|
||||
<android.support.constraint.ConstraintLayout
|
||||
android:layout_width="match_parent"
|
||||
@@ -38,8 +37,7 @@
|
||||
android:focusableInTouchMode="true"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent"
|
||||
tools:background="@color/white">
|
||||
app:layout_constraintTop_toTopOf="parent">
|
||||
|
||||
<common.widget.QkTextView
|
||||
android:id="@+id/toolbarTitle"
|
||||
@@ -49,7 +47,7 @@
|
||||
android:id="@+id/toolbarSearch"
|
||||
style="@style/ToolbarText"
|
||||
android:hint="@string/title_conversations"
|
||||
app:textColorHint="tertiary"
|
||||
android:textColorHint="?android:attr/textColorTertiary"
|
||||
app:textSize="primary"
|
||||
tools:textSize="16sp" />
|
||||
|
||||
@@ -102,10 +100,11 @@
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toBottomOf="@id/toolbar" />
|
||||
|
||||
<common.widget.Separator
|
||||
<View
|
||||
android:id="@+id/bottom"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="1dp"
|
||||
android:background="?android:attr/divider"
|
||||
app:layout_constraintBottom_toTopOf="@id/bottomDivider" />
|
||||
|
||||
<android.support.constraint.Barrier
|
||||
@@ -165,7 +164,7 @@
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginEnd="8dp"
|
||||
android:background="@drawable/ripple"
|
||||
android:background="?attr/selectableItemBackground"
|
||||
android:padding="16dp"
|
||||
android:textAllCaps="true"
|
||||
android:textColor="@color/tools_theme"
|
||||
@@ -207,7 +206,6 @@
|
||||
layout="@layout/drawer_view"
|
||||
android:layout_width="320dp"
|
||||
android:layout_height="match_parent"
|
||||
android:layout_gravity="start"
|
||||
android:background="@color/white" />
|
||||
android:layout_gravity="start" />
|
||||
|
||||
</android.support.v4.widget.DrawerLayout>
|
||||
@@ -20,7 +20,7 @@
|
||||
xmlns:tools="http://schemas.android.com/tools"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:background="@drawable/ripple"
|
||||
android:background="?attr/selectableItemBackground"
|
||||
android:gravity="center_vertical"
|
||||
android:orientation="horizontal">
|
||||
|
||||
@@ -30,7 +30,7 @@
|
||||
android:layout_height="24dp"
|
||||
android:layout_marginStart="24dp"
|
||||
android:src="@drawable/radio_button"
|
||||
tools:tint="@color/textTertiary" />
|
||||
tools:tint="?android:attr/textColorTertiary" />
|
||||
|
||||
<common.widget.QkTextView
|
||||
android:id="@+id/title"
|
||||
|
||||
@@ -22,7 +22,7 @@
|
||||
xmlns:tools="http://schemas.android.com/tools"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:background="@drawable/ripple">
|
||||
android:background="?attr/selectableItemBackground">
|
||||
|
||||
<common.widget.QkTextView
|
||||
android:id="@+id/timestamp"
|
||||
|
||||
@@ -22,7 +22,7 @@
|
||||
xmlns:tools="http://schemas.android.com/tools"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:background="@drawable/ripple">
|
||||
android:background="?attr/selectableItemBackground">
|
||||
|
||||
<common.widget.QkTextView
|
||||
android:id="@+id/timestamp"
|
||||
@@ -61,6 +61,7 @@
|
||||
android:layout_marginTop="2dp"
|
||||
android:autoLink="all"
|
||||
android:background="@drawable/message_only"
|
||||
android:backgroundTint="?attr/bubbleColor"
|
||||
android:gravity="start|center_vertical"
|
||||
android:minHeight="36dp"
|
||||
android:paddingBottom="8dp"
|
||||
@@ -82,8 +83,9 @@
|
||||
android:layout_height="36dp"
|
||||
android:layout_marginEnd="8dp"
|
||||
android:background="@drawable/circle"
|
||||
android:backgroundTint="?attr/bubbleColor"
|
||||
android:elevation="4dp"
|
||||
android:foreground="@drawable/ripple"
|
||||
android:foreground="?attr/selectableItemBackground"
|
||||
android:indeterminate="false"
|
||||
android:progressDrawable="@drawable/circular_progress_bar"
|
||||
app:layout_constraintBottom_toBottomOf="@id/body"
|
||||
|
||||
@@ -26,8 +26,7 @@
|
||||
<android.support.v7.widget.Toolbar
|
||||
android:id="@+id/toolbar"
|
||||
style="@style/Toolbar"
|
||||
app:layout_constraintTop_toTopOf="parent"
|
||||
tools:background="@color/white">
|
||||
app:layout_constraintTop_toTopOf="parent">
|
||||
|
||||
<common.widget.QkTextView
|
||||
android:id="@+id/toolbarTitle"
|
||||
@@ -87,11 +86,12 @@
|
||||
android:layout_height="wrap_content"
|
||||
app:title="@string/settings_ringtone_title" />
|
||||
|
||||
<common.widget.Separator
|
||||
<View
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="1dp"
|
||||
android:layout_marginBottom="8dp"
|
||||
android:layout_marginTop="8dp" />
|
||||
android:layout_marginTop="8dp"
|
||||
android:background="?android:attr/divider" />
|
||||
|
||||
<common.widget.QkTextView
|
||||
style="@style/PreferenceCategory"
|
||||
@@ -124,10 +124,11 @@
|
||||
android:background="@drawable/ab_shadow"
|
||||
app:layout_constraintTop_toBottomOf="@id/toolbar" />
|
||||
|
||||
<common.widget.Separator
|
||||
<View
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="1dp"
|
||||
android:layout_gravity="bottom"
|
||||
android:background="?android:attr/divider"
|
||||
app:layout_constraintBottom_toBottomOf="parent" />
|
||||
|
||||
</android.support.constraint.ConstraintLayout>
|
||||
@@ -21,6 +21,7 @@
|
||||
xmlns:tools="http://schemas.android.com/tools"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:background="?attr/selectableItemBackground"
|
||||
tools:parentTag="common.widget.PreferenceView">
|
||||
|
||||
<ImageView
|
||||
|
||||
@@ -25,12 +25,12 @@
|
||||
android:layout_gravity="center"
|
||||
android:layout_margin="24dp"
|
||||
android:background="@drawable/rounded_rectangle_4dp"
|
||||
android:backgroundTint="?attr/composeBackground"
|
||||
android:clipChildren="false"
|
||||
android:clipToPadding="false"
|
||||
android:elevation="8dp"
|
||||
android:maxHeight="320dp"
|
||||
android:maxWidth="320dp"
|
||||
tools:backgroundTint="@color/backgroundLight"
|
||||
tools:context="feature.qkreply.QkReplyActivity">
|
||||
|
||||
<android.support.v7.widget.RecyclerView
|
||||
@@ -53,21 +53,21 @@
|
||||
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/message"
|
||||
tools:backgroundTint="@color/backgroundLight" />
|
||||
app:layout_constraintTop_toTopOf="@id/message" />
|
||||
|
||||
<View
|
||||
android:id="@+id/composeBackground"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="0dp"
|
||||
android:background="@drawable/rounded_rectangle_bottom_4dp"
|
||||
android:backgroundTint="?attr/composeBackground"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toBottomOf="@id/composeBackgroundGradient"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
tools:backgroundTint="@color/backgroundLight" />
|
||||
app:layout_constraintTop_toBottomOf="@id/composeBackgroundGradient" />
|
||||
|
||||
<common.widget.QkEditText
|
||||
android:id="@+id/message"
|
||||
@@ -76,6 +76,7 @@
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1"
|
||||
android:background="@drawable/rounded_rectangle_shadow"
|
||||
android:backgroundTint="?attr/bubbleColor"
|
||||
android:backgroundTintMode="multiply"
|
||||
android:gravity="center_vertical"
|
||||
android:hint="@string/compose_hint"
|
||||
@@ -83,12 +84,12 @@
|
||||
android:maxLines="6"
|
||||
android:minHeight="44dp"
|
||||
android:padding="20dp"
|
||||
android:textColorHint="?android:attr/textColorTertiary"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintEnd_toEndOf="@id/messageBackground"
|
||||
app:layout_constraintEnd_toStartOf="@id/send"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toBottomOf="@id/messages"
|
||||
app:textColorHint="tertiary" />
|
||||
app:layout_constraintTop_toBottomOf="@id/messages" />
|
||||
|
||||
<common.widget.QkTextView
|
||||
android:id="@+id/counter"
|
||||
@@ -122,6 +123,7 @@
|
||||
android:id="@+id/toolbar"
|
||||
style="@style/Toolbar"
|
||||
android:background="@drawable/rounded_rectangle_top_4dp"
|
||||
android:backgroundTint="?attr/colorPrimary"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent">
|
||||
|
||||
@@ -21,8 +21,7 @@
|
||||
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"
|
||||
tools:background="@color/white">
|
||||
android:layout_height="match_parent">
|
||||
|
||||
<android.support.design.widget.AppBarLayout
|
||||
android:layout_width="match_parent"
|
||||
@@ -96,6 +95,7 @@
|
||||
style="@style/TextButton"
|
||||
android:layout_marginTop="8dp"
|
||||
android:background="@drawable/rounded_rectangle_outline_2dp"
|
||||
android:backgroundTint="?android:attr/divider"
|
||||
android:text="@string/qksms_plus_upgrade_donate"
|
||||
app:textColor="primary"
|
||||
tools:backgroundTint="@color/separatorLight" />
|
||||
@@ -110,6 +110,7 @@
|
||||
android:layout_marginEnd="24dp"
|
||||
android:layout_marginStart="24dp"
|
||||
android:background="@drawable/rounded_rectangle_2dp"
|
||||
android:backgroundTint="?android:attr/divider"
|
||||
android:padding="16dp"
|
||||
tools:backgroundTint="@color/separatorLight">
|
||||
|
||||
@@ -173,10 +174,11 @@
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
<common.widget.Separator
|
||||
<View
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="1dp"
|
||||
android:layout_marginBottom="8dp" />
|
||||
android:layout_marginBottom="8dp"
|
||||
android:background="?android:attr/divider" />
|
||||
|
||||
<common.widget.PreferenceView
|
||||
android:layout_width="match_parent"
|
||||
|
||||
@@ -21,7 +21,7 @@
|
||||
xmlns:tools="http://schemas.android.com/tools"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:background="@drawable/ripple"
|
||||
android:background="?attr/selectableItemBackground"
|
||||
android:gravity="center_vertical"
|
||||
android:orientation="horizontal">
|
||||
|
||||
@@ -32,11 +32,12 @@
|
||||
android:visibility="gone"
|
||||
app:constraint_referenced_ids="resultsSeparator, resultsTitle" />
|
||||
|
||||
<common.widget.Separator
|
||||
<View
|
||||
android:id="@+id/resultsSeparator"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="1dp"
|
||||
android:layout_marginTop="12dp"
|
||||
android:background="?android:attr/divider"
|
||||
app:layout_constraintTop_toTopOf="parent" />
|
||||
|
||||
<common.widget.QkTextView
|
||||
|
||||
@@ -29,8 +29,7 @@
|
||||
style="@style/Toolbar"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent"
|
||||
tools:background="@color/white">
|
||||
app:layout_constraintTop_toTopOf="parent">
|
||||
|
||||
<common.widget.QkTextView
|
||||
android:id="@+id/toolbarTitle"
|
||||
@@ -115,11 +114,12 @@
|
||||
app:title="@string/settings_system_font_title"
|
||||
app:widget="@layout/settings_switch_widget" />
|
||||
|
||||
<common.widget.Separator
|
||||
<View
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="1dp"
|
||||
android:layout_marginBottom="8dp"
|
||||
android:layout_marginTop="8dp" />
|
||||
android:layout_marginTop="8dp"
|
||||
android:background="?android:attr/divider" />
|
||||
|
||||
<common.widget.QkTextView
|
||||
style="@style/PreferenceCategory"
|
||||
@@ -152,8 +152,8 @@
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
app:icon="@drawable/ic_av_timer_black_24dp"
|
||||
tools:summary="No delay"
|
||||
app:title="@string/settings_delayed_title" />
|
||||
app:title="@string/settings_delayed_title"
|
||||
tools:summary="No delay" />
|
||||
|
||||
<common.widget.PreferenceView
|
||||
android:id="@+id/delivery"
|
||||
@@ -182,11 +182,12 @@
|
||||
app:title="@string/settings_mms_size_title"
|
||||
tools:summary="100KB" />
|
||||
|
||||
<common.widget.Separator
|
||||
<View
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="1dp"
|
||||
android:layout_marginBottom="8dp"
|
||||
android:layout_marginTop="8dp" />
|
||||
android:layout_marginTop="8dp"
|
||||
android:background="?android:attr/divider" />
|
||||
|
||||
<common.widget.PreferenceView
|
||||
android:id="@+id/sync"
|
||||
@@ -216,9 +217,10 @@
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toBottomOf="@id/toolbar" />
|
||||
|
||||
<common.widget.Separator
|
||||
<View
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="1dp"
|
||||
android:background="?android:attr/divider"
|
||||
app:layout_constraintBottom_toBottomOf="parent" />
|
||||
|
||||
</android.support.constraint.ConstraintLayout>
|
||||
@@ -22,7 +22,7 @@
|
||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="match_parent"
|
||||
android:background="@drawable/ripple"
|
||||
android:background="?attr/selectableItemBackground"
|
||||
android:backgroundTint="@android:color/transparent"
|
||||
android:gravity="center"
|
||||
android:paddingEnd="12dp"
|
||||
|
||||
@@ -28,8 +28,9 @@
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content" />
|
||||
|
||||
<common.widget.Separator
|
||||
<View
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="1dp" />
|
||||
android:layout_height="1dp"
|
||||
android:background="?android:attr/divider" />
|
||||
|
||||
</LinearLayout>
|
||||
@@ -30,6 +30,7 @@
|
||||
android:id="@+id/tabs"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="40dp"
|
||||
android:background="?attr/colorPrimary"
|
||||
android:orientation="horizontal"
|
||||
android:paddingEnd="12dp"
|
||||
android:paddingStart="12dp" />
|
||||
@@ -62,10 +63,11 @@
|
||||
android:layout_height="8dp"
|
||||
android:background="@drawable/ab_shadow" />
|
||||
|
||||
<common.widget.Separator
|
||||
<View
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="1dp"
|
||||
android:layout_gravity="bottom" />
|
||||
android:layout_gravity="bottom"
|
||||
android:background="?android:attr/divider" />
|
||||
|
||||
</FrameLayout>
|
||||
|
||||
|
||||
@@ -4,8 +4,7 @@
|
||||
xmlns:tools="http://schemas.android.com/tools"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:animateLayoutChanges="true"
|
||||
tools:background="@color/white">
|
||||
android:animateLayoutChanges="true">
|
||||
|
||||
<feature.themepicker.HSVPickerView
|
||||
android:id="@+id/picker"
|
||||
@@ -30,11 +29,12 @@
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toBottomOf="@id/picker" />
|
||||
|
||||
<common.widget.Separator
|
||||
<View
|
||||
android:id="@+id/hexSeparator"
|
||||
android:layout_width="1dp"
|
||||
android:layout_height="0dp"
|
||||
android:layout_marginStart="16dp"
|
||||
android:background="?android:attr/divider"
|
||||
app:layout_constraintBottom_toBottomOf="@id/hexLabel"
|
||||
app:layout_constraintStart_toEndOf="@id/hexLabel"
|
||||
app:layout_constraintTop_toTopOf="@id/hexLabel" />
|
||||
@@ -76,22 +76,23 @@
|
||||
android:layout_height="wrap_content"
|
||||
app:constraint_referenced_ids="applyDivider, clear, apply" />
|
||||
|
||||
<common.widget.Separator
|
||||
<View
|
||||
android:id="@+id/applyDivider"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="1dp"
|
||||
android:background="?android:attr/divider"
|
||||
app:layout_constraintBottom_toTopOf="@id/clear" />
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/clear"
|
||||
android:layout_width="56dp"
|
||||
android:layout_height="56dp"
|
||||
android:background="@drawable/ripple"
|
||||
android:background="?attr/selectableItemBackground"
|
||||
android:padding="16dp"
|
||||
android:src="@drawable/ic_cancel_black_24dp"
|
||||
android:tint="?android:attr/textColorSecondary"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
tools:tint="@color/textSecondary" />
|
||||
app:layout_constraintStart_toStartOf="parent" />
|
||||
|
||||
<common.widget.QkTextView
|
||||
android:id="@+id/apply"
|
||||
|
||||
@@ -20,8 +20,7 @@
|
||||
<android.support.v7.widget.Toolbar android:id="@+id/toolbar"
|
||||
style="@style/Toolbar"
|
||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:tools="http://schemas.android.com/tools"
|
||||
tools:background="@color/white">
|
||||
xmlns:tools="http://schemas.android.com/tools">
|
||||
|
||||
<common.widget.QkTextView
|
||||
android:id="@+id/toolbarTitle"
|
||||
|
||||
@@ -55,7 +55,7 @@
|
||||
android:layout_height="24dp"
|
||||
android:layout_gravity="center"
|
||||
android:src="@drawable/ic_person_black_24dp"
|
||||
tools:tint="@color/white" />
|
||||
tools:tint="@color/textPrimaryDark" />
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/photo"
|
||||
|
||||
@@ -29,6 +29,7 @@
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:gravity="center"
|
||||
android:textColor="?android:attr/textColorSecondary"
|
||||
android:textSize="14sp"
|
||||
tools:text="Loading..." />
|
||||
|
||||
|
||||
@@ -44,11 +44,6 @@
|
||||
<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" />
|
||||
<enum name="tertiary" value="2" />
|
||||
</attr>
|
||||
</declare-styleable>
|
||||
|
||||
<declare-styleable name="PreferenceView">
|
||||
|
||||
@@ -34,9 +34,6 @@
|
||||
<color name="backgroundLight">#ECEFF1</color>
|
||||
<color name="backgroundDark">#192025</color>
|
||||
|
||||
<color name="fieldLight">#0C000000</color>
|
||||
<color name="fieldDark">#0CFFFFFF</color>
|
||||
|
||||
<color name="textPrimary">#49555F</color>
|
||||
<color name="textSecondary">#70808D</color>
|
||||
<color name="textTertiary">#B7B9C0</color>
|
||||
|
||||
@@ -50,7 +50,7 @@
|
||||
|
||||
<!-- This needs to be set so that we can tint the toolbar and not change the background
|
||||
resource. This is mainly so that QkReplyActivity can call setClipToOutline -->
|
||||
<item name="android:background">@color/black</item>
|
||||
<item name="android:background">?attr/colorPrimary</item>
|
||||
<item name="android:gravity">center_vertical</item>
|
||||
</style>
|
||||
|
||||
@@ -88,7 +88,7 @@
|
||||
<style name="DrawerRow">
|
||||
<item name="android:layout_height">48dp</item>
|
||||
<item name="android:layout_width">match_parent</item>
|
||||
<item name="android:background">@drawable/ripple</item>
|
||||
<item name="android:background">?attr/selectableItemBackground</item>
|
||||
<item name="android:gravity">center_vertical</item>
|
||||
<item name="android:paddingStart">16dp</item>
|
||||
<item name="android:paddingEnd">16dp</item>
|
||||
@@ -110,19 +110,4 @@
|
||||
<item name="android:layout_marginEnd">32dp</item>
|
||||
</style>
|
||||
|
||||
<style name="PopupThemeDark" parent="ThemeOverlay.AppCompat">
|
||||
<item name="android:colorBackground">@color/backgroundDark</item>
|
||||
<item name="android:textColor">@color/textPrimaryDark</item>
|
||||
</style>
|
||||
|
||||
<style name="PopupThemeBlack" parent="ThemeOverlay.AppCompat">
|
||||
<item name="android:colorBackground">@color/black</item>
|
||||
<item name="android:textColor">@color/textPrimaryDark</item>
|
||||
</style>
|
||||
|
||||
<style name="PopupThemeLight" parent="ThemeOverlay.AppCompat.Light">
|
||||
<item name="android:colorBackground">@color/white</item>
|
||||
<item name="android:textColor">@color/textPrimary</item>
|
||||
</style>
|
||||
|
||||
</resources>
|
||||
|
||||
@@ -1,54 +1,106 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<resources>
|
||||
|
||||
<attr name="bubbleColor" format="reference" />
|
||||
<attr name="composeBackground" format="reference" />
|
||||
|
||||
<style name="AppThemeLight" parent="AppBaseThemeLight" />
|
||||
|
||||
<style name="AppBaseThemeLight" parent="Theme.AppCompat.Light.NoActionBar">
|
||||
<!-- Light theme -->
|
||||
<style name="AppBaseThemeLight" parent="Theme.AppCompat.Light.NoActionBar">item>
|
||||
<item name="android:divider">@color/separatorLight</item>
|
||||
<item name="android:statusBarColor">@color/black</item>
|
||||
<item name="android:windowBackground">@color/backgroundLight</item>
|
||||
<item name="android:textColorPrimary">@color/textPrimary</item>
|
||||
<item name="android:textColorSecondary">@color/textSecondary</item>
|
||||
<item name="android:textColorTertiary">@color/textTertiary</item>
|
||||
<item name="android:windowBackground">@color/white</item>
|
||||
<item name="android:windowContentTransitions">true</item>
|
||||
<item name="actionBarPopupTheme">@style/PopupThemeLight</item>
|
||||
<item name="colorPrimary">@color/white</item>
|
||||
<item name="bubbleColor">@color/bubbleLight</item>
|
||||
<item name="colorPrimary">@color/toolbarLight</item>
|
||||
<item name="colorPrimaryDark">@color/statusBarLight</item>
|
||||
<item name="composeBackground">@color/backgroundLight</item>
|
||||
<item name="selectableItemBackground">@drawable/ripple</item>
|
||||
<item name="windowActionBar">false</item>
|
||||
</style>
|
||||
|
||||
<style name="AppThemeLightDialog" parent="Theme.AppCompat.Light.Dialog">
|
||||
<item name="android:textColorPrimary">@color/textPrimary</item>
|
||||
<item name="android:textColorSecondary">@color/textSecondary</item>
|
||||
<item name="android:textColorTertiary">@color/textTertiary</item>
|
||||
<item name="android:windowBackground">@android:color/transparent</item>
|
||||
<item name="actionBarPopupTheme">@style/PopupThemeLight</item>
|
||||
<item name="bubbleColor">@color/bubbleLight</item>
|
||||
<item name="colorPrimary">@color/toolbarLight</item>
|
||||
<item name="colorPrimaryDark">@color/statusBarLight</item>
|
||||
<item name="composeBackground">@color/backgroundLight</item>
|
||||
<item name="selectableItemBackground">@drawable/ripple</item>
|
||||
<item name="windowActionBar">false</item>
|
||||
</style>
|
||||
|
||||
<style name="PopupThemeLight" parent="ThemeOverlay.AppCompat.Light">
|
||||
<item name="android:colorBackground">@color/white</item>
|
||||
<item name="android:textColor">@color/textPrimary</item>
|
||||
</style>
|
||||
|
||||
<!-- Dark theme -->
|
||||
<style name="AppThemeDark" parent="Theme.AppCompat.NoActionBar">
|
||||
<item name="android:divider">@color/separatorDark</item>
|
||||
<item name="android:navigationBarColor">@color/backgroundDark</item>
|
||||
<item name="android:statusBarColor">@color/statusBarDark</item>
|
||||
<item name="android:textColorPrimary">@color/textPrimaryDark</item>
|
||||
<item name="android:textColorSecondary">@color/textSecondaryDark</item>
|
||||
<item name="android:textColorTertiary">@color/textTertiaryDark</item>
|
||||
<item name="android:windowBackground">@color/backgroundDark</item>
|
||||
<item name="android:windowContentTransitions">true</item>
|
||||
<item name="actionBarPopupTheme">@style/PopupThemeDark</item>
|
||||
<item name="colorPrimary">@color/backgroundDark</item>
|
||||
<item name="bubbleColor">@color/bubbleDark</item>
|
||||
<item name="colorPrimary">@color/toolbarDark</item>
|
||||
<item name="colorPrimaryDark">@color/statusBarDark</item>
|
||||
<item name="composeBackground">@color/backgroundDark</item>
|
||||
<item name="selectableItemBackground">@drawable/ripple_dark</item>
|
||||
<item name="windowActionBar">false</item>
|
||||
</style>
|
||||
|
||||
<style name="AppThemeDarkDialog" parent="Theme.AppCompat.Dialog">
|
||||
<item name="android:textColorPrimary">@color/textPrimaryDark</item>
|
||||
<item name="android:textColorSecondary">@color/textSecondaryDark</item>
|
||||
<item name="android:textColorTertiary">@color/textTertiaryDark</item>
|
||||
<item name="android:windowBackground">@android:color/transparent</item>
|
||||
<item name="actionBarPopupTheme">@style/PopupThemeDark</item>
|
||||
<item name="bubbleColor">@color/bubbleDark</item>
|
||||
<item name="colorPrimary">@color/toolbarDark</item>
|
||||
<item name="colorPrimaryDark">@color/statusBarDark</item>
|
||||
<item name="composeBackground">@color/backgroundDark</item>
|
||||
<item name="selectableItemBackground">@drawable/ripple_dark</item>
|
||||
<item name="windowActionBar">false</item>
|
||||
</style>
|
||||
|
||||
<style name="AppThemeBlack" parent="Theme.AppCompat.NoActionBar">
|
||||
<style name="PopupThemeDark" parent="ThemeOverlay.AppCompat">
|
||||
<item name="android:colorBackground">@color/backgroundDark</item>
|
||||
<item name="android:textColor">@color/textPrimaryDark</item>
|
||||
</style>
|
||||
|
||||
<!-- Black theme -->
|
||||
<style name="AppThemeBlack" parent="AppThemeDark">
|
||||
<item name="android:navigationBarColor">@color/black</item>
|
||||
<item name="android:statusBarColor">@color/black</item>
|
||||
<item name="android:windowBackground">@color/black</item>
|
||||
<item name="android:windowContentTransitions">true</item>
|
||||
<item name="actionBarPopupTheme">@style/PopupThemeDark</item>
|
||||
<item name="colorPrimary">@color/black</item>
|
||||
<item name="colorPrimaryDark">@color/black</item>
|
||||
<item name="windowActionBar">false</item>
|
||||
<item name="composeBackground">@color/black</item>
|
||||
</style>
|
||||
|
||||
<style name="AppThemeBlackDialog" parent="Theme.AppCompat.Dialog">
|
||||
<item name="android:windowBackground">@android:color/transparent</item>
|
||||
<style name="AppThemeBlackDialog" parent="AppThemeDarkDialog">
|
||||
<item name="actionBarPopupTheme">@style/PopupThemeBlack</item>
|
||||
<item name="windowActionBar">false</item>
|
||||
<item name="colorPrimary">@color/black</item>
|
||||
<item name="colorPrimaryDark">@color/black</item>
|
||||
<item name="composeBackground">@color/black</item>
|
||||
</style>
|
||||
|
||||
<style name="PopupThemeBlack" parent="@style/PopupThemeDark">
|
||||
<item name="android:colorBackground">@color/black</item>
|
||||
<item name="android:textColor">@color/textPrimaryDark</item>
|
||||
</style>
|
||||
|
||||
</resources>
|
||||
Reference in New Issue
Block a user