From 8c483b1885802eeee971014c1a83d4eb16a54002 Mon Sep 17 00:00:00 2001
From: Shinokuni <shinokuni@openserver.fr>
Date: Wed, 13 Mar 2019 16:48:27 +0100
Subject: [PATCH] Improve progressbar style

---
 .../readrops/app/activities/MainActivity.java | 64 +++++++++++--------
 app/src/main/res/layout/activity_main.xml     |  5 +-
 2 files changed, 39 insertions(+), 30 deletions(-)

diff --git a/app/src/main/java/com/readrops/app/activities/MainActivity.java b/app/src/main/java/com/readrops/app/activities/MainActivity.java
index 5315e5b0..8afb1d25 100644
--- a/app/src/main/java/com/readrops/app/activities/MainActivity.java
+++ b/app/src/main/java/com/readrops/app/activities/MainActivity.java
@@ -2,6 +2,8 @@ package com.readrops.app.activities;
 
 import android.arch.lifecycle.ViewModelProviders;
 import android.content.Intent;
+import android.graphics.Color;
+import android.graphics.PorterDuff;
 import android.os.Build;
 import android.os.Bundle;
 import android.support.annotation.NonNull;
@@ -234,30 +236,7 @@ public class MainActivity extends AppCompatActivity implements SimpleCallback, S
     public void onRefresh() {
         Log.d(TAG, "syncing started");
 
-        viewModel.getFeedCount()
-                .subscribeOn(Schedulers.io())
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(new SingleObserver<Integer>() {
-
-                    @Override
-                    public void onSubscribe(Disposable d) {
-                        syncProgressLayout.setVisibility(View.VISIBLE);
-                        syncProgressBar.setProgress(0);
-                    }
-
-                    @Override
-                    public void onSuccess(Integer integer) {
-                        feedNb = integer;
-                        sync(null);
-                    }
-
-                    @Override
-                    public void onError(Throwable e) {
-                        Toast.makeText(getApplicationContext(), "error on getting feeds number", Toast.LENGTH_LONG).show();
-                    }
-                });
-
-
+        presync(null);
     }
 
     public void displayAddFeedDialog(View view) {
@@ -287,13 +266,38 @@ public class MainActivity extends AppCompatActivity implements SimpleCallback, S
 
             if (feeds != null && feeds.size() > 0) {
                 refreshLayout.setRefreshing(true);
-                sync(feeds);
+                presync(feeds);
             }
         }
 
         super.onActivityResult(requestCode, resultCode, data);
     }
 
+    private void presync(List<Feed> feeds) {
+        viewModel.getFeedCount()
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(new SingleObserver<Integer>() {
+
+                    @Override
+                    public void onSubscribe(Disposable d) {
+                        syncProgressLayout.setVisibility(View.VISIBLE);
+                        syncProgressBar.setProgress(0);
+                    }
+
+                    @Override
+                    public void onSuccess(Integer integer) {
+                        feedNb = integer;
+                        sync(feeds);
+                    }
+
+                    @Override
+                    public void onError(Throwable e) {
+                        Toast.makeText(getApplicationContext(), "error on getting feeds number", Toast.LENGTH_LONG).show();
+                    }
+                });
+    }
+
     private void sync(List<Feed> feeds) {
         viewModel.sync(feeds)
                 .subscribeOn(Schedulers.io())
@@ -307,12 +311,12 @@ public class MainActivity extends AppCompatActivity implements SimpleCallback, S
                     @Override
                     public void onNext(Feed feed) {
                         syncProgress.setText(getString(R.string.updating_feed, feed.getName()));
-                        feedCount++;
-
                         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
                             syncProgressBar.setProgress((feedCount * 100) / feedNb, true);
                         } else
                             syncProgressBar.setProgress((feedCount * 100) / feedNb);
+
+                        feedCount++;
                     }
 
                     @Override
@@ -323,7 +327,11 @@ public class MainActivity extends AppCompatActivity implements SimpleCallback, S
 
                     @Override
                     public void onComplete() {
-                        syncProgressBar.setProgress(0);
+                        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N)
+                            syncProgressBar.setProgress(100, true);
+                        else
+                            syncProgressBar.setProgress(100);
+
                         syncProgressLayout.setVisibility(View.GONE);
                         refreshLayout.setRefreshing(false);
                         adapter.submitList(newItems);
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index e3581468..5c9f833c 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -55,9 +55,10 @@
                 android:id="@+id/sync_progress_bar"
                 style="?android:attr/progressBarStyleHorizontal"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
+                android:layout_height="4dp"
                 android:layout_below="@id/sync_progress_feeds_layout"
-                android:max="100"/>
+                android:layout_margin="0dp"
+                android:max="100" />
 
         </RelativeLayout>