From 413ff51f0f831c1d7fda45da0b2a2a6379f8c3e9 Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Tue, 26 Sep 2017 01:12:33 -0400 Subject: [PATCH] Custom Toolbar --- .../java/com/moez/QKSMS/ui/base/QkActivity.kt | 12 +++++++ .../com/moez/QKSMS/ui/view/GroupAvatarView.kt | 8 ++--- qksms/src/main/res/drawable/ab_shadow.xml | 10 ++++++ .../res/layout/conversation_list_activity.xml | 35 +++++++++++++------ .../main/res/layout/message_list_activity.xml | 29 ++++++++++----- qksms/src/main/res/layout/toolbar.xml | 21 +++++++++++ qksms/src/main/res/values/styles.xml | 3 +- 7 files changed, 94 insertions(+), 24 deletions(-) create mode 100644 qksms/src/main/res/drawable/ab_shadow.xml create mode 100644 qksms/src/main/res/layout/toolbar.xml diff --git a/qksms/src/main/java/com/moez/QKSMS/ui/base/QkActivity.kt b/qksms/src/main/java/com/moez/QKSMS/ui/base/QkActivity.kt index 42070161..86b0dfd6 100644 --- a/qksms/src/main/java/com/moez/QKSMS/ui/base/QkActivity.kt +++ b/qksms/src/main/java/com/moez/QKSMS/ui/base/QkActivity.kt @@ -2,6 +2,7 @@ package com.moez.QKSMS.ui.base import android.support.v7.app.AppCompatActivity import android.view.MenuItem +import kotlinx.android.synthetic.main.toolbar.* abstract class QkActivity : AppCompatActivity() { @@ -15,4 +16,15 @@ abstract class QkActivity : AppCompatActivity() { } } + override fun setContentView(layoutResID: Int) { + super.setContentView(layoutResID) + setSupportActionBar(toolbar) + title = title // The title may have been set before layout inflation + } + + override fun setTitle(title: CharSequence?) { + super.setTitle(title) + toolbarTitle?.text = title + } + } \ No newline at end of file diff --git a/qksms/src/main/java/com/moez/QKSMS/ui/view/GroupAvatarView.kt b/qksms/src/main/java/com/moez/QKSMS/ui/view/GroupAvatarView.kt index 2404c8d3..f9fe522a 100644 --- a/qksms/src/main/java/com/moez/QKSMS/ui/view/GroupAvatarView.kt +++ b/qksms/src/main/java/com/moez/QKSMS/ui/view/GroupAvatarView.kt @@ -21,14 +21,14 @@ class GroupAvatarView(context: Context, attrs: AttributeSet?, defStyleAttr: Int) constructor(context: Context) : this(context, null, 0) init { - if (!isInEditMode) { - View.inflate(context, R.layout.group_avatar_view, this) - } + View.inflate(context, R.layout.group_avatar_view, this) } override fun onFinishInflate() { super.onFinishInflate() - updateView() + if (!isInEditMode) { + updateView() + } } private fun updateView() { diff --git a/qksms/src/main/res/drawable/ab_shadow.xml b/qksms/src/main/res/drawable/ab_shadow.xml new file mode 100644 index 00000000..59be6735 --- /dev/null +++ b/qksms/src/main/res/drawable/ab_shadow.xml @@ -0,0 +1,10 @@ + + + + + + \ No newline at end of file diff --git a/qksms/src/main/res/layout/conversation_list_activity.xml b/qksms/src/main/res/layout/conversation_list_activity.xml index cd21b7f0..853b039a 100644 --- a/qksms/src/main/res/layout/conversation_list_activity.xml +++ b/qksms/src/main/res/layout/conversation_list_activity.xml @@ -6,22 +6,35 @@ android:animateLayoutChanges="true" android:orientation="vertical"> - + + - + android:layout_height="match_parent"> - + + + + + + + \ No newline at end of file diff --git a/qksms/src/main/res/layout/message_list_activity.xml b/qksms/src/main/res/layout/message_list_activity.xml index 6ee54535..06d567e3 100644 --- a/qksms/src/main/res/layout/message_list_activity.xml +++ b/qksms/src/main/res/layout/message_list_activity.xml @@ -5,16 +5,29 @@ android:layout_height="match_parent" android:orientation="vertical"> - + + + android:layout_weight="1"> + + + + + + + + + + + \ No newline at end of file diff --git a/qksms/src/main/res/values/styles.xml b/qksms/src/main/res/values/styles.xml index 3efef4a0..9cadfdd1 100644 --- a/qksms/src/main/res/values/styles.xml +++ b/qksms/src/main/res/values/styles.xml @@ -2,8 +2,9 @@