Refactor SettingsActivity; clean up BaseScreen

android/android-base/src/main/java/org/isoron/androidbase/activities/BaseScreen.kt

@@ -154,27 +154,4 @@ open class BaseScreen(@JvmField protected var activity: BaseActivity) {
         val darkerColor = mixColors(baseColor, Color.BLACK, 0.75f)
         activity.window.statusBarColor = darkerColor
     }
-
-    companion object {
-        @JvmStatic
-        @Deprecated("")
-        fun getDefaultActionBarColor(context: Context) =
-                StyledResources(context).getColor(R.attr.colorPrimary)
-
-        @JvmStatic
-        @Deprecated("")
-        fun setupActionBarColor(activity: AppCompatActivity, color: Int) {
-            val toolbar = activity.findViewById<Toolbar>(R.id.toolbar) ?: return
-            activity.setSupportActionBar(toolbar)
-            val supportActionBar = activity.supportActionBar ?: return
-            supportActionBar.setDisplayHomeAsUpEnabled(true)
-            val drawable = ColorDrawable(color)
-            supportActionBar.setBackgroundDrawable(drawable)
-            val darkerColor = mixColors(color, Color.BLACK, 0.75f)
-            activity.window.statusBarColor = darkerColor
-            toolbar.elevation = dpToPixels(activity, 2f)
-            activity.findViewById<View>(R.id.toolbarShadow)?.visibility = View.GONE
-            activity.findViewById<View>(R.id.headerShadow)?.visibility = View.GONE
-        }
-    }
 }

android/uhabits-android/src/main/java/org/isoron/uhabits/activities/settings/SettingsActivity.java

@@ -1,59 +0,0 @@
-/*
- * Copyright (C) 2016 Álinson Santos Xavier <isoron@gmail.com>
- *
- * This file is part of Loop Habit Tracker.
- *
- * Loop Habit Tracker is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by the
- * Free Software Foundation, either version 3 of the License, or (at your
- * option) any later version.
- *
- * Loop Habit Tracker is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-package org.isoron.uhabits.activities.settings;
-
-import android.os.*;
-
-import org.isoron.androidbase.activities.*;
-import org.isoron.androidbase.utils.*;
-import org.isoron.uhabits.*;
-import org.isoron.uhabits.activities.*;
-
-/**
- * Activity that allows the user to view and modify the app settings.
- */
-public class SettingsActivity extends BaseActivity
-{
-    private AndroidThemeSwitcher themeSwitcher;
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState)
-    {
-        super.onCreate(savedInstanceState);
-
-        HabitsApplicationComponent compoenent = ((HabitsApplication) getApplication()).getComponent();
-        themeSwitcher = new AndroidThemeSwitcher(this, compoenent.getPreferences());
-        themeSwitcher.apply();
-
-        setContentView(R.layout.settings_activity);
-        setupActionBarColor();
-    }
-
-    private void setupActionBarColor()
-    {
-        StyledResources res = new StyledResources(this);
-        int color = BaseScreen.getDefaultActionBarColor(this);
-
-        if (res.getBoolean(R.attr.useHabitColorAsPrimary))
-            color = res.getColor(R.attr.aboutScreenColor);
-
-        BaseScreen.setupActionBarColor(this, color);
-    }
-}

android/uhabits-android/src/main/java/org/isoron/uhabits/activities/settings/SettingsActivity.kt

@@ -0,0 +1,44 @@
+/*
+ * Copyright (C) 2016 Álinson Santos Xavier <isoron@gmail.com>
+ *
+ * This file is part of Loop Habit Tracker.
+ *
+ * Loop Habit Tracker is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by the
+ * Free Software Foundation, either version 3 of the License, or (at your
+ * option) any later version.
+ *
+ * Loop Habit Tracker is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.isoron.uhabits.activities.settings
+
+import android.os.*
+import android.view.*
+import org.isoron.androidbase.activities.*
+import org.isoron.uhabits.*
+import org.isoron.uhabits.activities.*
+import org.isoron.uhabits.core.models.*
+import org.isoron.uhabits.databinding.*
+import org.isoron.uhabits.utils.*
+
+class SettingsActivity : BaseActivity() {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        val component = (application as HabitsApplication).component
+        AndroidThemeSwitcher(this, component.preferences).apply()
+
+        val binding = SettingsActivityBinding.inflate(LayoutInflater.from(this))
+        binding.root.setupToolbar(
+                toolbar = binding.toolbar,
+                title = resources.getString(R.string.settings),
+                color = PaletteColor(11),
+        )
+        setContentView(binding.root)
+    }
+}