diff --git a/app/src/main/java/com/nextcloud/talk/activities/MainActivity.kt b/app/src/main/java/com/nextcloud/talk/activities/MainActivity.kt
index 501593d06..b3c6e23cc 100644
--- a/app/src/main/java/com/nextcloud/talk/activities/MainActivity.kt
+++ b/app/src/main/java/com/nextcloud/talk/activities/MainActivity.kt
@@ -100,6 +100,16 @@ class MainActivity : BaseActivity(), ActionBarProvider {
}
}
+ @OnClick(R.id.floatingActionButton)
+ fun onFloatingActionButtonClick() {
+ val bundle = Bundle()
+ bundle.putBoolean(BundleKeys.KEY_NEW_CONVERSATION, true)
+ router?.pushController(
+ RouterTransaction.with(ContactsController(bundle))
+ .pushChangeHandler(HorizontalChangeHandler())
+ .popChangeHandler(HorizontalChangeHandler()))
+ }
+
override fun onStart() {
super.onStart()
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
diff --git a/app/src/main/java/com/nextcloud/talk/controllers/ContactsController.kt b/app/src/main/java/com/nextcloud/talk/controllers/ContactsController.kt
index 2c02a065d..1f75c9d9a 100644
--- a/app/src/main/java/com/nextcloud/talk/controllers/ContactsController.kt
+++ b/app/src/main/java/com/nextcloud/talk/controllers/ContactsController.kt
@@ -134,7 +134,7 @@ class ContactsController : BaseController,
@JvmField
@BindView(R.id.generic_rv_layout)
- var genericRvLayout: FrameLayout? = null
+ var genericRvLayout: CoordinatorLayout? = null
private var credentials: String? = null
private var currentUser: UserNgEntity? = null
diff --git a/app/src/main/java/com/nextcloud/talk/newarch/features/conversationsList/ConversationsListView.kt b/app/src/main/java/com/nextcloud/talk/newarch/features/conversationsList/ConversationsListView.kt
index 33adfc567..9d7390ca1 100644
--- a/app/src/main/java/com/nextcloud/talk/newarch/features/conversationsList/ConversationsListView.kt
+++ b/app/src/main/java/com/nextcloud/talk/newarch/features/conversationsList/ConversationsListView.kt
@@ -138,16 +138,6 @@ class ConversationsListView : BaseView() {
return view
}
- @OnClick(R.id.floatingActionButton)
- fun onFloatingActionButtonClick() {
- val bundle = Bundle()
- bundle.putBoolean(BundleKeys.KEY_NEW_CONVERSATION, true)
- router?.pushController(
- RouterTransaction.with(ContactsController(bundle))
- .pushChangeHandler(HorizontalChangeHandler())
- .popChangeHandler(HorizontalChangeHandler()))
- }
-
override fun onChangeStarted(changeHandler: ControllerChangeHandler, changeType: ControllerChangeType) {
actionBar?.setIcon(null)
super.onChangeStarted(changeHandler, changeType)
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index dffa0a1f3..c9e44d8ee 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -24,23 +24,24 @@
android:id="@+id/mainActivityCoordinatorLayout"
android:layout_width="match_parent"
android:layout_height="match_parent"
- tools:context=".activities.MainActivity"
android:animateLayoutChanges="true"
- android:fitsSystemWindows="true">
+ tools:context=".activities.MainActivity">
+
@@ -49,9 +50,21 @@
-
+ android:layout_height="match_parent"
+ app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior" />
+
+
diff --git a/app/src/main/res/layout/conversations_list_view.xml b/app/src/main/res/layout/conversations_list_view.xml
index 5db9bf4bd..554266f48 100644
--- a/app/src/main/res/layout/conversations_list_view.xml
+++ b/app/src/main/res/layout/conversations_list_view.xml
@@ -18,30 +18,22 @@
~ along with this program. If not, see .
-->
-
+ android:clipToPadding="false"
+ android:animateLayoutChanges="true"
+ app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior">
+ tools:listitem="@layout/rv_item_conversation_with_last_message"
+ android:paddingBottom="80dp"
+ android:clipToPadding="false"/>
-
-
-
+