From 9c8487847210a5a267b993ee83bb462ec4e8b9e2 Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Mon, 2 Oct 2017 13:37:59 -0400 Subject: [PATCH 1/2] Create empty drawer layout --- .../conversations/ConversationListActivity.kt | 4 + .../res/layout/conversation_list_activity.xml | 89 +++++++++++-------- 2 files changed, 56 insertions(+), 37 deletions(-) diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/conversations/ConversationListActivity.kt b/qksms/src/main/java/com/moez/QKSMS/presentation/conversations/ConversationListActivity.kt index 3839ecfa..2b6ac10c 100644 --- a/qksms/src/main/java/com/moez/QKSMS/presentation/conversations/ConversationListActivity.kt +++ b/qksms/src/main/java/com/moez/QKSMS/presentation/conversations/ConversationListActivity.kt @@ -5,6 +5,7 @@ import android.arch.lifecycle.Observer import android.arch.lifecycle.ViewModelProviders import android.content.Intent import android.os.Bundle +import android.support.v7.app.ActionBarDrawerToggle import android.support.v7.widget.LinearLayoutManager import com.jakewharton.rxbinding2.view.RxView import com.karumi.dexter.Dexter @@ -16,6 +17,7 @@ import com.moez.QKSMS.R import com.moez.QKSMS.presentation.base.QkActivity import com.moez.QKSMS.presentation.messages.MessageListActivity import kotlinx.android.synthetic.main.conversation_list_activity.* +import kotlinx.android.synthetic.main.toolbar.* import timber.log.Timber class ConversationListActivity : QkActivity(), Observer { @@ -25,6 +27,8 @@ class ConversationListActivity : QkActivity(), Observer - + android:layout_height="match_parent"> - - - + android:layout_height="match_parent" + android:animateLayoutChanges="true" + android:orientation="vertical"> - + + + android:layout_height="0dp" + android:layout_weight="1"> - + android:layout_height="match_parent"> - + - + - + - + - \ No newline at end of file + + + + + + + \ No newline at end of file From 08c5265050dab2563f0facb9d484ea375b0fb917 Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Mon, 2 Oct 2017 17:25:09 -0400 Subject: [PATCH 2/2] Set up UI and click events for Drawer --- .../conversations/ConversationListActivity.kt | 10 ++- .../main/res/drawable/ic_block_black_24dp.xml | 9 +++ .../main/res/drawable/ic_event_black_24dp.xml | 9 +++ .../res/drawable/ic_folder_black_24dp.xml | 9 +++ .../res/drawable/ic_settings_black_24dp.xml | 9 +++ .../res/layout/conversation_list_activity.xml | 11 ++- qksms/src/main/res/layout/drawer_view.xml | 72 +++++++++++++++++++ qksms/src/main/res/values/strings.xml | 5 ++ qksms/src/main/res/values/styles.xml | 26 +++++++ 9 files changed, 155 insertions(+), 5 deletions(-) create mode 100644 qksms/src/main/res/drawable/ic_block_black_24dp.xml create mode 100644 qksms/src/main/res/drawable/ic_event_black_24dp.xml create mode 100644 qksms/src/main/res/drawable/ic_folder_black_24dp.xml create mode 100644 qksms/src/main/res/drawable/ic_settings_black_24dp.xml create mode 100644 qksms/src/main/res/layout/drawer_view.xml diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/conversations/ConversationListActivity.kt b/qksms/src/main/java/com/moez/QKSMS/presentation/conversations/ConversationListActivity.kt index 2b6ac10c..b1775833 100644 --- a/qksms/src/main/java/com/moez/QKSMS/presentation/conversations/ConversationListActivity.kt +++ b/qksms/src/main/java/com/moez/QKSMS/presentation/conversations/ConversationListActivity.kt @@ -17,6 +17,7 @@ import com.moez.QKSMS.R import com.moez.QKSMS.presentation.base.QkActivity import com.moez.QKSMS.presentation.messages.MessageListActivity import kotlinx.android.synthetic.main.conversation_list_activity.* +import kotlinx.android.synthetic.main.drawer_view.* import kotlinx.android.synthetic.main.toolbar.* import timber.log.Timber @@ -38,9 +39,12 @@ class ConversationListActivity : QkActivity(), Observer + + diff --git a/qksms/src/main/res/drawable/ic_event_black_24dp.xml b/qksms/src/main/res/drawable/ic_event_black_24dp.xml new file mode 100644 index 00000000..22f1bb69 --- /dev/null +++ b/qksms/src/main/res/drawable/ic_event_black_24dp.xml @@ -0,0 +1,9 @@ + + + diff --git a/qksms/src/main/res/drawable/ic_folder_black_24dp.xml b/qksms/src/main/res/drawable/ic_folder_black_24dp.xml new file mode 100644 index 00000000..d7c6145c --- /dev/null +++ b/qksms/src/main/res/drawable/ic_folder_black_24dp.xml @@ -0,0 +1,9 @@ + + + diff --git a/qksms/src/main/res/drawable/ic_settings_black_24dp.xml b/qksms/src/main/res/drawable/ic_settings_black_24dp.xml new file mode 100644 index 00000000..ace746c4 --- /dev/null +++ b/qksms/src/main/res/drawable/ic_settings_black_24dp.xml @@ -0,0 +1,9 @@ + + + diff --git a/qksms/src/main/res/layout/conversation_list_activity.xml b/qksms/src/main/res/layout/conversation_list_activity.xml index b67462ec..b76501fb 100644 --- a/qksms/src/main/res/layout/conversation_list_activity.xml +++ b/qksms/src/main/res/layout/conversation_list_activity.xml @@ -56,12 +56,19 @@ - + android:orientation="vertical"> + + + + \ No newline at end of file diff --git a/qksms/src/main/res/layout/drawer_view.xml b/qksms/src/main/res/layout/drawer_view.xml new file mode 100644 index 00000000..16fc71af --- /dev/null +++ b/qksms/src/main/res/layout/drawer_view.xml @@ -0,0 +1,72 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/qksms/src/main/res/values/strings.xml b/qksms/src/main/res/values/strings.xml index 616b8046..a3afc421 100644 --- a/qksms/src/main/res/values/strings.xml +++ b/qksms/src/main/res/values/strings.xml @@ -4,6 +4,11 @@ Write a message + Archived + Scheduled + Blocked + Settings + Reply Mark read diff --git a/qksms/src/main/res/values/styles.xml b/qksms/src/main/res/values/styles.xml index be3988ff..f6213532 100644 --- a/qksms/src/main/res/values/styles.xml +++ b/qksms/src/main/res/values/styles.xml @@ -26,4 +26,30 @@ 12sp + + + + + +