From 8d59a165b36198f9475fa6271e7fb33b6fa4a8fd Mon Sep 17 00:00:00 2001
From: Brendan Szymanski <brendan.szymanski1@gmail.com>
Date: Fri, 30 Nov 2018 20:46:37 -0500
Subject: [PATCH] Initial settings configuration

---
 app/build.gradle                              |  3 +-
 app/src/main/AndroidManifest.xml              | 11 ++-
 .../main/java/com/opus/abacus/MainActivity.kt |  5 +-
 .../java/com/opus/abacus/SettingsActivity.kt  | 66 +++++++++++++++++
 app/src/main/res/values/strings.xml           | 74 ++++++++++++++++++-
 app/src/main/res/values/styles.xml            |  7 +-
 app/src/main/res/xml/pref_settings.xml        | 22 ++++++
 7 files changed, 181 insertions(+), 7 deletions(-)
 create mode 100644 app/src/main/java/com/opus/abacus/SettingsActivity.kt
 create mode 100644 app/src/main/res/xml/pref_settings.xml

diff --git a/app/build.gradle b/app/build.gradle
index 9139dfe..9c1bca9 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -32,5 +32,6 @@ dependencies {
     testImplementation 'junit:junit:4.12'
     androidTestImplementation 'androidx.test:runner:1.1.0'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.0'
-    implementation "android.arch.lifecycle:extensions:1.1.1"
+    implementation 'android.arch.lifecycle:extensions:1.1.1'
+    implementation 'androidx.preference:preference:1.1.0-alpha01'
 }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 85030a5..3314c63 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -12,13 +12,22 @@
         <activity
                 android:name=".MainActivity"
                 android:label="@string/app_name"
-                android:theme="@style/AppTheme">
+                android:theme="@style/AppTheme.NoActionBar">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
 
                 <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity>
+        <activity
+                android:name=".SettingsActivity"
+                android:label="@string/title_activity_settings"
+                android:parentActivityName=".MainActivity"
+                android:theme="@style/AppTheme">
+            <meta-data
+                    android:name="android.support.PARENT_ACTIVITY"
+                    android:value="com.opus.abacus.MainActivity"/>
+        </activity>
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/app/src/main/java/com/opus/abacus/MainActivity.kt b/app/src/main/java/com/opus/abacus/MainActivity.kt
index 3de9c5b..bb009d0 100644
--- a/app/src/main/java/com/opus/abacus/MainActivity.kt
+++ b/app/src/main/java/com/opus/abacus/MainActivity.kt
@@ -6,6 +6,7 @@
 
 package com.opus.abacus
 
+import android.content.Intent
 import android.os.Bundle
 import android.view.MenuItem
 import androidx.appcompat.app.AppCompatActivity
@@ -56,7 +57,9 @@ class MainActivity : AppCompatActivity(), NavigationView.OnNavigationItemSelecte
 
             }
             R.id.nav_settings -> {
-
+                val settingsActivity = Intent(this, SettingsActivity::class.java)
+                startActivity(settingsActivity)
+                return true
             }
         }
 
