unyaunya

2 files changed, 8 insertions, 9 deletions

diff --git a/app/src/main/java/net/lacolaco/smileessence/World.kt b/app/src/main/java/net/lacolaco/smileessence/World.kt
index 4e51396f..e9bab4d3 100644
--- a/app/src/main/java/net/lacolaco/smileessence/World.kt
+++ b/app/src/main/java/net/lacolaco/smileessence/World.kt
@@ -151,7 +151,7 @@ class World private constructor(private val persistentData: PersistentData) {
     }
 
 
-    fun checkpoint() {
+    fun checkpoint() = launchBg {
         persistentData.screenName = user.screenName
         persistentData.profileImageUrl = user.profileImageUrl
         persistentData.save()
diff --git a/app/src/main/java/net/lacolaco/smileessence/activity/ManageProfilesActivity.kt b/app/src/main/java/net/lacolaco/smileessence/activity/ManageProfilesActivity.kt
index 7e8460f2..781af40d 100644
--- a/app/src/main/java/net/lacolaco/smileessence/activity/ManageProfilesActivity.kt
+++ b/app/src/main/java/net/lacolaco/smileessence/activity/ManageProfilesActivity.kt
@@ -13,12 +13,10 @@ import android.support.v4.content.ContextCompat
 import android.support.v4.content.pm.ShortcutInfoCompat
 import android.support.v4.content.pm.ShortcutManagerCompat
 import android.support.v4.graphics.drawable.IconCompat
+import android.support.v4.widget.TextViewCompat
 import android.support.v7.app.AlertDialog
 import android.support.v7.app.AppCompatActivity
-import android.support.v7.widget.DividerItemDecoration
-import android.support.v7.widget.LinearLayoutManager
-import android.support.v7.widget.RecyclerView
-import android.support.v7.widget.SwitchCompat
+import android.support.v7.widget.*
 import android.view.Gravity
 import android.view.View
 import android.view.ViewGroup
@@ -175,16 +173,16 @@ class ManageProfilesActivity : AppCompatActivity() {
             }
             view.profile_action_menu.add("Change theme") {
                 val context = this@ManageProfilesActivity
+                val textView = AppCompatTextView(context)
+                textView.text = "Use dark theme"
                 val switch = SwitchCompat(context)
-                switch.textOff = "Light theme"
-                switch.textOn = "Dark theme"
-                switch.showText = true
                 switch.isChecked = world.useDarkTheme
                 val layout = LinearLayout(context)
                 layout.layoutParams = ViewGroup.LayoutParams(
                         ViewGroup.LayoutParams.MATCH_PARENT,
                         ViewGroup.LayoutParams.MATCH_PARENT)
-                layout.gravity = Gravity.CENTER_HORIZONTAL
+                layout.gravity = Gravity.CENTER
+                layout.addView(textView)
                 layout.addView(switch)
 
                 AlertDialog.Builder(context)
@@ -196,6 +194,7 @@ class ManageProfilesActivity : AppCompatActivity() {
                                 if (world.getMainActivity() != null)
                                     Snackbar.make(fab, "Theme is applied on next launch",
                                             Snackbar.LENGTH_LONG)
+                                world.checkpoint()
                             }
                         }
                         .setNegativeButton("Cancel") { _, _ -> }