diff --git a/qksms/src/main/java/com/moez/QKSMS/common/di/AppComponent.kt b/qksms/src/main/java/com/moez/QKSMS/common/di/AppComponent.kt index ddfb1ebf..b2403d9b 100644 --- a/qksms/src/main/java/com/moez/QKSMS/common/di/AppComponent.kt +++ b/qksms/src/main/java/com/moez/QKSMS/common/di/AppComponent.kt @@ -5,13 +5,14 @@ import com.moez.QKSMS.presentation.compose.ComposeActivity import com.moez.QKSMS.presentation.compose.ComposeViewModel import com.moez.QKSMS.presentation.compose.DetailedChipView import com.moez.QKSMS.presentation.compose.MessagesAdapter -import com.moez.QKSMS.presentation.main.ConversationsAdapter import com.moez.QKSMS.presentation.main.MainActivity import com.moez.QKSMS.presentation.main.MainViewModel import com.moez.QKSMS.presentation.settings.SettingsActivity import com.moez.QKSMS.presentation.settings.SettingsViewModel import com.moez.QKSMS.presentation.view.AvatarView +import com.moez.QKSMS.presentation.view.QkEditText import com.moez.QKSMS.presentation.view.QkSwitch +import com.moez.QKSMS.presentation.view.QkTextView import com.moez.QKSMS.receiver.* import dagger.Component import javax.inject.Singleton @@ -35,7 +36,9 @@ interface AppComponent { fun inject(receiver: RemoteMessagingReceiver) fun inject(view: AvatarView) + fun inject(view: QkEditText) fun inject(view: QkSwitch) + fun inject(view: QkTextView) fun inject(viewModel: MainViewModel) fun inject(viewModel: ComposeViewModel) diff --git a/qksms/src/main/java/com/moez/QKSMS/common/util/Colors.kt b/qksms/src/main/java/com/moez/QKSMS/common/util/Colors.kt index d985c5a2..5c1e85e5 100644 --- a/qksms/src/main/java/com/moez/QKSMS/common/util/Colors.kt +++ b/qksms/src/main/java/com/moez/QKSMS/common/util/Colors.kt @@ -26,15 +26,30 @@ class Colors @Inject constructor(context: Context, prefs: Preferences) { .map { res -> context.resources.getColor(res) } val textPrimary: Observable = prefs.dark.asObservable() - .map { dark -> if (dark) R.color.textPrimaryLight else R.color.textPrimary } + .map { dark -> if (dark) R.color.textPrimaryDark else R.color.textPrimary } .map { res -> context.resources.getColor(res) } val textSecondary: Observable = prefs.dark.asObservable() - .map { dark -> if (dark) R.color.textSecondaryLight else R.color.textSecondary } + .map { dark -> if (dark) R.color.textSecondaryDark else R.color.textSecondary } .map { res -> context.resources.getColor(res) } val textTertiary: Observable = prefs.dark.asObservable() - .map { dark -> if (dark) R.color.textTertiaryLight else R.color.textTertiary } + .map { dark -> if (dark) R.color.textTertiaryDark else R.color.textTertiary } + .map { res -> context.resources.getColor(res) } + + // TODO make this result depend on the theme color + val textPrimaryOnTheme: Observable = prefs.theme.asObservable() + .map { theme -> R.color.textPrimaryDark } + .map { res -> context.resources.getColor(res) } + + // TODO make this result depend on the theme color + val textSecondaryOnTheme: Observable = prefs.dark.asObservable() + .map { theme -> R.color.textSecondaryDark } + .map { res -> context.resources.getColor(res) } + + // TODO make this result depend on the theme color + val textTertiaryOnTheme: Observable = prefs.dark.asObservable() + .map { theme -> R.color.textTertiaryDark } .map { res -> context.resources.getColor(res) } val bubble: Observable = prefs.dark.asObservable() @@ -42,19 +57,19 @@ class Colors @Inject constructor(context: Context, prefs: Preferences) { .map { res -> context.resources.getColor(res) } val switchThumbEnabled: Observable = prefs.dark.asObservable() - .map { dark -> if (dark) R.color.switch_thumb_enabled_dark else R.color.switch_thumb_enabled_light } + .map { dark -> if (dark) R.color.switchThumbEnabledDark else R.color.switchThumbEnabledLight } .map { res -> context.resources.getColor(res) } val switchThumbDisabled: Observable = prefs.dark.asObservable() - .map { dark -> if (dark) R.color.switch_thumb_disabled_dark else R.color.switch_thumb_disabled_light } + .map { dark -> if (dark) R.color.switchThumbDisabledDark else R.color.switchThumbDisabledLight } .map { res -> context.resources.getColor(res) } val switchTrackEnabled: Observable = prefs.dark.asObservable() - .map { dark -> if (dark) R.color.switch_track_enabled_dark else R.color.switch_track_enabled_light } + .map { dark -> if (dark) R.color.switchTrackEnabledDark else R.color.switchTrackEnabledLight } .map { res -> context.resources.getColor(res) } val switchTrackDisabled: Observable = prefs.dark.asObservable() - .map { dark -> if (dark) R.color.switch_track_disabled_dark else R.color.switch_track_disabled_light } + .map { dark -> if (dark) R.color.switchTrackDisabledDark else R.color.switchTrackDisabledLight } .map { res -> context.resources.getColor(res) } } \ No newline at end of file diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/compose/ChipsAdapter.kt b/qksms/src/main/java/com/moez/QKSMS/presentation/compose/ChipsAdapter.kt index 137b71df..dbe0e697 100755 --- a/qksms/src/main/java/com/moez/QKSMS/presentation/compose/ChipsAdapter.kt +++ b/qksms/src/main/java/com/moez/QKSMS/presentation/compose/ChipsAdapter.kt @@ -1,12 +1,11 @@ package com.moez.QKSMS.presentation.compose import android.content.Context -import android.support.v4.content.ContextCompat -import android.support.v7.widget.AppCompatEditText import android.support.v7.widget.RecyclerView import android.text.InputType import android.view.KeyEvent import android.view.LayoutInflater +import android.view.View import android.view.ViewGroup import android.view.inputmethod.EditorInfo import android.widget.EditText @@ -34,7 +33,7 @@ class ChipsAdapter( } private val hint: String = context.getString(R.string.title_compose) - private val editText: EditText = AppCompatEditText(context) + private val editText = View.inflate(context, R.layout.chip_input_list_item, null) as EditText val chipDeleted: PublishSubject = PublishSubject.create() val textChanges = editText.textChanges() @@ -48,8 +47,6 @@ class ChipsAdapter( editText.hint = hint editText.textSize = 16f - editText.setTextColor(ContextCompat.getColor(context, R.color.textPrimary)) - editText.setHintTextColor(ContextCompat.getColor(context, R.color.textTertiary)) editText.setBackgroundResource(android.R.color.transparent) editText.inputType = InputType.TYPE_TEXT_VARIATION_FILTER or InputType.TYPE_TEXT_FLAG_NO_SUGGESTIONS editText.imeOptions = EditorInfo.IME_FLAG_NO_EXTRACT_UI diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/compose/ComposeActivity.kt b/qksms/src/main/java/com/moez/QKSMS/presentation/compose/ComposeActivity.kt index 6f82d99c..78dc021e 100644 --- a/qksms/src/main/java/com/moez/QKSMS/presentation/compose/ComposeActivity.kt +++ b/qksms/src/main/java/com/moez/QKSMS/presentation/compose/ComposeActivity.kt @@ -81,7 +81,9 @@ class ComposeActivity : QkActivity(), ComposeView { .combineLatest(colors.theme, colors.textTertiary, { theme, textTertiary -> ColorStateList(states, intArrayOf(theme, textTertiary)) }) - .subscribe { tintList -> send.imageTintList = tintList } + .doOnNext { tintList -> attach.imageTintList = tintList } + .doOnNext { tintList -> send.imageTintList = tintList } + .subscribe() disposables += colors.background .subscribe { color -> composeBar.setBackgroundColor(color) } diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/main/MainActivity.kt b/qksms/src/main/java/com/moez/QKSMS/presentation/main/MainActivity.kt index 8a3389de..46a6c150 100644 --- a/qksms/src/main/java/com/moez/QKSMS/presentation/main/MainActivity.kt +++ b/qksms/src/main/java/com/moez/QKSMS/presentation/main/MainActivity.kt @@ -78,7 +78,7 @@ class MainActivity : QkActivity(), MainView { val rowBackground = { StateListDrawable().apply { - addState(intArrayOf(android.R.attr.state_selected), getDrawable(R.color.row_selected)) + addState(intArrayOf(android.R.attr.state_selected), getDrawable(R.color.rowSelected)) addState(intArrayOf(-android.R.attr.state_selected), getDrawable(R.drawable.ripple)) mutate() } @@ -96,6 +96,7 @@ class MainActivity : QkActivity(), MainView { .doOnNext { tintList -> archivedIcon.imageTintList = tintList } .doOnNext { tintList -> scheduledIcon.imageTintList = tintList } .doOnNext { tintList -> blockedIcon.imageTintList = tintList } + .doOnNext { tintList -> settingsIcon.imageTintList = tintList } .subscribe() inbox.background = rowBackground() diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/view/QkEditText.kt b/qksms/src/main/java/com/moez/QKSMS/presentation/view/QkEditText.kt new file mode 100644 index 00000000..4950a5bc --- /dev/null +++ b/qksms/src/main/java/com/moez/QKSMS/presentation/view/QkEditText.kt @@ -0,0 +1,63 @@ +package com.moez.QKSMS.presentation.view + +import android.content.Context +import android.util.AttributeSet +import android.widget.EditText +import com.moez.QKSMS.R +import com.moez.QKSMS.common.di.appComponent +import com.moez.QKSMS.common.util.Colors +import io.reactivex.Observable +import io.reactivex.disposables.CompositeDisposable +import io.reactivex.rxkotlin.plusAssign +import javax.inject.Inject + +open class QkEditText @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null) : EditText(context, attrs) { + + @Inject lateinit var colors: Colors + + private val disposables = CompositeDisposable() + private var textColorObservable: Observable? = null + private var textColorHintObservable: Observable? = null + + init { + appComponent.inject(this) + + context.obtainStyledAttributes(attrs, R.styleable.QkEditText)?.run { + textColorObservable = when (getInt(R.styleable.QkEditText_textColor, -1)) { + 0 -> colors.textPrimary + 1 -> colors.textSecondary + 2 -> colors.textTertiary + 3 -> colors.textPrimaryOnTheme + 4 -> colors.textSecondaryOnTheme + 5 -> colors.textTertiaryOnTheme + else -> null + } + textColorHintObservable = when (getInt(R.styleable.QkEditText_textColorHint, -1)) { + 0 -> colors.textPrimary + 1 -> colors.textSecondary + 2 -> colors.textTertiary + else -> null + } + recycle() + } + } + + override fun onAttachedToWindow() { + super.onAttachedToWindow() + + textColorObservable?.let { observable -> + disposables += observable.subscribe { color -> setTextColor(color) } + } + + textColorHintObservable?.let { observable -> + disposables += observable.subscribe { color -> setHintTextColor(color) } + } + } + + override fun onDetachedFromWindow() { + super.onDetachedFromWindow() + + disposables.dispose() + } + +} \ No newline at end of file diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/view/QkTextView.kt b/qksms/src/main/java/com/moez/QKSMS/presentation/view/QkTextView.kt new file mode 100644 index 00000000..cb9206a6 --- /dev/null +++ b/qksms/src/main/java/com/moez/QKSMS/presentation/view/QkTextView.kt @@ -0,0 +1,52 @@ +package com.moez.QKSMS.presentation.view + +import android.content.Context +import android.util.AttributeSet +import android.widget.TextView +import com.moez.QKSMS.R +import com.moez.QKSMS.common.di.appComponent +import com.moez.QKSMS.common.util.Colors +import io.reactivex.Observable +import io.reactivex.disposables.CompositeDisposable +import io.reactivex.rxkotlin.plusAssign +import javax.inject.Inject + +open class QkTextView @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null) : TextView(context, attrs) { + + @Inject lateinit var colors: Colors + + private val disposables = CompositeDisposable() + private var textColorObservable: Observable? = null + + init { + appComponent.inject(this) + + context.obtainStyledAttributes(attrs, R.styleable.QkTextView)?.run { + textColorObservable = when (getInt(R.styleable.QkTextView_textColor, -1)) { + 0 -> colors.textPrimary + 1 -> colors.textSecondary + 2 -> colors.textTertiary + 3 -> colors.textPrimaryOnTheme + 4 -> colors.textSecondaryOnTheme + 5 -> colors.textTertiaryOnTheme + else -> null + } + recycle() + } + } + + override fun onAttachedToWindow() { + super.onAttachedToWindow() + + textColorObservable?.let { observable -> + disposables += observable.subscribe { color -> setTextColor(color) } + } + } + + override fun onDetachedFromWindow() { + super.onDetachedFromWindow() + + disposables.dispose() + } + +} \ No newline at end of file diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/view/TightTextView.kt b/qksms/src/main/java/com/moez/QKSMS/presentation/view/TightTextView.kt index 7bc1491f..e5abd5f7 100644 --- a/qksms/src/main/java/com/moez/QKSMS/presentation/view/TightTextView.kt +++ b/qksms/src/main/java/com/moez/QKSMS/presentation/view/TightTextView.kt @@ -2,9 +2,8 @@ package com.moez.QKSMS.presentation.view import android.content.Context import android.util.AttributeSet -import android.widget.TextView -class TightTextView @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null) : TextView(context, attrs) { +class TightTextView @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null) : QkTextView(context, attrs) { override fun onMeasure(widthMeasureSpec: Int, heightMeasureSpec: Int) { super.onMeasure(widthMeasureSpec, heightMeasureSpec) diff --git a/qksms/src/main/res/drawable/chip_background.xml b/qksms/src/main/res/drawable/chip_background.xml index 3e19037a..3dbb5703 100755 --- a/qksms/src/main/res/drawable/chip_background.xml +++ b/qksms/src/main/res/drawable/chip_background.xml @@ -10,7 +10,7 @@ - + diff --git a/qksms/src/main/res/drawable/field_background.xml b/qksms/src/main/res/drawable/field_background.xml index 25c2cd3b..78ca7473 100644 --- a/qksms/src/main/res/drawable/field_background.xml +++ b/qksms/src/main/res/drawable/field_background.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/qksms/src/main/res/layout/avatar_view.xml b/qksms/src/main/res/layout/avatar_view.xml index dacb84f9..cfb3ac31 100644 --- a/qksms/src/main/res/layout/avatar_view.xml +++ b/qksms/src/main/res/layout/avatar_view.xml @@ -1,21 +1,22 @@ - + \ No newline at end of file diff --git a/qksms/src/main/res/layout/compose_activity.xml b/qksms/src/main/res/layout/compose_activity.xml index e2d26098..5800e3ee 100644 --- a/qksms/src/main/res/layout/compose_activity.xml +++ b/qksms/src/main/res/layout/compose_activity.xml @@ -45,7 +45,7 @@ + android:background="@color/listSeparator" /> + android:src="@drawable/ic_add_circle_black_24dp" /> - + android:src="@drawable/ic_send_black_24dp" /> diff --git a/qksms/src/main/res/layout/contact_chip.xml b/qksms/src/main/res/layout/contact_chip.xml index a51f018d..9c4b7910 100755 --- a/qksms/src/main/res/layout/contact_chip.xml +++ b/qksms/src/main/res/layout/contact_chip.xml @@ -1,6 +1,7 @@ @@ -18,16 +19,16 @@ android:layout_width="36dp" android:layout_height="36dp" /> - diff --git a/qksms/src/main/res/layout/contact_chip_detailed.xml b/qksms/src/main/res/layout/contact_chip_detailed.xml index 622c9131..8d7994b6 100755 --- a/qksms/src/main/res/layout/contact_chip_detailed.xml +++ b/qksms/src/main/res/layout/contact_chip_detailed.xml @@ -1,5 +1,6 @@ @@ -27,27 +27,25 @@ android:layout_weight="1" android:orientation="vertical"> - - diff --git a/qksms/src/main/res/layout/contact_list_item.xml b/qksms/src/main/res/layout/contact_list_item.xml index 8924e8bf..3ecb7f33 100644 --- a/qksms/src/main/res/layout/contact_list_item.xml +++ b/qksms/src/main/res/layout/contact_list_item.xml @@ -21,18 +21,18 @@ android:layout_height="wrap_content" android:orientation="vertical"> - - diff --git a/qksms/src/main/res/layout/conversation_list_item.xml b/qksms/src/main/res/layout/conversation_list_item.xml index 80193733..02cc0372 100644 --- a/qksms/src/main/res/layout/conversation_list_item.xml +++ b/qksms/src/main/res/layout/conversation_list_item.xml @@ -27,7 +27,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content"> - - - - - - diff --git a/qksms/src/main/res/layout/drawer_view.xml b/qksms/src/main/res/layout/drawer_view.xml index c0ea70aa..00162c2f 100644 --- a/qksms/src/main/res/layout/drawer_view.xml +++ b/qksms/src/main/res/layout/drawer_view.xml @@ -15,7 +15,7 @@ style="@style/DrawerIcon" android:src="@drawable/ic_inbox_black_24dp" /> - @@ -30,7 +30,7 @@ style="@style/DrawerIcon" android:src="@drawable/ic_folder_black_24dp" /> - @@ -45,7 +45,7 @@ style="@style/DrawerIcon" android:src="@drawable/ic_event_black_24dp" /> - @@ -60,7 +60,7 @@ style="@style/DrawerIcon" android:src="@drawable/ic_block_black_24dp" /> - @@ -71,17 +71,18 @@ android:layout_height="1dp" android:layout_marginBottom="8dp" android:layout_marginTop="8dp" - android:background="@color/list_separator" /> + android:background="@color/listSeparator" /> - diff --git a/qksms/src/main/res/layout/message_list_item_in.xml b/qksms/src/main/res/layout/message_list_item_in.xml index 86366386..d6b48886 100644 --- a/qksms/src/main/res/layout/message_list_item_in.xml +++ b/qksms/src/main/res/layout/message_list_item_in.xml @@ -3,11 +3,12 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="wrap_content" + xmlns:app="http://schemas.android.com/apk/res-auto" android:background="@drawable/ripple" android:orientation="vertical" android:paddingBottom="16dp"> - - - @@ -52,14 +52,14 @@ - \ No newline at end of file diff --git a/qksms/src/main/res/layout/preference_view.xml b/qksms/src/main/res/layout/preference_view.xml index 98b3a95f..69dc109e 100644 --- a/qksms/src/main/res/layout/preference_view.xml +++ b/qksms/src/main/res/layout/preference_view.xml @@ -13,14 +13,14 @@ android:orientation="vertical" android:padding="16dp"> - - - \ No newline at end of file diff --git a/qksms/src/main/res/layout/toolbar_chips.xml b/qksms/src/main/res/layout/toolbar_chips.xml index 63d10a6d..08696681 100644 --- a/qksms/src/main/res/layout/toolbar_chips.xml +++ b/qksms/src/main/res/layout/toolbar_chips.xml @@ -1,14 +1,14 @@ - - \ No newline at end of file diff --git a/qksms/src/main/res/values/attrs.xml b/qksms/src/main/res/values/attrs.xml index d464e3b5..13209cb3 100644 --- a/qksms/src/main/res/values/attrs.xml +++ b/qksms/src/main/res/values/attrs.xml @@ -1,6 +1,28 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/qksms/src/main/res/values/colors.xml b/qksms/src/main/res/values/colors.xml index 42895dcc..8910b0ab 100644 --- a/qksms/src/main/res/values/colors.xml +++ b/qksms/src/main/res/values/colors.xml @@ -6,9 +6,9 @@ #70808D #B7B9C0 - #FFFFFFFF - #ccffffff - #80ffffff + #FFFFFFFF + #ccffffff + #80ffffff #FFFFFF #333333 @@ -16,19 +16,20 @@ #F2F2F2 #212121 - #F1F1F1 + #F2F2F2 + #F5F5F5 - #F2F2F2 - #F5F5F5 + #ECECEC + #B9B9B9 - #ECECEC - #A6A6A6 - #B9B9B9 - #D6D6D6 - #B9B9B9 - #646464 - #595959 - #383838 + #A6A6A6 + #646464 + + #B9B9B9 + #595959 + + #D6D6D6 + #383838 #008389 diff --git a/qksms/src/main/res/values/styles.xml b/qksms/src/main/res/values/styles.xml index 132cdc4a..6b3f3861 100644 --- a/qksms/src/main/res/values/styles.xml +++ b/qksms/src/main/res/values/styles.xml @@ -6,23 +6,21 @@ false @color/white @color/white - @color/statusLight