diff --git a/res/drawable-hdpi/frame.9.png b/res/drawable-hdpi/frame.9.png
new file mode 100644
index 0000000000..cffbb18a8e
Binary files /dev/null and b/res/drawable-hdpi/frame.9.png differ
diff --git a/res/drawable-mdpi/frame.9.png b/res/drawable-mdpi/frame.9.png
new file mode 100644
index 0000000000..12c76d9e42
Binary files /dev/null and b/res/drawable-mdpi/frame.9.png differ
diff --git a/res/drawable-xhdpi/frame.9.png b/res/drawable-xhdpi/frame.9.png
new file mode 100644
index 0000000000..ae428f1ef8
Binary files /dev/null and b/res/drawable-xhdpi/frame.9.png differ
diff --git a/res/drawable-xxhdpi/frame.9.png b/res/drawable-xxhdpi/frame.9.png
new file mode 100644
index 0000000000..120afe4d3e
Binary files /dev/null and b/res/drawable-xxhdpi/frame.9.png differ
diff --git a/res/drawable-xxxhdpi/frame.9.png b/res/drawable-xxxhdpi/frame.9.png
new file mode 100644
index 0000000000..5859e3742a
Binary files /dev/null and b/res/drawable-xxxhdpi/frame.9.png differ
diff --git a/res/drawable/frame.9.png b/res/drawable/frame.9.png
new file mode 100644
index 0000000000..0b90ca9358
Binary files /dev/null and b/res/drawable/frame.9.png differ
diff --git a/res/drawable/lowered.xml b/res/drawable/lowered.xml
new file mode 100644
index 0000000000..4eea97e991
--- /dev/null
+++ b/res/drawable/lowered.xml
@@ -0,0 +1,27 @@
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+
+
\ No newline at end of file
diff --git a/res/drawable/raised.xml b/res/drawable/raised.xml
new file mode 100644
index 0000000000..99b27e9e7e
--- /dev/null
+++ b/res/drawable/raised.xml
@@ -0,0 +1,27 @@
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+
+
\ No newline at end of file
diff --git a/res/layout/new_save_list_item.xml b/res/layout/new_save_list_item.xml
index 792115a9b7..77c4020e55 100644
--- a/res/layout/new_save_list_item.xml
+++ b/res/layout/new_save_list_item.xml
@@ -11,10 +11,11 @@
android:id="@+id/imageView2"
android:layout_width="120dp"
android:layout_height="80dp"
+ android:contentDescription="Plus Icon"
+ android:scaleType="centerInside"
android:src="@drawable/baseline_add_24"
app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toTopOf="parent"
- android:contentDescription="Plus Icon" />
+ app:layout_constraintTop_toTopOf="parent" />
+ android:layout_height="match_parent"
+ android:background="@color/cth_window_background"
+ android:orientation="vertical">
+
+
+
+
+
+
+
+
+
+ android:layout_height="match_parent" />
\ No newline at end of file
diff --git a/res/layout/save_list_item.xml b/res/layout/save_list_item.xml
index 60b42991f5..774545a1a2 100644
--- a/res/layout/save_list_item.xml
+++ b/res/layout/save_list_item.xml
@@ -5,7 +5,8 @@
android:id="@+id/saveLayout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_marginVertical="4dp">
+ android:layout_marginVertical="4dp"
+ android:padding="4dp">
+ android:layout_height="match_parent"
+ android:background="@color/cth_window_background"
+ android:orientation="vertical">
+
+
+
+
+
+
+
+
+
+ android:layout_height="match_parent" />
\ No newline at end of file
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 89cad66c79..21fa46e378 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -1,7 +1,10 @@
- #FF039BE5
- #FF01579B
- #FF40C4FF
- #FF00B0FF
- #66000000
+ #9a92c6
+ #fdfdfd
+ #DDDDDD
+ #2b2b2b
+ #aea6da
+ #d6ceff
+ #867eb2
+
\ No newline at end of file
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 44b08b825e..ae7768c3f1 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -3,16 +3,99 @@
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
#000000
@@ -51,9 +134,4 @@
-
-
\ No newline at end of file
diff --git a/res/xml/main_preferences.xml b/res/xml/main_preferences.xml
index b3f64dcfe4..6cd4540f7c 100644
--- a/res/xml/main_preferences.xml
+++ b/res/xml/main_preferences.xml
@@ -1,4 +1,5 @@
-
+
getString(R.string.save_game)
true -> getString(R.string.load_game)
}
+
+ supportActionBar?.setDisplayHomeAsUpEnabled(true)
+ supportActionBar?.setDisplayShowTitleEnabled(false)
+ }
+
+ override fun onOptionsItemSelected(item: MenuItem): Boolean {
+ when (item.itemId) {
+ android.R.id.home -> {
+ finish()
+ return true
+ }
+ }
+ return super.onOptionsItemSelected(item)
+ }
+
+
+ override fun setTitle(title: CharSequence?) {
+ super.setTitle(title)
+ (findViewById(R.id.toolbar_title)).text = title
}
companion object {
diff --git a/src/Java/uk/co/armedpineapple/cth/settings/SettingsActivity.kt b/src/Java/uk/co/armedpineapple/cth/settings/SettingsActivity.kt
index 4960a07552..a1524031b2 100644
--- a/src/Java/uk/co/armedpineapple/cth/settings/SettingsActivity.kt
+++ b/src/Java/uk/co/armedpineapple/cth/settings/SettingsActivity.kt
@@ -4,29 +4,36 @@ import android.content.Intent
import android.content.SharedPreferences
import android.os.Bundle
import android.util.Log
+import android.view.MenuItem
+import android.view.Window
+import android.widget.TextView
import androidx.appcompat.app.AppCompatActivity
+import androidx.appcompat.widget.Toolbar
import androidx.preference.Preference
import androidx.preference.PreferenceFragmentCompat
import uk.co.armedpineapple.cth.CTHApplication
import uk.co.armedpineapple.cth.GameActivity
+import uk.co.armedpineapple.cth.Loggable
import uk.co.armedpineapple.cth.R
import uk.co.armedpineapple.cth.defaultSharedPreferences
+import uk.co.armedpineapple.cth.info
import uk.co.armedpineapple.cth.setup.SetupActivity
-class SettingsActivity : AppCompatActivity(),
+class SettingsActivity : AppCompatActivity(), Loggable,
PreferenceFragmentCompat.OnPreferenceStartFragmentCallback {
private val preferenceListener = { preferences: SharedPreferences, preference: String? ->
onPreferenceUpdated(
- preferences,
- preference
+ preferences, preference
)
}
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
+ supportRequestWindowFeature(Window.FEATURE_NO_TITLE)
setContentView(R.layout.settings_activity)
+ setSupportActionBar(findViewById(R.id.toolbar))
if (savedInstanceState == null) {
supportFragmentManager.beginTransaction().replace(R.id.settings, MainFragment())
.commit()
@@ -37,6 +44,7 @@ class SettingsActivity : AppCompatActivity(),
}
}
supportActionBar?.setDisplayHomeAsUpEnabled(true)
+ supportActionBar?.setDisplayShowTitleEnabled(false)
}
override fun onResume() {
@@ -44,8 +52,20 @@ class SettingsActivity : AppCompatActivity(),
defaultSharedPreferences.registerOnSharedPreferenceChangeListener(preferenceListener)
}
- private fun onPreferenceUpdated(preferences: SharedPreferences, preference: String?){
- Log.i("SettingsActivity", "Setting updated: $preference")
+ override fun onOptionsItemSelected(item: MenuItem): Boolean {
+ when (item.itemId) {
+ android.R.id.home -> {
+ if (supportFragmentManager.backStackEntryCount == 0) {
+ finish()
+ return true
+ }
+ }
+ }
+ return super.onOptionsItemSelected(item)
+ }
+
+ private fun onPreferenceUpdated(preferences: SharedPreferences, preference: String?) {
+ info { "Setting updated: $preference" }
GameActivity.singleton.updateGameConfig()
}
@@ -55,6 +75,11 @@ class SettingsActivity : AppCompatActivity(),
defaultSharedPreferences.unregisterOnSharedPreferenceChangeListener(preferenceListener)
}
+ override fun setTitle(title: CharSequence?) {
+ super.setTitle(title)
+ (findViewById(R.id.toolbar_title)).text = title
+ }
+
override fun onSaveInstanceState(outState: Bundle) {
super.onSaveInstanceState(outState)
}