diff options
| author | Allan Wang <me@allanwang.ca> | 2017-06-14 17:01:13 -0700 |
|---|---|---|
| committer | Allan Wang <me@allanwang.ca> | 2017-06-14 17:01:13 -0700 |
| commit | fbbc92e4c98a30e107fb2a63887f8b6d20bffabb (patch) | |
| tree | ec603d3379ddad94df084f94132ac0c739bcb4ac /app/src/main/kotlin/com/pitchedapps/frost/MainActivity.kt | |
| parent | aa01ec691ef2638da7c22bf3cbd1a9c5e213ca1f (diff) | |
| download | frost-fbbc92e4c98a30e107fb2a63887f8b6d20bffabb.tar.gz frost-fbbc92e4c98a30e107fb2a63887f8b6d20bffabb.tar.bz2 frost-fbbc92e4c98a30e107fb2a63887f8b6d20bffabb.zip | |
Update themes and started theme settings
Diffstat (limited to 'app/src/main/kotlin/com/pitchedapps/frost/MainActivity.kt')
| -rw-r--r-- | app/src/main/kotlin/com/pitchedapps/frost/MainActivity.kt | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/MainActivity.kt b/app/src/main/kotlin/com/pitchedapps/frost/MainActivity.kt index 12b308d0..fce3e670 100644 --- a/app/src/main/kotlin/com/pitchedapps/frost/MainActivity.kt +++ b/app/src/main/kotlin/com/pitchedapps/frost/MainActivity.kt @@ -30,10 +30,7 @@ import com.pitchedapps.frost.facebook.FbCookie.switchUser import com.pitchedapps.frost.facebook.FbTab import com.pitchedapps.frost.facebook.PROFILE_PICTURE_URL import com.pitchedapps.frost.fragments.WebFragment -import com.pitchedapps.frost.utils.Prefs -import com.pitchedapps.frost.utils.cookies -import com.pitchedapps.frost.utils.launchNewTask -import com.pitchedapps.frost.utils.launchWebOverlay +import com.pitchedapps.frost.utils.* import io.reactivex.disposables.Disposable import io.reactivex.subjects.PublishSubject @@ -176,7 +173,9 @@ class MainActivity : BaseActivity() { override fun onOptionsItemSelected(item: MenuItem): Boolean { when (item.itemId) { R.id.action_settings -> { - startActivity(Intent(this, SettingsActivity::class.java)) + startActivitySlideIn(SettingsActivity::class.java, clearStack = true, intentBuilder = { + putParcelableArrayListExtra(EXTRA_COOKIES, cookies()) + }) } R.id.action_changelog -> showChangelog(R.xml.changelog) R.id.action_call -> launchNewTask(LoginActivity::class.java) |