From 768e75c535623504f972603a89d1ac7d20cd48a0 Mon Sep 17 00:00:00 2001 From: Allan Wang Date: Mon, 5 Jun 2017 23:25:31 -0700 Subject: Add fabric properties --- app/src/main/kotlin/com/pitchedapps/frost/MainActivity.kt | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'app/src/main/kotlin/com/pitchedapps/frost/MainActivity.kt') diff --git a/app/src/main/kotlin/com/pitchedapps/frost/MainActivity.kt b/app/src/main/kotlin/com/pitchedapps/frost/MainActivity.kt index b9118c60..025b9001 100644 --- a/app/src/main/kotlin/com/pitchedapps/frost/MainActivity.kt +++ b/app/src/main/kotlin/com/pitchedapps/frost/MainActivity.kt @@ -41,7 +41,6 @@ class MainActivity : AppCompatActivity() { val tabs: TabLayout by bindView(R.id.tabs) lateinit var drawer: Drawer lateinit var drawerHeader: AccountHeader - val cookies: ArrayList by lazy { cookies() } var titleDisposable: Disposable? = null var refreshObservable = PublishSubject.create().observeOn(AndroidSchedulers.mainThread()) @@ -108,7 +107,7 @@ class MainActivity : AppCompatActivity() { savedInstance = savedInstanceState translucentStatusBar = false drawerHeader = accountHeader { - cookies.forEach { (id, name) -> + cookies().forEach { (id, name) -> profile(name = name ?: "") { iconUrl = PROFILE_PICTURE_URL(id) identifier = id @@ -144,10 +143,9 @@ class MainActivity : AppCompatActivity() { override fun onOptionsItemSelected(item: MenuItem): Boolean { when (item.itemId) { R.id.action_settings -> { + launchNewTask(SelectorActivity::class.java, cookies()) // startActivity(Intent(this, LoginActivity::class.java)) // finish() - L.e("Settings") - throw IllegalArgumentException("Test") } R.id.action_changelog -> Changelog.show(this) R.id.action_call -> launchNewTask(LoginActivity::class.java) -- cgit v1.2.3