syncthing · imsodin · May 10, 2023 · Mar 25, 2023 · Mar 25, 2023 · Mar 26, 2023
diff --git a/app/build.gradle b/app/build.gradle
@@ -6,7 +6,7 @@ plugins {
 
 dependencies {
     implementation 'eu.chainfire:libsuperuser:1.1.0.202004101746'
-    implementation 'com.google.android.material:material:1.4.0'
+    implementation 'com.google.android.material:material:1.8.0'
     implementation 'com.google.code.gson:gson:2.10.1'
     implementation 'org.mindrot:jbcrypt:0.4'
     implementation 'com.google.guava:guava:31.1-android'

diff --git a/app/src/main/java/com/nutomic/syncthingandroid/SyncthingApp.java b/app/src/main/java/com/nutomic/syncthingandroid/SyncthingApp.java
@@ -3,6 +3,7 @@
 import android.app.Application;
 import android.os.StrictMode;
 
+import com.google.android.material.color.DynamicColors;
 import com.nutomic.syncthingandroid.util.Languages;
 
 import javax.inject.Inject;
@@ -13,6 +14,8 @@ public class SyncthingApp extends Application {
 
     @Override
     public void onCreate() {
+        DynamicColors.applyToActivitiesIfAvailable(this);
+
         super.onCreate();
 
         DaggerDaggerComponent.builder()

diff --git a/app/src/main/java/com/nutomic/syncthingandroid/activities/DeviceActivity.java b/app/src/main/java/com/nutomic/syncthingandroid/activities/DeviceActivity.java
@@ -8,8 +8,6 @@
 import android.graphics.drawable.Drawable;
 import android.os.Bundle;
 import androidx.core.content.ContextCompat;
-import androidx.appcompat.app.AlertDialog;
-import androidx.appcompat.widget.SwitchCompat;
 import android.text.Editable;
 import android.text.TextUtils;
 import android.text.TextWatcher;
@@ -22,9 +20,8 @@
 import android.widget.TextView;
 import android.widget.Toast;
 
+import com.google.android.material.materialswitch.MaterialSwitch;
 import com.google.gson.Gson;
-import com.google.zxing.integration.android.IntentIntegrator;
-import com.google.zxing.integration.android.IntentResult;
 import com.nutomic.syncthingandroid.R;
 import com.nutomic.syncthingandroid.model.Connections;
 import com.nutomic.syncthingandroid.model.Device;
@@ -82,9 +79,9 @@ public class DeviceActivity extends SyncthingActivity implements View.OnClickLis
 
     private TextView mCompressionValueView;
 
-    private SwitchCompat mIntroducerView;
+    private MaterialSwitch mIntroducerView;
 
-    private SwitchCompat mDevicePaused;
+    private MaterialSwitch mDevicePaused;
 
     private TextView mSyncthingVersionView;
 

diff --git a/app/src/main/java/com/nutomic/syncthingandroid/activities/FirstStartActivity.java b/app/src/main/java/com/nutomic/syncthingandroid/activities/FirstStartActivity.java
@@ -36,6 +36,7 @@
 import android.widget.TextView;
 import android.widget.Toast;
 
+import com.google.android.material.color.MaterialColors;
 import com.nutomic.syncthingandroid.R;
 import com.nutomic.syncthingandroid.SyncthingApp;
 import com.nutomic.syncthingandroid.service.Constants;
@@ -257,12 +258,12 @@ private void addBottomDots() {
     }
 
     private void setActiveBottomDot(int currentPage) {
-        int[] colorsActive = getResources().getIntArray(R.array.array_dot_active);
-        int[] colorsInactive = getResources().getIntArray(R.array.array_dot_inactive);
-        for (int i = 0; i < mDots.length; i++) {
-            mDots[i].setTextColor(colorsInactive[currentPage]);
+        int colorInactive = MaterialColors.getColor(this, R.attr.colorPrimary, Color.BLUE);
+        int colorActive = MaterialColors.getColor(this, R.attr.colorSecondary, Color.BLUE);
+        for (TextView mDot : mDots) {
+            mDot.setTextColor(colorInactive);
         }
-        mDots[currentPage].setTextColor(colorsActive[currentPage]);
+        mDots[currentPage].setTextColor(colorActive);
     }
 
     //  ViewPager change listener

diff --git a/app/src/main/java/com/nutomic/syncthingandroid/activities/FolderActivity.java b/app/src/main/java/com/nutomic/syncthingandroid/activities/FolderActivity.java
@@ -9,8 +9,6 @@
 import android.os.Build;
 import android.os.Bundle;
 import androidx.documentfile.provider.DocumentFile;
-import androidx.appcompat.widget.SwitchCompat;
-import androidx.appcompat.app.AlertDialog;
 import android.text.Editable;
 import android.text.TextUtils;
 import android.text.TextWatcher;
@@ -26,6 +24,7 @@
 import android.widget.TextView;
 import android.widget.Toast;
 
+import com.google.android.material.materialswitch.MaterialSwitch;
 import com.google.gson.Gson;
 import com.nutomic.syncthingandroid.R;
 import com.nutomic.syncthingandroid.model.Device;
@@ -93,8 +92,8 @@ public class FolderActivity extends SyncthingActivity
     private TextView mAccessExplanationView;
     private TextView mFolderTypeView;
     private TextView mFolderTypeDescriptionView;
-    private SwitchCompat mFolderFileWatcher;
-    private SwitchCompat mFolderPaused;
+    private MaterialSwitch mFolderFileWatcher;
+    private MaterialSwitch mFolderPaused;
     private ViewGroup mDevicesContainer;
     private TextView mPullOrderTypeView;
     private TextView mPullOrderDescriptionView;
@@ -644,7 +643,7 @@ private void addEmptyDeviceListView() {
 
     private void addDeviceViewAndSetListener(Device device, LayoutInflater inflater) {
         inflater.inflate(R.layout.item_device_form, mDevicesContainer);
-        SwitchCompat deviceView = (SwitchCompat) mDevicesContainer.getChildAt(mDevicesContainer.getChildCount()-1);
+        MaterialSwitch deviceView = (MaterialSwitch) mDevicesContainer.getChildAt(mDevicesContainer.getChildCount()-1);
         deviceView.setOnCheckedChangeListener(null);
         deviceView.setChecked(mFolder.getDevice(device.deviceID) != null);
         deviceView.setText(device.getDisplayName());

diff --git a/app/src/main/java/com/nutomic/syncthingandroid/activities/MainActivity.java b/app/src/main/java/com/nutomic/syncthingandroid/activities/MainActivity.java
@@ -2,6 +2,8 @@
 
 import android.annotation.SuppressLint;
 import android.app.Activity;
+
+import androidx.annotation.Nullable;
 import androidx.appcompat.app.AlertDialog;
 import android.app.Dialog;
 import android.content.ActivityNotFoundException;
@@ -18,8 +20,11 @@
 import android.os.Build;
 import android.os.Bundle;
 import android.os.IBinder;
+import android.os.PersistableBundle;
 import android.os.PowerManager;
 import android.provider.Settings;
+
+import com.google.android.material.color.DynamicColors;
 import com.google.android.material.tabs.TabLayout;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;

diff --git a/app/src/main/java/com/nutomic/syncthingandroid/activities/QRScannerActivity.java b/app/src/main/java/com/nutomic/syncthingandroid/activities/QRScannerActivity.java
@@ -60,8 +60,9 @@ protected void onStop() {
     // region === Permissions Callback ===
     @Override
     public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
+        super.onRequestPermissionsResult(requestCode, permissions, grantResults);
         if (requestCode == RC_HANDLE_CAMERA_PERM) {
-            if (grantResults.length !=0 && grantResults[0] == PackageManager.PERMISSION_GRANTED) {
+            if (grantResults.length != 0 && grantResults[0] == PackageManager.PERMISSION_GRANTED) {
                 startScanner();
             } else {
                 finish();

diff --git a/app/src/main/java/com/nutomic/syncthingandroid/activities/SettingsActivity.java b/app/src/main/java/com/nutomic/syncthingandroid/activities/SettingsActivity.java
@@ -1,6 +1,5 @@
 package com.nutomic.syncthingandroid.activities;
 
-import android.Manifest;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.content.pm.PackageManager;
@@ -56,17 +55,21 @@ public class SettingsActivity extends SyncthingActivity {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_preferences);
+        setTitle(R.string.settings_title);
+
         SettingsFragment settingsFragment = new SettingsFragment();
         Bundle bundle = new Bundle();
         bundle.putString(EXTRA_OPEN_SUB_PREF_SCREEN, getIntent().getStringExtra(EXTRA_OPEN_SUB_PREF_SCREEN));
         settingsFragment.setArguments(bundle);
         getFragmentManager().beginTransaction()
-                .replace(android.R.id.content, settingsFragment)
+                .replace(R.id.settings_container, settingsFragment)
                 .commit();
     }
 
     @Override
     public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
+        super.onRequestPermissionsResult(requestCode, permissions, grantResults);
         if (requestCode == Constants.PermissionRequestType.LOCATION.ordinal()) {
             boolean granted = grantResults.length > 0;
             for (int i = 0; i < grantResults.length; i++) {
@@ -80,9 +83,9 @@ public void onRequestPermissionsResult(int requestCode, @NonNull String[] permis
                         .setAction(SyncthingService.ACTION_REFRESH_NETWORK_INFO));
             } else {
                 Util.getAlertDialogBuilder(this)
-                    .setTitle(R.string.sync_only_wifi_ssids_location_permission_rejected_dialog_title)
-                    .setMessage(R.string.sync_only_wifi_ssids_location_permission_rejected_dialog_content)
-                    .setPositiveButton(android.R.string.ok, null).show();
+                        .setTitle(R.string.sync_only_wifi_ssids_location_permission_rejected_dialog_title)
+                        .setMessage(R.string.sync_only_wifi_ssids_location_permission_rejected_dialog_content)
+                        .setPositiveButton(android.R.string.ok, null).show();
             }
         }
     }

diff --git a/app/src/main/java/com/nutomic/syncthingandroid/util/Util.java b/app/src/main/java/com/nutomic/syncthingandroid/util/Util.java
@@ -13,6 +13,7 @@
 import android.util.Log;
 import android.widget.Toast;
 
+import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 import com.nutomic.syncthingandroid.R;
 import com.nutomic.syncthingandroid.service.Constants;
 
@@ -238,6 +239,6 @@ public static String formatPath(String path) {
      */
     public static AlertDialog.Builder getAlertDialogBuilder(Context context)
     {
-        return new AlertDialog.Builder(context, R.style.Theme_Syncthing_Dialog);
+        return new MaterialAlertDialogBuilder(context);
     }
 }
diff --git a/app/src/main/java/com/nutomic/syncthingandroid/views/DevicesAdapter.java b/app/src/main/java/com/nutomic/syncthingandroid/views/DevicesAdapter.java
@@ -4,12 +4,15 @@
 import android.content.res.Resources;
 import androidx.annotation.NonNull;
 import androidx.core.content.ContextCompat;
+
+import android.graphics.Color;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ArrayAdapter;
 import android.widget.TextView;
 
+import com.google.android.material.color.MaterialColors;
 import com.nutomic.syncthingandroid.R;
 import com.nutomic.syncthingandroid.model.Connections;
 import com.nutomic.syncthingandroid.model.Device;
@@ -63,7 +66,7 @@ public View getView(int position, View convertView, @NonNull ViewGroup parent) {
             download.setText(Util.readableTransferRate(getContext(), 0));
             upload.setText(Util.readableTransferRate(getContext(), 0));
             status.setText(r.getString(R.string.device_paused));
-            status.setTextColor(ContextCompat.getColor(getContext(), R.color.text_black));
+            status.setTextColor(MaterialColors.getColor(getContext(), android.R.attr.textColorPrimary, Color.BLACK));
             return convertView;
         }
 

diff --git a/app/src/main/java/com/nutomic/syncthingandroid/views/FoldersAdapter.java b/app/src/main/java/com/nutomic/syncthingandroid/views/FoldersAdapter.java
@@ -3,6 +3,8 @@
 import android.content.Context;
 import android.content.Intent;
 import androidx.databinding.DataBindingUtil;
+
+import android.graphics.Color;
 import android.net.Uri;
 import androidx.annotation.NonNull;
 import androidx.core.content.ContextCompat;
@@ -15,6 +17,7 @@
 import android.widget.TextView;
 import android.widget.Toast;
 
+import com.google.android.material.color.MaterialColors;
 import com.nutomic.syncthingandroid.R;
 import com.nutomic.syncthingandroid.databinding.ItemFolderListBinding;
 import com.nutomic.syncthingandroid.model.Folder;
@@ -107,7 +110,7 @@ private void updateFolderStatusView(ItemFolderListBinding binding, Folder folder
         } else {
             if (folder.paused) {
                 binding.state.setText(mContext.getString(R.string.state_paused));
-                binding.state.setTextColor(ContextCompat.getColor(mContext, R.color.text_black));
+                binding.state.setTextColor(MaterialColors.getColor(mContext, android.R.attr.textColorPrimary, Color.BLACK));
             } else {
                 binding.state.setText(getLocalizedState(mContext, folderStatus));
                 switch(folderStatus.state) {

diff --git a/app/src/main/res/drawable/dialog_bg_monet.xml b/app/src/main/res/drawable/dialog_bg_monet.xml
@@ -0,0 +1,22 @@
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape>
+            <solid android:color="?attr/colorSurface" />
+            <corners
+                android:bottomLeftRadius="28dp"
+                android:bottomRightRadius="28dp"
+                android:topLeftRadius="28dp"
+                android:topRightRadius="28dp" />
+        </shape>
+    </item>
+    <item>
+        <shape>
+            <solid android:color="@color/m3_popupmenu_overlay_color" />
+            <corners
+                android:bottomLeftRadius="28dp"
+                android:bottomRightRadius="28dp"
+                android:topLeftRadius="28dp"
+                android:topRightRadius="28dp" />
+        </shape>
+    </item>
+</layer-list>
diff --git a/app/src/main/res/drawable/ic_monochrome.xml b/app/src/main/res/drawable/ic_monochrome.xml
@@ -0,0 +1,20 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="192"
+    android:viewportHeight="192">
+    <path
+        android:fillColor="#00000000"
+        android:pathData="m140.62,99.65a45.18,45.18 0,0 1,-3.05 13.06m-33.76,27.72a45.18,45.18 0,0 1,-8.22 0.75,45.18 45.18,0 0,1 -30.83,-12.15M51.22,87.47A45.18,45.18 0,0 1,95.59 50.82,45.18 45.18,0 0,1 122.64,59.82"
+        android:strokeWidth="8.21444"
+        android:strokeColor="#000000"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#FF000000"
+        android:fillType="evenOdd"
+        android:pathData="m130.42,130.92a6.16,6.16 0,0 1,-6.16 6.16,6.16 6.16,0 0,1 -6.16,-6.16 6.16,6.16 0,0 1,6.16 -6.16,6.16 6.16,0 0,1 6.16,6.16zM142.91,77.39a6.16,6.16 0,0 1,-6.16 6.16,6.16 6.16,0 0,1 -6.16,-6.16 6.16,6.16 0,0 1,6.16 -6.16,6.16 6.16,0 0,1 6.16,6.16zM110.99,102.16a6.16,6.16 0,0 1,-6.16 6.16,6.16 6.16,0 0,1 -6.16,-6.16 6.16,6.16 0,0 1,6.16 -6.16,6.16 6.16,0 0,1 6.16,6.16zM58.8,110.01a6.16,6.16 0,0 1,-6.16 6.16,6.16 6.16,0 0,1 -6.16,-6.16 6.16,6.16 0,0 1,6.16 -6.16,6.16 6.16,0 0,1 6.16,6.16zM136.75,63.01a14.38,14.38 0,0 0,-14.38 14.38,14.38 14.38,0 0,0 1,5.18L113.19,90.47A14.38,14.38 0,0 0,104.83 87.79,14.38 14.38,0 0,0 90.6,100.15l-24.95,3.75a14.38,14.38 0,0 0,-13.01 -8.27,14.38 14.38,0 0,0 -14.38,14.38 14.38,14.38 0,0 0,14.38 14.38,14.38 14.38,0 0,0 14.23,-12.36l24.96,-3.75a14.38,14.38 0,0 0,13 8.27,14.38 14.38,0 0,0 4.3,-0.68l4.03,5.96a14.38,14.38 0,0 0,-3.27 9.1,14.38 14.38,0 0,0 14.38,14.38 14.38,14.38 0,0 0,14.38 -14.38,14.38 14.38,0 0,0 -14.38,-14.38 14.38,14.38 0,0 0,-4.3 0.67l-4.03,-5.96a14.38,14.38 0,0 0,3.27 -9.09,14.38 14.38,0 0,0 -0.98,-5.2l10.19,-7.91a14.38,14.38 0,0 0,8.34 2.71,14.38 14.38,0 0,0 14.38,-14.38 14.38,14.38 0,0 0,-14.38 -14.38z"
+        android:strokeWidth="0.684536"
+        tools:ignore="VectorPath" />
+</vector>