forked from upstream-mirrors/quik
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:
@@ -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