diff --git a/app/src/main/java/com/nextcloud/talk/controllers/CallsListController.java b/app/src/main/java/com/nextcloud/talk/controllers/CallsListController.java
index 072cef066..8dfff3f1c 100644
--- a/app/src/main/java/com/nextcloud/talk/controllers/CallsListController.java
+++ b/app/src/main/java/com/nextcloud/talk/controllers/CallsListController.java
@@ -29,6 +29,8 @@ import android.support.annotation.Nullable;
import android.support.design.widget.BottomNavigationView;
import android.support.v4.view.MenuItemCompat;
import android.support.v4.widget.SwipeRefreshLayout;
+import android.support.v7.widget.DividerItemDecoration;
+import android.support.v7.widget.LinearLayoutManager;
import android.support.v7.widget.RecyclerView;
import android.support.v7.widget.SearchView;
import android.text.InputType;
@@ -279,16 +281,19 @@ public class CallsListController extends BaseController implements SearchView.On
}
private void prepareViews() {
- recyclerView.setLayoutManager(new SmoothScrollLinearLayoutManager(getActivity()));
+ LinearLayoutManager layoutManager = new SmoothScrollLinearLayoutManager(getActivity());
+ recyclerView.setLayoutManager(layoutManager);
recyclerView.setHasFixedSize(true);
recyclerView.setAdapter(adapter);
- recyclerView.addItemDecoration(new FlexibleItemDecoration(getActivity())
- .withDivider(R.drawable.divider));
+ recyclerView.addItemDecoration(new DividerItemDecoration(
+ recyclerView.getContext(),
+ layoutManager.getOrientation()
+ ));
swipeRefreshLayout.setOnRefreshListener(() -> fetchData(true));
- swipeRefreshLayout.setProgressBackgroundColorSchemeColor(getResources().getColor(R.color.colorPrimary));
+ swipeRefreshLayout.setColorSchemeResources(R.color.colorPrimary);
}
private void dispose(@Nullable Disposable disposable) {
diff --git a/app/src/main/java/com/nextcloud/talk/controllers/ContactsController.java b/app/src/main/java/com/nextcloud/talk/controllers/ContactsController.java
index 8ce1a5c38..043741d76 100644
--- a/app/src/main/java/com/nextcloud/talk/controllers/ContactsController.java
+++ b/app/src/main/java/com/nextcloud/talk/controllers/ContactsController.java
@@ -29,6 +29,8 @@ import android.support.annotation.Nullable;
import android.support.design.widget.BottomNavigationView;
import android.support.v4.view.MenuItemCompat;
import android.support.v4.widget.SwipeRefreshLayout;
+import android.support.v7.widget.DividerItemDecoration;
+import android.support.v7.widget.LinearLayoutManager;
import android.support.v7.widget.RecyclerView;
import android.support.v7.widget.SearchView;
import android.text.InputType;
@@ -69,7 +71,6 @@ import javax.inject.Inject;
import autodagger.AutoInjector;
import butterknife.BindView;
import eu.davidea.flexibleadapter.FlexibleAdapter;
-import eu.davidea.flexibleadapter.common.FlexibleItemDecoration;
import eu.davidea.flexibleadapter.common.SmoothScrollLinearLayoutManager;
import io.reactivex.android.schedulers.AndroidSchedulers;
import io.reactivex.disposables.Disposable;
@@ -327,15 +328,18 @@ public class ContactsController extends BaseController implements SearchView.OnQ
}
private void prepareViews() {
- recyclerView.setLayoutManager(new SmoothScrollLinearLayoutManager(getActivity()));
+ LinearLayoutManager layoutManager = new SmoothScrollLinearLayoutManager(getActivity());
+ recyclerView.setLayoutManager(layoutManager);
recyclerView.setHasFixedSize(true);
recyclerView.setAdapter(adapter);
- recyclerView.addItemDecoration(new FlexibleItemDecoration(getActivity())
- .withDivider(R.drawable.divider));
+ recyclerView.addItemDecoration(new DividerItemDecoration(
+ recyclerView.getContext(),
+ layoutManager.getOrientation()
+ ));
swipeRefreshLayout.setOnRefreshListener(() -> fetchData(true));
- swipeRefreshLayout.setProgressBackgroundColorSchemeColor(getResources().getColor(R.color.colorPrimary));
+ swipeRefreshLayout.setColorSchemeResources(R.color.colorPrimary);
}
private void dispose(@Nullable Disposable disposable) {
diff --git a/app/src/main/res/drawable/divider.xml b/app/src/main/res/drawable/divider.xml
deleted file mode 100644
index 0d9702995..000000000
--- a/app/src/main/res/drawable/divider.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_search_white_24dp.xml b/app/src/main/res/drawable/ic_search_white_24dp.xml
index a23fcd1be..7c24d66dd 100644
--- a/app/src/main/res/drawable/ic_search_white_24dp.xml
+++ b/app/src/main/res/drawable/ic_search_white_24dp.xml
@@ -27,8 +27,8 @@
+ android:textSize="18sp"
+ tools:text="Verifying..."/>
-
-
\ No newline at end of file
+
diff --git a/app/src/main/res/layout/controller_bottom_navigation.xml b/app/src/main/res/layout/controller_bottom_navigation.xml
index d262a422d..7d27cf978 100644
--- a/app/src/main/res/layout/controller_bottom_navigation.xml
+++ b/app/src/main/res/layout/controller_bottom_navigation.xml
@@ -22,4 +22,4 @@
android:layout_gravity="bottom"
android:animateLayoutChanges="true"
android:background="?android:attr/windowBackground"/>
-
\ No newline at end of file
+
diff --git a/app/src/main/res/layout/controller_generic_rv.xml b/app/src/main/res/layout/controller_generic_rv.xml
index 11a67ce51..4b6acec43 100644
--- a/app/src/main/res/layout/controller_generic_rv.xml
+++ b/app/src/main/res/layout/controller_generic_rv.xml
@@ -20,6 +20,7 @@
-->
-
+ android:layout_height="match_parent"
+ tools:listitem="@layout/rv_item_call"/>
-
\ No newline at end of file
+
diff --git a/app/src/main/res/layout/controller_server_selection.xml b/app/src/main/res/layout/controller_server_selection.xml
index 1d0459d5a..93eb2fe83 100644
--- a/app/src/main/res/layout/controller_server_selection.xml
+++ b/app/src/main/res/layout/controller_server_selection.xml
@@ -47,4 +47,4 @@
-
\ No newline at end of file
+
diff --git a/app/src/main/res/layout/controller_settings.xml b/app/src/main/res/layout/controller_settings.xml
index 5a15ddc13..afe912e1f 100644
--- a/app/src/main/res/layout/controller_settings.xml
+++ b/app/src/main/res/layout/controller_settings.xml
@@ -23,4 +23,4 @@
android:layout_width="match_parent"
android:layout_height="match_parent">
-
\ No newline at end of file
+
diff --git a/app/src/main/res/layout/controller_web_view_login.xml b/app/src/main/res/layout/controller_web_view_login.xml
index 9d012a362..731b7c08c 100644
--- a/app/src/main/res/layout/controller_web_view_login.xml
+++ b/app/src/main/res/layout/controller_web_view_login.xml
@@ -31,4 +31,4 @@
-
\ No newline at end of file
+
diff --git a/app/src/main/res/layout/rv_item_call.xml b/app/src/main/res/layout/rv_item_call.xml
index e7db1307f..9dd41290e 100644
--- a/app/src/main/res/layout/rv_item_call.xml
+++ b/app/src/main/res/layout/rv_item_call.xml
@@ -3,7 +3,9 @@
~ Nextcloud Talk application
~
~ @author Mario Danic
+ ~ @author Andy Scherzinger
~ Copyright (C) 2017 Mario Danic
+ ~ Copyright (C) 2017 Andy Scherzinger
~
~ This program is free software: you can redistribute it and/or modify
~ it under the terms of the GNU General Public License as published by
@@ -21,54 +23,60 @@
+ android:layout_height="@dimen/item_height">
-
-
-
+ android:orientation="vertical">
-
\ No newline at end of file
+
+
+
+
+
+
+
diff --git a/app/src/main/res/layout/rv_item_contact.xml b/app/src/main/res/layout/rv_item_contact.xml
index 3e928f0bf..e06eb2a08 100644
--- a/app/src/main/res/layout/rv_item_contact.xml
+++ b/app/src/main/res/layout/rv_item_contact.xml
@@ -3,7 +3,9 @@
~ Nextcloud Talk application
~
~ @author Mario Danic
+ ~ @author Andy Scherzinger
~ Copyright (C) 2017 Mario Danic
+ ~ Copyright (C) 2017 Andy Scherzinger
~
~ This program is free software: you can redistribute it and/or modify
~ it under the terms of the GNU General Public License as published by
@@ -21,34 +23,33 @@
@@ -57,10 +58,10 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
- android:layout_marginBottom="@dimen/activity_vertical_margin"
+ android:ellipsize="end"
android:layout_marginEnd="@dimen/activity_horizontal_margin"
- android:layout_marginStart="@dimen/padding_between_elements"
- android:layout_toEndOf="@id/avatar_image"/>
+ android:textAppearance="?android:attr/textAppearanceListItem"
+ android:layout_toEndOf="@id/avatar_image"
+ tools:text="Contact item text"/>
-
-
\ No newline at end of file
+
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 57b70e274..b9e2a169b 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -3,11 +3,17 @@
16dp
16dp
+ 72dp
+
200dp
24dp
16dp
+ 16dp
8dp
+ 8dp
+ 40dp
+ 20dp