diff options
author | Allan Wang <me@allanwang.ca> | 2018-01-07 02:43:57 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-01-07 02:43:57 -0500 |
commit | 8aece5e3f9209d7c161410c304655f0aec2d6054 (patch) | |
tree | 1a68d7289a7e67dfaba37a9152fc3942f944bc5e /app/src/main/kotlin/com/pitchedapps/frost/activities/BaseMainActivity.kt | |
parent | 726d2a4dc3d3158490ca94b660b195898becb30a (diff) | |
download | frost-8aece5e3f9209d7c161410c304655f0aec2d6054.tar.gz frost-8aece5e3f9209d7c161410c304655f0aec2d6054.tar.bz2 frost-8aece5e3f9209d7c161410c304655f0aec2d6054.zip |
Feature/website debug (#603)
* Create beginning of web downloader
* Clean up
* Update KAU for reified activity launching
* Update web attachments and setFrostColor
* Test other zipper
* Test simpler image saving model
* Finish up image activity
* Restore aggressive overlays
* Try new zipper
* Test again
* Fix tests
* Add working build
* Rename
* Support cancellation
Diffstat (limited to 'app/src/main/kotlin/com/pitchedapps/frost/activities/BaseMainActivity.kt')
-rw-r--r-- | app/src/main/kotlin/com/pitchedapps/frost/activities/BaseMainActivity.kt | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/activities/BaseMainActivity.kt b/app/src/main/kotlin/com/pitchedapps/frost/activities/BaseMainActivity.kt index 1e17f06a..ffcbadab 100644 --- a/app/src/main/kotlin/com/pitchedapps/frost/activities/BaseMainActivity.kt +++ b/app/src/main/kotlin/com/pitchedapps/frost/activities/BaseMainActivity.kt @@ -123,7 +123,12 @@ abstract class BaseMainActivity : BaseActivity(), MainActivityContract, // Snackbar.make(view, "Replace with your own action", Snackbar.LENGTH_LONG) // .setAction("Action", null).show() // } - setFrostColors(toolbar, themeWindow = false, headers = arrayOf(appBar), backgrounds = arrayOf(viewPager)) + setFrostColors { + toolbar(toolbar) + themeWindow = false + header(appBar) + background(viewPager) + } tabs.setBackgroundColor(Prefs.mainActivityLayout.backgroundColor()) onCreateBilling() } @@ -192,8 +197,8 @@ abstract class BaseMainActivity : BaseActivity(), MainActivityContract, } } } - -3L -> launchNewTask(LoginActivity::class.java, clearStack = false) - -4L -> launchNewTask(SelectorActivity::class.java, cookies(), false) + -3L -> launchNewTask<LoginActivity>(clearStack = false) + -4L -> launchNewTask<SelectorActivity>( cookies(), false) else -> { FbCookie.switchUser(profile.identifier, this@BaseMainActivity::refreshAll) tabsForEachView { _, view -> view.badgeText = null } |