diff --git a/app/src/main/java/com/opus/abacus/SettingsActivity.kt b/app/src/main/java/com/opus/abacus/SettingsActivity.kt
new file mode 100644
index 0000000..ff35bf7
--- /dev/null
+++ b/app/src/main/java/com/opus/abacus/SettingsActivity.kt
@@ -0,0 +1,66 @@
+/*
+ * Copyright (c) 2018 Abacus Project
+ * Licensed under GPLv3 or any later version
+ * Refer to the LICENSE file included in the root directory
+ */
+
+package com.opus.abacus
+
+import android.os.Bundle
+import android.view.MenuItem
+import androidx.appcompat.app.AppCompatActivity
+import androidx.core.app.NavUtils
+import androidx.preference.EditTextPreference
+import androidx.preference.PreferenceFragmentCompat
+
+
+class SettingsActivity : AppCompatActivity() {
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+        supportActionBar?.setDisplayHomeAsUpEnabled(true)
+
+        if (supportFragmentManager.findFragmentById(android.R.id.content) == null) {
+            supportFragmentManager.beginTransaction()
+                .add(android.R.id.content, SettingsFragment()).commit()
+        }
+    }
+
+    override fun onOptionsItemSelected(item: MenuItem): Boolean {
+        val id = item.itemId
+        if (id == android.R.id.home) {
+            NavUtils.navigateUpFromSameTask(this)
+        }
+        return super.onOptionsItemSelected(item)
+    }
+
+    class SettingsFragment : PreferenceFragmentCompat() {
+        override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
+            addPreferencesFromResource(R.xml.pref_settings)
+
+            val significantDigitsEditTextPreference =
+                this.findPreference("pref_significant_digits") as EditTextPreference
+            significantDigitsEditTextPreference.setOnPreferenceChangeListener { _, newValue ->
+                try {
+                    if (newValue.toString().toInt() < MIN_VALUE) {
+                        significantDigitsEditTextPreference.text = MIN_VALUE.toString()
+                        return@setOnPreferenceChangeListener false
+                    }
+                    if (newValue.toString().toInt() > MAX_VALUE) {
+                        significantDigitsEditTextPreference.text = MAX_VALUE.toString()
+                        return@setOnPreferenceChangeListener false
+                    }
+                } catch (exception: NumberFormatException) {
+                    return@setOnPreferenceChangeListener false
+                }
+                true
+            }
+        }
+
+        companion object {
+            const val MIN_VALUE = 1
+            const val MAX_VALUE = 23
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 227ed64..ea78c51 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -38,6 +38,76 @@
     <string name="calc_acos_text">acos</string>
     <string name="calc_atan_text">atan</string>
 
-    <!-- TODO: Remove or change this placeholder text -->
-    <string name="hello_blank_fragment">Hello blank fragment</string>
+    <!-- Strings related to Settings -->
+    <string name="title_activity_settings">Settings</string>
+
+    <!-- Example General settings -->
+    <string name="pref_header_general">General</string>
+
+    <string name="pref_title_social_recommendations">Enable social recommendations</string>
+    <string name="pref_description_social_recommendations">Recommendations for people to contact based on your message
+        history
+    </string>
+
+    <string name="pref_title_display_name">Display name</string>
+    <string name="pref_default_display_name">John Smith</string>
+
+    <string name="pref_title_add_friends_to_messages">Add friends to messages</string>
+    <string-array name="pref_example_list_titles">
+        <item>Always</item>
+        <item>When possible</item>
+        <item>Never</item>
+    </string-array>
+    <string-array name="pref_example_list_values">
+        <item>1</item>
+        <item>0</item>
+        <item>-1</item>
+    </string-array>
+
+    <!-- Example settings for Data & Sync -->
+    <string name="pref_header_data_sync">Data &amp; sync</string>
+
+    <string name="pref_title_sync_frequency">Sync frequency</string>
+    <string-array name="pref_sync_frequency_titles">
+        <item>15 minutes</item>
+        <item>30 minutes</item>
+        <item>1 hour</item>
+        <item>3 hours</item>
+        <item>6 hours</item>
+        <item>Never</item>
+    </string-array>
+    <string-array name="pref_sync_frequency_values">
+        <item>15</item>
+        <item>30</item>
+        <item>60</item>
+        <item>180</item>
+        <item>360</item>
+        <item>-1</item>
+    </string-array>
+
+    <string-array name="list_preference_entries">
+        <item>Entry 1</item>
+        <item>Entry 2</item>
+        <item>Entry 3</item>
+    </string-array>
+
+    <string-array name="list_preference_entry_values">
+        <item>1</item>
+        <item>2</item>
+        <item>3</item>
+    </string-array>
+
+    <string-array name="multi_select_list_preference_default_value"/>
+
+    <string name="pref_title_system_sync_settings">System sync settings</string>
+
+    <!-- Example settings for Notifications -->
+    <string name="pref_header_notifications">Notifications</string>
+
+    <string name="pref_title_new_message_notifications">New message notifications</string>
+
+    <string name="pref_title_ringtone">Ringtone</string>
+    <string name="pref_ringtone_silent">Silent</string>
+
+    <string name="pref_title_vibrate">Vibrate</string>
 </resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index aeb194a..703e5b0 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -7,15 +7,18 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
 
     <!-- Base application theme. -->
-    <style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar">
+    <style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
         <!-- Customize your theme here. -->
         <item name="colorPrimary">@color/colorPrimary</item>
-        <item name="colorPrimaryDark">@color/statusBarColor</item>
+        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
         <item name="colorAccent">@color/colorAccent</item>
+    </style>
 
+    <style name="AppTheme.NoActionBar" parent="AppTheme">
         <item name="windowActionBar">false</item>
         <item name="windowNoTitle">true</item>
         <item name="android:statusBarColor">@android:color/transparent</item>
+        <item name="colorPrimaryDark">@color/statusBarColor</item>
 
         <!-- On API >= 23 we can change the color of status bar icons to be black. -->
         <item name="android:windowLightStatusBar" tools:targetApi="23">true</item>
diff --git a/app/src/main/res/xml/pref_settings.xml b/app/src/main/res/xml/pref_settings.xml
new file mode 100644
index 0000000..7993fb4
--- /dev/null
+++ b/app/src/main/res/xml/pref_settings.xml
@@ -0,0 +1,22 @@
+<!--
+  ~ Copyright (c) 2018 Abacus Project
+  ~ Licensed under GPLv3 or any later version
+  ~ Refer to the LICENSE file included in the root directory
+  -->
+
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <PreferenceCategory
+            android:title="Calculator Settings">
+
+        <EditTextPreference
+                android:key="pref_significant_digits"
+                android:title="Significant digits"
+                android:summary="Number of significant digits to round to"
+                android:defaultValue="10"
+                android:selectAllOnFocus="true"
+                android:inputType="number"/>
+
+    </PreferenceCategory>
+
+</PreferenceScreen>
-- 
GitLab