Adding dark theme (closes #653) (#1301)

app/src/main/java/com/nutomic/syncthingandroid/activities/DeviceActivity.java

@@ -378,7 +378,7 @@ public class DeviceActivity extends SyncthingActivity implements View.OnClickLis
     }
 
     private Dialog createDeleteDialog(){
-        return new android.app.AlertDialog.Builder(this)
+        return Util.getAlertDialogBuilder(this)
                 .setMessage(R.string.remove_device_confirm)
                 .setPositiveButton(android.R.string.yes, (dialogInterface, i) -> {
                     getApi().removeDevice(mDevice.deviceID);
@@ -413,7 +413,7 @@ public class DeviceActivity extends SyncthingActivity implements View.OnClickLis
     private void prepareEditMode() {
         getWindow().setSoftInputMode(SOFT_INPUT_STATE_ALWAYS_HIDDEN);
 
-        Drawable dr = ContextCompat.getDrawable(this, R.drawable.ic_content_copy_black_24dp);
+        Drawable dr = ContextCompat.getDrawable(this, R.drawable.ic_content_copy_24dp);
         mIdView.setCompoundDrawablesWithIntrinsicBounds(null, null, dr, null);
         mIdView.setEnabled(false);
         mQrButton.setVisibility(GONE);
@@ -461,7 +461,7 @@ public class DeviceActivity extends SyncthingActivity implements View.OnClickLis
     }
 
     private Dialog createCompressionDialog(){
-        return new AlertDialog.Builder(this)
+        return Util.getAlertDialogBuilder(this)
                 .setTitle(R.string.compression)
                 .setSingleChoiceItems(R.array.compress_entries,
                         Compression.fromValue(this, mDevice.compression).getIndex(),
@@ -497,7 +497,7 @@ public class DeviceActivity extends SyncthingActivity implements View.OnClickLis
     }
 
     private Dialog createDiscardDialog() {
-        return new android.app.AlertDialog.Builder(this)
+        return Util.getAlertDialogBuilder(this)
                 .setMessage(R.string.dialog_discard_changes)
                 .setPositiveButton(android.R.string.ok, (dialog, which) -> finish())
                 .setNegativeButton(android.R.string.cancel, null)

app/src/main/java/com/nutomic/syncthingandroid/activities/FolderActivity.java

@@ -1,9 +1,7 @@
 package com.nutomic.syncthingandroid.activities;
 
 import android.annotation.SuppressLint;
-import android.annotation.TargetApi;
 import android.app.Activity;
-import android.app.AlertDialog;
 import android.app.Dialog;
 import android.content.ActivityNotFoundException;
 import android.content.Intent;
@@ -12,6 +10,7 @@ import android.os.Build;
 import android.os.Bundle;
 import android.support.v4.provider.DocumentFile;
 import android.support.v7.widget.SwitchCompat;
+import android.support.v7.app.AlertDialog;
 import android.text.Editable;
 import android.text.TextUtils;
 import android.text.TextWatcher;
@@ -27,7 +26,6 @@ import android.widget.LinearLayout;
 import android.widget.TextView;
 import android.widget.Toast;
 
-import com.google.common.base.Objects;
 import com.google.gson.Gson;
 import com.nutomic.syncthingandroid.R;
 import com.nutomic.syncthingandroid.model.Device;
@@ -116,7 +114,7 @@ public class FolderActivity extends SyncthingActivity
         @Override
         public void afterTextChanged(Editable s) {
             mFolder.label        = mLabelView.getText().toString();
-            mFolder.id           = mIdView.getText().toString();;
+            mFolder.id           = mIdView.getText().toString();
             // mPathView must not be handled here as it's handled by {@link onActivityResult}
             mFolderNeedsToUpdate = true;
         }
@@ -498,7 +496,7 @@ public class FolderActivity extends SyncthingActivity
     }
 
     private Dialog createDeleteDialog(){
-        return new AlertDialog.Builder(this)
+        return Util.getAlertDialogBuilder(this)
                 .setMessage(R.string.remove_folder_confirm)
                 .setPositiveButton(android.R.string.yes, (dialogInterface, i) -> {
                     RestApi restApi = getApi();
@@ -676,7 +674,7 @@ public class FolderActivity extends SyncthingActivity
     }
 
     private Dialog createDiscardDialog() {
-        return new AlertDialog.Builder(this)
+        return Util.getAlertDialogBuilder(this)
                 .setMessage(R.string.dialog_discard_changes)
                 .setPositiveButton(android.R.string.ok, (dialog, which) -> finish())
                 .setNegativeButton(android.R.string.cancel, null)

app/src/main/java/com/nutomic/syncthingandroid/activities/FolderPickerActivity.java

@@ -2,7 +2,6 @@ package com.nutomic.syncthingandroid.activities;
 
 import android.annotation.SuppressLint;
 import android.app.Activity;
-import android.app.AlertDialog;
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
@@ -15,6 +14,7 @@ import android.preference.PreferenceManager;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.v4.content.ContextCompat;
+import android.support.v7.app.AlertDialog;
 import android.text.TextUtils;
 import android.view.Menu;
 import android.view.MenuItem;
@@ -186,7 +186,7 @@ public class FolderPickerActivity extends SyncthingActivity
         switch (item.getItemId()) {
             case R.id.create_folder:
                 final EditText et = new EditText(this);
-                AlertDialog dialog = new AlertDialog.Builder(this)
+                AlertDialog dialog = Util.getAlertDialogBuilder(this)
                         .setTitle(R.string.create_folder)
                         .setView(et)
                         .setPositiveButton(android.R.string.ok,

app/src/main/java/com/nutomic/syncthingandroid/activities/FolderTypeDialogActivity.java

@@ -3,7 +3,6 @@ package com.nutomic.syncthingandroid.activities;
 import android.app.Activity;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
 import android.view.View;
 import android.widget.AdapterView;
 import android.widget.Button;
@@ -14,7 +13,7 @@ import com.nutomic.syncthingandroid.service.Constants;
 import java.util.Arrays;
 import java.util.List;
 
-public class FolderTypeDialogActivity extends AppCompatActivity {
+public class FolderTypeDialogActivity extends ThemedAppCompatActivity {
 
     public static final String EXTRA_FOLDER_TYPE = "com.nutomic.syncthinandroid.activities.FolderTypeDialogActivity.FOLDER_TYPE";
     public static final String EXTRA_RESULT_FOLDER_TYPE = "com.nutomic.syncthinandroid.activities.FolderTypeDialogActivity.EXTRA_RESULT_FOLDER_TYPE";

app/src/main/java/com/nutomic/syncthingandroid/activities/MainActivity.java

@@ -2,7 +2,7 @@ package com.nutomic.syncthingandroid.activities;
 
 import android.annotation.SuppressLint;
 import android.app.Activity;
-import android.app.AlertDialog;
+import android.support.v7.app.AlertDialog;
 import android.app.Dialog;
 import android.content.ActivityNotFoundException;
 import android.content.ComponentName;
@@ -140,7 +140,7 @@ public class MainActivity extends StateDialogActivity
             return;
         }
 
-        mBatteryOptimizationsDialog = new AlertDialog.Builder(this)
+        mBatteryOptimizationsDialog = Util.getAlertDialogBuilder(this)
                 .setTitle(R.string.dialog_disable_battery_optimization_title)
                 .setMessage(R.string.dialog_disable_battery_optimization_message)
                 .setPositiveButton(R.string.dialog_disable_battery_optimization_turn_off, (d, i) -> {
@@ -359,7 +359,7 @@ public class MainActivity extends StateDialogActivity
     }
 
     private Dialog createRestartDialog(){
-        return  new AlertDialog.Builder(this)
+        return  Util.getAlertDialogBuilder(this)
                 .setMessage(R.string.dialog_confirm_restart)
                 .setPositiveButton(android.R.string.yes, (dialogInterface, i1) -> this.startService(new Intent(this, SyncthingService.class)
                         .setAction(SyncthingService.ACTION_RESTART)))
@@ -379,7 +379,7 @@ public class MainActivity extends StateDialogActivity
         shareDeviceIdTextView.setOnClickListener(v -> shareDeviceId(deviceId));
         qrCodeImageView.setImageBitmap(qrCode);
 
-        mQrCodeDialog = new AlertDialog.Builder(this)
+        mQrCodeDialog = Util.getAlertDialogBuilder(this)
                 .setTitle(R.string.device_id)
                 .setView(qrCodeDialogView)
                 .setPositiveButton(R.string.finish, null)
@@ -514,7 +514,7 @@ public class MainActivity extends StateDialogActivity
                     .inflate(R.layout.dialog_usage_reporting, null);
             TextView tv = v.findViewById(R.id.example);
             tv.setText(report);
-            new AlertDialog.Builder(MainActivity.this)
+            Util.getAlertDialogBuilder(MainActivity.this)
                     .setTitle(R.string.usage_reporting_dialog_title)
                     .setView(v)
                     .setPositiveButton(R.string.yes, listener)

app/src/main/java/com/nutomic/syncthingandroid/activities/PullOrderDialogActivity.java

@@ -3,7 +3,6 @@ package com.nutomic.syncthingandroid.activities;
 import android.app.Activity;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
 import android.view.View;
 import android.widget.AdapterView;
 import android.widget.Button;
@@ -13,7 +12,7 @@ import com.nutomic.syncthingandroid.R;
 import java.util.Arrays;
 import java.util.List;
 
-public class PullOrderDialogActivity extends AppCompatActivity {
+public class PullOrderDialogActivity extends ThemedAppCompatActivity {
 
     public static final String EXTRA_PULL_ORDER = "com.nutomic.syncthinandroid.activities.PullOrderDialogActivity.PULL_ORDER";
     public static final String EXTRA_RESULT_PULL_ORDER = "com.nutomic.syncthinandroid.activities.PullOrderDialogActivity.EXTRA_RESULT_PULL_ORDER";

app/src/main/java/com/nutomic/syncthingandroid/activities/SettingsActivity.java

@@ -1,7 +1,6 @@
 package com.nutomic.syncthingandroid.activities;
 
 import android.Manifest;
-import android.app.AlertDialog;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.content.pm.PackageManager;
@@ -17,6 +16,7 @@ import android.preference.PreferenceManager;
 import android.preference.PreferenceScreen;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
+import android.support.v4.app.TaskStackBuilder;
 import android.text.TextUtils;
 import android.util.Log;
 import android.widget.ListAdapter;
@@ -74,7 +74,7 @@ public class SettingsActivity extends SyncthingActivity {
                         this.startService(new Intent(this, SyncthingService.class)
                                 .setAction(SyncthingService.ACTION_REFRESH_NETWORK_INFO));
                     } else {
-                        new AlertDialog.Builder(this)
+                        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();
@@ -265,6 +265,9 @@ public class SettingsActivity extends SyncthingActivity {
             handleSocksProxyPreferenceChange(screen.findPreference(Constants.PREF_SOCKS_PROXY_ADDRESS),  mPreferences.getString(Constants.PREF_SOCKS_PROXY_ADDRESS, ""));
             handleHttpProxyPreferenceChange(screen.findPreference(Constants.PREF_HTTP_PROXY_ADDRESS), mPreferences.getString(Constants.PREF_HTTP_PROXY_ADDRESS, ""));
 
+            ListPreference themePreference = (ListPreference) findPreference(Constants.PREF_APP_THEME);
+            themePreference.setOnPreferenceChangeListener(this);
+
             try {
                 appVersion.setSummary(getActivity().getPackageManager()
                         .getPackageInfo(getActivity().getPackageName(), 0).versionName);
@@ -311,8 +314,8 @@ public class SettingsActivity extends SyncthingActivity {
         public void onServiceStateChange(SyncthingService.State currentState) {
             mApi = mSyncthingService.getApi();
             boolean isSyncthingRunning = (mApi != null) &&
-                        mApi.isConfigLoaded() &&
-                        (currentState == SyncthingService.State.ACTIVE);
+                mApi.isConfigLoaded() &&
+                (currentState == SyncthingService.State.ACTIVE);
             mCategorySyncthingOptions.setEnabled(isSyncthingRunning);
             mCategoryBackup.setEnabled(isSyncthingRunning);
 
@@ -511,6 +514,13 @@ public class SettingsActivity extends SyncthingActivity {
                         return false;
                     }
                     break;
+                case Constants.PREF_APP_THEME:
+                    // Recreate activities with the correct colors
+                    TaskStackBuilder.create(getActivity())
+                            .addNextIntent(new Intent(getActivity(), MainActivity.class))
+                            .addNextIntent(getActivity().getIntent())
+                            .startActivities();
+                    break;
             }
 
             return true;
@@ -531,7 +541,7 @@ public class SettingsActivity extends SyncthingActivity {
                     }
                     return true;
                 case KEY_EXPORT_CONFIG:
-                    new AlertDialog.Builder(getActivity())
+                    Util.getAlertDialogBuilder(getActivity())
                             .setMessage(R.string.dialog_confirm_export)
                             .setPositiveButton(android.R.string.yes, (dialog, which) -> {
                                         mSyncthingService.exportConfig();
@@ -543,7 +553,7 @@ public class SettingsActivity extends SyncthingActivity {
                             .show();
                     return true;
                 case KEY_IMPORT_CONFIG:
-                    new AlertDialog.Builder(getActivity())
+                    Util.getAlertDialogBuilder(getActivity())
                             .setMessage(R.string.dialog_confirm_import)
                             .setPositiveButton(android.R.string.yes, (dialog, which) -> {
                                         if (mSyncthingService.importConfig()) {
@@ -562,7 +572,7 @@ public class SettingsActivity extends SyncthingActivity {
                             .show();
                     return true;
                 case KEY_UNDO_IGNORED_DEVICES_FOLDERS:
-                    new AlertDialog.Builder(getActivity())
+                    Util.getAlertDialogBuilder(getActivity())
                             .setMessage(R.string.undo_ignored_devices_folders_question)
                             .setPositiveButton(android.R.string.yes, (dialog, which) -> {
                                 if (mApi == null) {
@@ -584,7 +594,7 @@ public class SettingsActivity extends SyncthingActivity {
                     intent = new Intent(getActivity(), SyncthingService.class)
                             .setAction(SyncthingService.ACTION_RESET_DATABASE);
 
-                    new AlertDialog.Builder(getActivity())
+                    Util.getAlertDialogBuilder(getActivity())
                             .setTitle(R.string.st_reset_database_title)
                             .setMessage(R.string.st_reset_database_question)
                             .setPositiveButton(android.R.string.ok, (dialogInterface, i) -> {
@@ -599,7 +609,7 @@ public class SettingsActivity extends SyncthingActivity {
                     intent = new Intent(getActivity(), SyncthingService.class)
                             .setAction(SyncthingService.ACTION_RESET_DELTAS);
 
-                    new AlertDialog.Builder(getActivity())
+                    Util.getAlertDialogBuilder(getActivity())
                             .setTitle(R.string.st_reset_deltas_title)
                             .setMessage(R.string.st_reset_deltas_question)
                             .setPositiveButton(android.R.string.ok, (dialogInterface, i) -> {

app/src/main/java/com/nutomic/syncthingandroid/activities/StateDialogActivity.java

@@ -1,6 +1,5 @@
 package com.nutomic.syncthingandroid.activities;
 
-import android.app.AlertDialog;
 import android.content.Intent;
 import android.databinding.DataBindingUtil;
 import android.os.Bundle;
@@ -8,6 +7,7 @@ import android.os.Handler;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.v4.app.ActivityCompat;
+import android.support.v7.app.AlertDialog;
 import android.view.View;
 
 import com.nutomic.syncthingandroid.R;
@@ -108,7 +108,7 @@ public abstract class StateDialogActivity extends SyncthingActivity {
             return;
         }
 
-        mDisabledDialog = new AlertDialog.Builder(this)
+        mDisabledDialog = Util.getAlertDialogBuilder(this)
                 .setTitle(R.string.syncthing_disabled_title)
                 .setMessage(getDisabledDialogMessage())
                 .setPositiveButton(R.string.syncthing_disabled_change_settings,
@@ -164,7 +164,7 @@ public abstract class StateDialogActivity extends SyncthingActivity {
                 ? R.string.web_gui_creating_key
                 : R.string.api_loading);
 
-        mLoadingDialog = new AlertDialog.Builder(this)
+        mLoadingDialog = Util.getAlertDialogBuilder(this)
                 .setCancelable(false)
                 .setView(binding.getRoot())
                 .show();

app/src/main/java/com/nutomic/syncthingandroid/activities/SyncthingActivity.java

@@ -6,7 +6,6 @@ import android.content.Intent;
 import android.content.ServiceConnection;
 import android.os.Bundle;
 import android.os.IBinder;
-import android.support.v7.app.AppCompatActivity;
 import android.support.v7.widget.Toolbar;
 
 import com.annimon.stream.Stream;
@@ -20,7 +19,7 @@ import java.util.LinkedList;
 /**
  * Connects to {@link SyncthingService} and provides access to it.
  */
-public abstract class SyncthingActivity extends AppCompatActivity implements ServiceConnection {
+public abstract class SyncthingActivity extends ThemedAppCompatActivity implements ServiceConnection {
 
     public static final String EXTRA_KEY_GENERATION_IN_PROGRESS = "com.nutomic.syncthing-android.SyncthingActivity.KEY_GENERATION_IN_PROGRESS";
 

app/src/main/java/com/nutomic/syncthingandroid/activities/ThemedAppCompatActivity.java

@@ -0,0 +1,27 @@
+package com.nutomic.syncthingandroid.activities;
+
+import android.content.SharedPreferences;
+import android.os.Bundle;
+import android.preference.PreferenceManager;
+import android.support.v7.app.AppCompatActivity;
+import android.support.v7.app.AppCompatDelegate;
+
+import com.nutomic.syncthingandroid.service.Constants;
+
+/**
+ * Provides a themed instance of AppCompatActivity.
+ */
+public class ThemedAppCompatActivity extends AppCompatActivity {
+
+    private static final String LIGHT_THEME = "1";
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        // Load theme.
+        SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
+        Integer prefAppTheme = Integer.parseInt(prefs.getString(Constants.PREF_APP_THEME, LIGHT_THEME));
+        AppCompatDelegate.setDefaultNightMode(prefAppTheme);
+        super.onCreate(savedInstanceState);
+    }
+
+}

app/src/main/java/com/nutomic/syncthingandroid/activities/VersioningDialogActivity.java

@@ -5,7 +5,6 @@ import android.content.Intent;
 import android.os.Bundle;
 import android.support.v4.app.Fragment;
 import android.support.v4.app.FragmentTransaction;
-import android.support.v7.app.AppCompatActivity;
 import android.view.View;
 import android.widget.AdapterView;
 import android.widget.Button;
@@ -20,7 +19,7 @@ import com.nutomic.syncthingandroid.fragments.dialog.TrashCanVersioningFragment;
 import java.util.Arrays;
 import java.util.List;
 
-public class VersioningDialogActivity extends AppCompatActivity {
+public class VersioningDialogActivity extends ThemedAppCompatActivity {
 
     private Fragment mCurrentFragment;
 
@@ -131,4 +130,4 @@ public class VersioningDialogActivity extends AppCompatActivity {
         saveConfiguration();
         super.onBackPressed();
     }
-}
+}

app/src/main/java/com/nutomic/syncthingandroid/fragments/DrawerFragment.java

@@ -1,12 +1,12 @@
 package com.nutomic.syncthingandroid.fragments;
 
-import android.app.AlertDialog;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.os.Bundle;
 import android.preference.PreferenceManager;
 import android.support.v4.app.Fragment;
 import android.support.v4.content.ContextCompat;
+import android.support.v7.app.AlertDialog;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -256,7 +256,7 @@ public class DrawerFragment extends Fragment implements View.OnClickListener {
                      * App is running as a service. Show an explanation why exiting syncthing is an
                      * extraordinary request, then ask the user to confirm.
                      */
-                    AlertDialog mExitConfirmationDialog = new AlertDialog.Builder(mActivity)
+                    AlertDialog mExitConfirmationDialog = Util.getAlertDialogBuilder(mActivity)
                             .setTitle(R.string.dialog_exit_while_running_as_service_title)
                             .setMessage(R.string.dialog_exit_while_running_as_service_message)
                             .setPositiveButton(R.string.yes, (d, i) -> {

app/src/main/java/com/nutomic/syncthingandroid/service/Constants.java

@@ -25,6 +25,7 @@ public class Constants {
     // Preferences - Behaviour
     public static final String PREF_FIRST_START                 = "first_start";
     public static final String PREF_START_INTO_WEB_GUI          = "start_into_web_gui";
+    public static final String PREF_APP_THEME                   = "theme";
     public static final String PREF_USE_ROOT                    = "use_root";
     public static final String PREF_ENVIRONMENT_VARIABLES       = "environment_variables";
     public static final String PREF_DEBUG_FACILITIES_ENABLED    = "debug_facilities_enabled";

app/src/main/java/com/nutomic/syncthingandroid/util/Util.java

@@ -9,6 +9,7 @@ import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageManager.NameNotFoundException;
 import android.os.Build;
 import android.preference.PreferenceManager;
+import android.support.v7.app.AlertDialog;
 import android.util.Log;
 import android.widget.Toast;
 
@@ -230,4 +231,12 @@ public class Util {
     public static String formatPath(String path) {
         return new File(path).toURI().normalize().getPath();
     }
+
+    /**
+     * @return a themed AlertDialog builder.
+     */
+    public static AlertDialog.Builder getAlertDialogBuilder(Context context)
+    {
+        return new AlertDialog.Builder(context, R.style.Theme_Syncthing_Dialog);
+    }
 }