From 89bd081c148f1e352d3cc804553bebf589ae81de Mon Sep 17 00:00:00 2001 From: lucyyu24 Date: Thu, 28 Sep 2017 23:13:05 -0700 Subject: [PATCH 1/3] Added floating action button to Conversation List view --- .../ui/conversations/ConversationListActivity.kt | 4 ++++ qksms/src/main/res/drawable/ic_add_black_24dp.xml | 10 +++++----- .../main/res/layout/conversation_list_activity.xml | 12 ++++++++++++ 3 files changed, 21 insertions(+), 5 deletions(-) diff --git a/qksms/src/main/java/com/moez/QKSMS/ui/conversations/ConversationListActivity.kt b/qksms/src/main/java/com/moez/QKSMS/ui/conversations/ConversationListActivity.kt index 57069ff2..cf4f28f2 100644 --- a/qksms/src/main/java/com/moez/QKSMS/ui/conversations/ConversationListActivity.kt +++ b/qksms/src/main/java/com/moez/QKSMS/ui/conversations/ConversationListActivity.kt @@ -6,6 +6,7 @@ import android.arch.lifecycle.ViewModelProviders import android.content.Intent import android.os.Bundle import android.support.v7.widget.LinearLayoutManager +import com.jakewharton.rxbinding2.view.RxView import com.karumi.dexter.Dexter import com.karumi.dexter.MultiplePermissionsReport import com.karumi.dexter.PermissionToken @@ -33,6 +34,9 @@ class ConversationListActivity : QkActivity(), Observer + android:width="24dp" + android:height="24dp" + android:viewportWidth="24.0" + android:viewportHeight="24.0"> + android:pathData="M19,13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"/> diff --git a/qksms/src/main/res/layout/conversation_list_activity.xml b/qksms/src/main/res/layout/conversation_list_activity.xml index 853b039a..f783b8c5 100644 --- a/qksms/src/main/res/layout/conversation_list_activity.xml +++ b/qksms/src/main/res/layout/conversation_list_activity.xml @@ -1,5 +1,6 @@ + + \ No newline at end of file From e809234796c0d853a2b2dfcca79f511dd45351e3 Mon Sep 17 00:00:00 2001 From: lucyyu24 Date: Fri, 29 Sep 2017 00:02:26 -0700 Subject: [PATCH 2/3] Changed floating action button id and layout margin --- .../moez/QKSMS/ui/conversations/ConversationListActivity.kt | 2 +- qksms/src/main/res/layout/conversation_list_activity.xml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/qksms/src/main/java/com/moez/QKSMS/ui/conversations/ConversationListActivity.kt b/qksms/src/main/java/com/moez/QKSMS/ui/conversations/ConversationListActivity.kt index cf4f28f2..6565b1ce 100644 --- a/qksms/src/main/java/com/moez/QKSMS/ui/conversations/ConversationListActivity.kt +++ b/qksms/src/main/java/com/moez/QKSMS/ui/conversations/ConversationListActivity.kt @@ -34,7 +34,7 @@ class ConversationListActivity : QkActivity(), Observer Date: Fri, 29 Sep 2017 00:14:32 -0700 Subject: [PATCH 3/3] Revert add icon --- qksms/src/main/res/drawable/ic_add_black_24dp.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/qksms/src/main/res/drawable/ic_add_black_24dp.xml b/qksms/src/main/res/drawable/ic_add_black_24dp.xml index 0258249c..0c88b7ce 100644 --- a/qksms/src/main/res/drawable/ic_add_black_24dp.xml +++ b/qksms/src/main/res/drawable/ic_add_black_24dp.xml @@ -1,9 +1,9 @@ + android:width="24dp" + android:height="24dp" + android:viewportHeight="24.0" + android:viewportWidth="24.0"> + android:pathData="M19,13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z" />