Material theming

app/build.gradle

@@ -13,7 +13,7 @@ android {
 
         javaCompileOptions {
             annotationProcessorOptions {
-                arguments = [ eventBusIndex : 'fr.gaulupeau.apps.Poche.EventBusIndex' ]
+                arguments = [eventBusIndex: 'fr.gaulupeau.apps.Poche.EventBusIndex']
             }
         }
     }
@@ -55,8 +55,10 @@ greendao {
 dependencies {
     implementation 'androidx.appcompat:appcompat:1.2.0'
     implementation 'androidx.media:media:1.3.1'
+    implementation "androidx.webkit:webkit:1.4.0"
     implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'
     implementation 'androidx.recyclerview:recyclerview:1.2.0'
+    implementation 'androidx.preference:preference:1.1.1'
     implementation 'com.google.android.material:material:1.3.0'
     implementation 'org.greenrobot:eventbus:3.2.0'
     implementation 'org.greenrobot:greendao:3.3.0'

app/src/main/AndroidManifest.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          xmlns:tools="http://schemas.android.com/tools"
           package="fr.gaulupeau.apps.InThePoche"
           android:installLocation="auto">
 
@@ -22,20 +21,18 @@
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:supportsRtl="true"
-        android:theme="@style/LightTheme"
+        android:theme="@style/Theme.App"
         android:networkSecurityConfig="@xml/network_security_config">
         <activity
             android:name="fr.gaulupeau.apps.Poche.ui.SplashActivity"
             android:configChanges="keyboardHidden|orientation|screenSize"
-            android:theme="@style/SplashTheme">
+            android:theme="@style/Theme.Splash">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-        <activity
-            android:name="fr.gaulupeau.apps.Poche.ui.MainActivity"
-            android:theme="@style/LightTheme.NoActionBar">
+        <activity android:name="fr.gaulupeau.apps.Poche.ui.MainActivity">
             <intent-filter>
                 <action android:name="android.intent.action.SEARCH" />
             </intent-filter>
@@ -55,7 +52,7 @@
             android:autoRemoveFromRecents="true"
             android:excludeFromRecents="true"
             android:noHistory="true"
-            android:theme="@style/ProxyTheme">
+            android:theme="@style/Theme.App.ProxyTheme">
             <intent-filter android:label="@string/app_name">
                 <action android:name="android.intent.action.SEND" />
 
@@ -69,8 +66,7 @@
             android:autoRemoveFromRecents="true"
             android:enabled="false"
             android:excludeFromRecents="true"
-            android:noHistory="true"
-            android:theme="@style/ProxyTheme">
+            android:noHistory="true">
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
 
@@ -96,8 +92,7 @@
         </activity>
 
         <activity
-            android:name="fr.gaulupeau.apps.Poche.ui.EditAddedArticleActivity"
-            android:theme="@style/DialogTheme" />
+            android:name="fr.gaulupeau.apps.Poche.ui.EditAddedArticleActivity" />
 
         <activity android:name="fr.gaulupeau.apps.Poche.ui.preferences.SettingsActivity">
             <intent-filter>

app/src/main/java/fr/gaulupeau/apps/Poche/data/Settings.java

@@ -88,7 +88,7 @@ public void initPreferences() {
             } else { // preferences are not migrated -- set some default values
                 boolean isOnyxDevice = Build.MANUFACTURER.equals("Onyx");
                 boolean isEreader = isOnyxDevice || Build.MODEL.equals("NOOK");
-                Themes.Theme theme = isEreader ? Themes.Theme.E_INK : Themes.Theme.LIGHT;
+                Themes.Theme theme = isEreader ? Themes.Theme.E_INK : Themes.Theme.FOLLOW_SYSTEM;
                 prefEditor.putString(context.getString(R.string.pref_key_ui_theme), theme.toString());
                 prefEditor.putBoolean(context.getString(R.string.pref_key_ui_onyxworkaround_enabled), isOnyxDevice);
             }
@@ -441,7 +441,7 @@ public Themes.Theme getTheme() {
             } catch(IllegalArgumentException ignored) {}
         }
 
-        return theme != null ? theme : Themes.Theme.LIGHT;
+        return theme != null ? theme : Themes.Theme.FOLLOW_SYSTEM;
     }
 
     public void setTheme(Themes.Theme theme) {

app/src/main/java/fr/gaulupeau/apps/Poche/events/EventProcessor.java

@@ -169,7 +169,7 @@ public void onUpdateArticlesStartedEvent(UpdateArticlesStartedEvent event) {
         detailedMessage = prependAppName(detailedMessage);
 
         NotificationCompat.Builder notificationBuilder = new NotificationCompat.Builder(context, CHANNEL_ID_SYNC)
-                .setSmallIcon(R.drawable.ic_action_refresh)
+                .setSmallIcon(R.drawable.ic_sync)
                 .setContentTitle(context.getString(R.string.notification_updatingArticles))
                 .setContentText(detailedMessage)
                 .setOngoing(true);
@@ -209,7 +209,7 @@ public void onSweepDeletedArticlesStartedEvent(SweepDeletedArticlesStartedEvent
         Context context = getContext();
 
         NotificationCompat.Builder notificationBuilder = new NotificationCompat.Builder(context, CHANNEL_ID_SYNC)
-                .setSmallIcon(R.drawable.ic_action_refresh)
+                .setSmallIcon(R.drawable.ic_sync)
                 .setContentTitle(context.getString(R.string.notification_sweepingDeletedArticles))
                 .setOngoing(true);
 
@@ -253,7 +253,7 @@ public void onFetchImagesProgressEvent(FetchImagesProgressEvent event) {
             Context context = getContext();
 
             NotificationCompat.Builder notificationBuilder = new NotificationCompat.Builder(context, CHANNEL_ID_SYNC)
-                    .setSmallIcon(R.drawable.ic_action_refresh)
+                    .setSmallIcon(R.drawable.ic_sync)
                     .setContentTitle(context.getString(R.string.notification_downloadingImages))
                     .setOngoing(true);
 
@@ -306,7 +306,7 @@ public void onSyncQueueProgressEvent(SyncQueueProgressEvent event) {
                 Context context = getContext();
 
                 notificationBuilder = new NotificationCompat.Builder(context, CHANNEL_ID_SYNC)
-                        .setSmallIcon(R.drawable.ic_action_refresh)
+                        .setSmallIcon(R.drawable.ic_sync)
                         .setContentTitle(getContext().getString(R.string.notification_syncingQueue))
                         .setOngoing(true);
 

app/src/main/java/fr/gaulupeau/apps/Poche/service/MainService.java

@@ -24,7 +24,7 @@ protected Notification getForegroundNotification() {
 
         return new NotificationCompat.Builder(
                 this, NotificationsHelper.CHANNEL_ID_BACKGROUND_OPERATIONS)
-                .setSmallIcon(R.drawable.ic_action_refresh)
+                .setSmallIcon(R.drawable.ic_sync)
                 .setContentTitle(getString(R.string.notification_backgroundOperations))
                 .build();
     }

app/src/main/java/fr/gaulupeau/apps/Poche/service/SecondaryService.java

@@ -24,7 +24,7 @@ protected Notification getForegroundNotification() {
 
         return new NotificationCompat.Builder(
                 this, NotificationsHelper.CHANNEL_ID_BACKGROUND_OPERATIONS)
-                .setSmallIcon(R.drawable.ic_action_refresh)
+                .setSmallIcon(R.drawable.ic_sync)
                 .setContentTitle(getString(R.string.notification_backgroundOperations))
                 .build();
     }

app/src/main/java/fr/gaulupeau/apps/Poche/ui/BaseActionBarActivity.java

@@ -3,16 +3,21 @@
 import android.os.Bundle;
 import androidx.appcompat.app.ActionBar;
 import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
+
 import android.view.MenuItem;
+import android.view.View;
+
+import com.google.android.material.appbar.MaterialToolbar;
+
+import fr.gaulupeau.apps.InThePoche.R;
 
 public abstract class BaseActionBarActivity extends AppCompatActivity {
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         Themes.applyTheme(this);
         super.onCreate(savedInstanceState);
-
-        addBackButtonToActionBar();
     }
 
     @Override
@@ -22,9 +27,8 @@ protected void onStart() {
         Themes.checkTheme(this);
     }
 
-    protected void addBackButtonToActionBar() {
-        ActionBar actionBar = getSupportActionBar();
-        if(actionBar != null) actionBar.setDisplayHomeAsUpEnabled(true);
+    protected void addBackButtonToActionBar(Toolbar toolbar) {
+        toolbar.setNavigationOnClickListener(v -> onBackPressed());
     }
 
     protected void hideBackButtonFromActionBar() {

app/src/main/java/fr/gaulupeau/apps/Poche/ui/MainActivity.java

@@ -17,7 +17,6 @@
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
-import android.widget.ProgressBar;
 import android.widget.TextView;
 import android.widget.Toast;
 
@@ -33,6 +32,7 @@
 import androidx.fragment.app.Fragment;
 
 import com.google.android.material.navigation.NavigationView;
+import com.google.android.material.progressindicator.LinearProgressIndicator;
 import com.mikepenz.aboutlibraries.Libs;
 import com.mikepenz.aboutlibraries.LibsBuilder;
 
@@ -84,7 +84,7 @@ public class MainActivity extends AppCompatActivity
 
     private ConfigurationTestHelper configurationTestHelper;
 
-    private ProgressBar progressBar;
+    private LinearProgressIndicator progressBar;
 
     private NavigationView navigationView;
     private TextView lastUpdateTimeView;
@@ -136,22 +136,6 @@ protected void onCreate(Bundle savedInstanceState) {
             if (headerView != null) {
                 lastUpdateTimeView = headerView.findViewById(R.id.lastUpdateTime);
             }
-
-            // Set different colors for items in the navigation bar in dark (high contrast) theme
-            if (Themes.getCurrentTheme() == Themes.Theme.DARK_CONTRAST) {
-                @SuppressLint("ResourceType") XmlResourceParser parser = getResources().getXml(R.color.dark_contrast_menu_item);
-                try {
-                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-                        navigationView.setItemTextColor(ColorStateList.createFromXml(getResources(), parser, getTheme()));
-                        navigationView.setItemIconTintList(ColorStateList.createFromXml(getResources(), parser, getTheme()));
-                    } else {
-                        navigationView.setItemTextColor(ColorStateList.createFromXml(getResources(), parser));
-                        navigationView.setItemIconTintList(ColorStateList.createFromXml(getResources(), parser));
-                    }
-                } catch (XmlPullParserException | IOException e) {
-                    Log.e(TAG, "onCreate()", e);
-                }
-            }
         }
 
         DrawerLayout drawer = findViewById(R.id.drawer_layout);
@@ -468,23 +452,11 @@ public boolean onNavigationItemSelected(@NonNull MenuItem item) {
                 break;
 
             case R.id.nav_about:
-                Libs.ActivityStyle style;
-                switch (Themes.getCurrentTheme()) {
-                    case DARK:
-                    case DARK_CONTRAST:
-                        style = Libs.ActivityStyle.DARK;
-                        break;
-
-                    default:
-                        style = Libs.ActivityStyle.LIGHT_DARK_TOOLBAR;
-                        break;
-                }
                 CharSequence aboutCharSequence = getText(R.string.aboutText);
                 String aboutString = aboutCharSequence instanceof Spanned
                         ? Html.toHtml((Spanned) aboutCharSequence)
                         : aboutCharSequence.toString();
                 new LibsBuilder()
-                        .withActivityStyle(style)
                         .withAboutIconShown(true)
                         .withAboutVersionShown(true)
                         .withAboutDescription(aboutString)
@@ -546,8 +518,10 @@ public void onUpdateArticlesProgressEvent(UpdateArticlesProgressEvent event) {
 
         if (progressBar != null) {
             progressBar.setIndeterminate(false);
-            progressBar.setMax(event.getTotal());
-            progressBar.setProgress(event.getCurrent());
+            if (event.getTotal() > 0) {
+                progressBar.setMax(event.getTotal());
+                progressBar.setProgressCompat(event.getCurrent(), true);
+            }
         }
     }
 
@@ -585,7 +559,7 @@ private void updateStateChanged(boolean started) {
         updateRunning = started;
 
         if (progressBar != null) {
-            progressBar.setVisibility(started ? View.VISIBLE : View.GONE);
+            progressBar.setVisibility(started ? View.VISIBLE : View.INVISIBLE);
             progressBar.setIndeterminate(true);
         }
     }

app/src/main/java/fr/gaulupeau/apps/Poche/ui/ManageArticleTagsActivity.java

@@ -15,6 +15,7 @@
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.appcompat.widget.Toolbar;
 import androidx.recyclerview.widget.DiffUtil;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
@@ -87,6 +88,10 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
 
         setContentView(R.layout.activity_manage_article_tags);
 
+        Toolbar toolbar = findViewById(R.id.toolbar);
+        setSupportActionBar(toolbar);
+        toolbar.setNavigationOnClickListener(v -> onBackPressed());
+
         String[] currentTagsArray = null;
         String text;
         if (savedInstanceState != null) {