From e1d4331f16ee925347a05dbcc17af5fe36c399fe Mon Sep 17 00:00:00 2001
From: Andy Scherzinger <info@andy-scherzinger.de>
Date: Mon, 19 Apr 2021 22:52:30 +0200
Subject: properly set pull-to-refresh-spinner-background-color

Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
---
 app/src/main/java/com/nextcloud/talk/controllers/ContactsController.java | 1 +
 .../java/com/nextcloud/talk/controllers/ConversationsListController.java | 1 +
 app/src/main/res/values-night/colors.xml                                 | 1 +
 app/src/main/res/values/colors.xml                                       | 1 +
 4 files changed, 4 insertions(+)

(limited to 'app/src')

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 3bc52b54f..cde5fdbca 100644
--- a/app/src/main/java/com/nextcloud/talk/controllers/ContactsController.java
+++ b/app/src/main/java/com/nextcloud/talk/controllers/ContactsController.java
@@ -643,6 +643,7 @@ public class ContactsController extends BaseController implements SearchView.OnQ
 
         swipeRefreshLayout.setOnRefreshListener(() -> fetchData(true));
         swipeRefreshLayout.setColorSchemeResources(R.color.colorPrimary);
+        swipeRefreshLayout.setProgressBackgroundColorSchemeResource(R.color.refresh_spinner_background);
 
         fastScroller.addOnScrollStateChangeListener(this);
         adapter.setFastScroller(fastScroller);
diff --git a/app/src/main/java/com/nextcloud/talk/controllers/ConversationsListController.java b/app/src/main/java/com/nextcloud/talk/controllers/ConversationsListController.java
index cbb42b409..1b3b025de 100644
--- a/app/src/main/java/com/nextcloud/talk/controllers/ConversationsListController.java
+++ b/app/src/main/java/com/nextcloud/talk/controllers/ConversationsListController.java
@@ -522,6 +522,7 @@ public class ConversationsListController extends BaseController implements Searc
 
         swipeRefreshLayout.setOnRefreshListener(() -> fetchData(false));
         swipeRefreshLayout.setColorSchemeResources(R.color.colorPrimary);
+        swipeRefreshLayout.setProgressBackgroundColorSchemeResource(R.color.refresh_spinner_background);
 
         emptyLayoutView.setOnClickListener(v -> showNewConversationsScreen());
         floatingActionButton.setOnClickListener(v -> {
diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml
index cca535763..97450c3dd 100644
--- a/app/src/main/res/values-night/colors.xml
+++ b/app/src/main/res/values-night/colors.xml
@@ -31,6 +31,7 @@
     <!-- App bar -->
     <color name="appbar">#1E1E1E</color>
     <color name="fontAppbar">#FFFFFF</color>
+    <color name="refresh_spinner_background">#222222</color>
 
     <!-- general text colors -->
     <color name="high_emphasis_text">#deffffff</color>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index cc4db82b8..e1d0f2e44 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -32,6 +32,7 @@
     <color name="appbar">@android:color/white</color>
     <color name="fontAppbar">#666666</color>
     <color name="fontSecondaryAppbar">#A5A5A5</color>
+    <color name="refresh_spinner_background">#ffffff</color>
 
     <!-- general text colors -->
     <color name="high_emphasis_text">#de000000</color>
-- 
cgit v1.2.3