From 8adfce2ab70cdc97e2eb0a768d1910334e7bbfce Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Sat, 16 Dec 2017 22:19:20 -0500 Subject: [PATCH] Update UI for compose bar --- .../presentation/compose/ComposeActivity.kt | 20 +-- .../rounded_rectangle_shadow.9.png | Bin 0 -> 4947 bytes .../drawable/ic_insert_photo_black_24dp.xml | 9 ++ .../src/main/res/layout/compose_activity.xml | 124 +++++++++++------- qksms/src/main/res/values/colors.xml | 2 +- 5 files changed, 96 insertions(+), 59 deletions(-) create mode 100644 qksms/src/main/res/drawable-xxxhdpi/rounded_rectangle_shadow.9.png create mode 100644 qksms/src/main/res/drawable/ic_insert_photo_black_24dp.xml 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 53410a2a..42afc6f9 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 @@ -2,6 +2,7 @@ package com.moez.QKSMS.presentation.compose import android.app.AlertDialog import android.content.res.ColorStateList +import android.graphics.PorterDuff import android.os.Bundle import android.support.v7.widget.LinearLayoutManager import android.support.v7.widget.RecyclerView @@ -101,28 +102,30 @@ class ComposeActivity : QkActivity(), ComposeView { messageList.layoutManager = layoutManager messageList.adapter = messageAdapter + messageBackground.backgroundTintMode = PorterDuff.Mode.MULTIPLY + val states = arrayOf( intArrayOf(android.R.attr.state_enabled), intArrayOf(-android.R.attr.state_enabled)) disposables += Observables - .combineLatest(colors.theme, colors.textTertiary, { theme, textTertiary -> - ColorStateList(states, intArrayOf(theme, textTertiary)) + .combineLatest(colors.textPrimaryOnTheme, colors.textTertiaryOnTheme, { primary, tertiary -> + ColorStateList(states, intArrayOf(primary, tertiary)) }) - .subscribe { tintList -> send.imageTintList = tintList } + .subscribe { tintList -> sendIcon.imageTintList = tintList } + + disposables += colors.theme + .subscribe { color -> send.setBackgroundTint(color) } disposables += colors.textSecondary .subscribe { color -> attach.setTint(color) } - disposables += colors.background - .subscribe { color -> composeBar.setBackgroundColor(color) } + disposables += colors.bubble + .subscribe { color -> messageBackground.setBackgroundTint(color) } disposables += colors.composeBackground .subscribe { color -> window.decorView.setBackgroundColor(color) } - disposables += colors.field - .subscribe { color -> message.setBackgroundTint(color) } - window.callback = ComposeWindowCallback(window.callback, this) } @@ -170,6 +173,7 @@ class ComposeActivity : QkActivity(), ComposeView { if (message.text.toString() != state.draft) message.setText(state.draft) send.isEnabled = state.canSend + sendIcon.isEnabled = state.canSend } override fun onCreateOptionsMenu(menu: Menu?): Boolean { diff --git a/qksms/src/main/res/drawable-xxxhdpi/rounded_rectangle_shadow.9.png b/qksms/src/main/res/drawable-xxxhdpi/rounded_rectangle_shadow.9.png new file mode 100644 index 0000000000000000000000000000000000000000..b79d1665bc6600cea0d587a70c5a53c5ce92a6a9 GIT binary patch literal 4947 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 Gdh#E>6K8S& literal 0 HcmV?d00001 diff --git a/qksms/src/main/res/drawable/ic_insert_photo_black_24dp.xml b/qksms/src/main/res/drawable/ic_insert_photo_black_24dp.xml new file mode 100644 index 00000000..b2018595 --- /dev/null +++ b/qksms/src/main/res/drawable/ic_insert_photo_black_24dp.xml @@ -0,0 +1,9 @@ + + + diff --git a/qksms/src/main/res/layout/compose_activity.xml b/qksms/src/main/res/layout/compose_activity.xml index 50b41860..3eee77fd 100644 --- a/qksms/src/main/res/layout/compose_activity.xml +++ b/qksms/src/main/res/layout/compose_activity.xml @@ -4,7 +4,8 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" - android:orientation="vertical"> + android:orientation="vertical" + tools:background="@color/backgroundLight"> + android:layout_weight="1" + android:clipChildren="false" + android:clipToPadding="false"> + tools:listitem="@layout/message_list_item_in" /> + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - \ No newline at end of file diff --git a/qksms/src/main/res/values/colors.xml b/qksms/src/main/res/values/colors.xml index b11090e0..c80f7945 100644 --- a/qksms/src/main/res/values/colors.xml +++ b/qksms/src/main/res/values/colors.xml @@ -8,7 +8,7 @@ #FFFFFF #1d262b - #F2F2F2 + #ECEFF1 #192025 #0C000000