Theme switching

app/src/main/java/com/meloda/fast/activity/MainActivity.kt

@@ -24,7 +24,7 @@ import com.meloda.fast.extensions.ContextExtensions.drawable
 import com.meloda.fast.extensions.DrawableExtensions.tint
 import com.meloda.fast.fragment.FragmentConversations
 import com.meloda.fast.fragment.FragmentFriends
-import com.meloda.fast.fragment.FragmentSettings
+import com.meloda.fast.fragment.SettingsFragment
 import com.meloda.fast.fragment.LoginFragment
 import com.meloda.fast.listener.OnResponseListener
 import com.meloda.fast.service.LongPollService
@@ -39,7 +39,7 @@ class MainActivity : BaseActivity(),
 
     private lateinit var fragmentConversations: FragmentConversations
     private lateinit var fragmentFriends: FragmentFriends
-    private lateinit var fragmentSettings: FragmentSettings
+    private lateinit var settingsFragment: SettingsFragment
 
     private var selectedId = 0
 
@@ -91,7 +91,7 @@ class MainActivity : BaseActivity(),
     private fun prepareFragments() {
         fragmentConversations = FragmentConversations()
         fragmentFriends = FragmentFriends(UserConfig.userId)
-        fragmentSettings = FragmentSettings()
+        settingsFragment = SettingsFragment()
 
         val containerId = R.id.fragmentContainer
 

app/src/main/java/com/meloda/fast/activity/MessagesActivity.kt

@@ -27,7 +27,7 @@ import com.meloda.fast.dialog.ProfileDialog
 import com.meloda.fast.extensions.ContextExtensions.color
 import com.meloda.fast.extensions.DrawableExtensions.tint
 import com.meloda.fast.extensions.ImageViewExtensions.loadImage
-import com.meloda.fast.fragment.FragmentSettings
+import com.meloda.fast.fragment.SettingsFragment
 import com.meloda.fast.util.KeyboardUtils
 import com.meloda.fast.util.TextUtils
 import com.meloda.fast.util.ViewUtils
@@ -169,7 +169,7 @@ class MessagesActivity : BaseActivity(), MessagesView {
                 super.onScrolled(recyclerView, dx, dy)
 
                 if (dy < 0 && AppGlobal.inputMethodManager.isAcceptingText && AppGlobal.preferences.getBoolean(
-                        FragmentSettings.KEY_HIDE_KEYBOARD_ON_SCROLL_UP,
+                        SettingsFragment.KEY_HIDE_KEYBOARD_ON_SCROLL_UP,
                         true
                     )
                 ) {

app/src/main/java/com/meloda/fast/activity/SettingsActivity.kt

@@ -4,10 +4,9 @@ import android.os.Bundle
 import com.meloda.fast.R
 import com.meloda.fast.base.BaseActivity
 import com.meloda.fast.common.FragmentSwitcher
-import com.meloda.fast.extensions.ContextExtensions.color
 import com.meloda.fast.extensions.ContextExtensions.drawable
-import com.meloda.fast.extensions.DrawableExtensions.tint
-import com.meloda.fast.fragment.FragmentSettings
+import com.meloda.fast.fragment.SettingsFragment
+import com.meloda.fast.util.ColorUtils
 import com.meloda.fast.widget.Toolbar
 
 class SettingsActivity : BaseActivity() {
@@ -21,12 +20,14 @@ class SettingsActivity : BaseActivity() {
 
         setSupportActionBar(toolbar)
 
-        toolbar.navigationIcon = drawable(R.drawable.ic_arrow_back).tint(color(R.color.accent))
-
         toolbar.setNavigationClickListener { onBackPressed() }
 
+        toolbar.navigationIcon = drawable(R.drawable.ic_arrow_back)
+        toolbar.tintNavigationIcon(ColorUtils.getColorAccent(this))
+
         supportFragmentManager.beginTransaction()
-            .replace(R.id.fragmentContainer, FragmentSettings()).commitNow()
+            .replace(R.id.fragmentContainer, SettingsFragment())
+            .commit()
     }
 
     private fun initViews() {
@@ -36,7 +37,7 @@ class SettingsActivity : BaseActivity() {
     override fun onBackPressed() {
         val currentFragment = FragmentSwitcher.getCurrentFragment(supportFragmentManager) ?: return
 
-        if (currentFragment.javaClass == FragmentSettings::class.java && (currentFragment as FragmentSettings).onBackPressed()) {
+        if (currentFragment.javaClass == SettingsFragment::class.java && (currentFragment as SettingsFragment).onBackPressed()) {
             super.onBackPressed()
         }
     }