From dc5979df63c71c6271d733c31a75e5f3f8faa64f Mon Sep 17 00:00:00 2001
From: Allan Wang <me@allanwang.ca>
Date: Thu, 18 Jul 2019 00:09:25 -0700
Subject: Remove refresh requirement

---
 .../main/kotlin/com/pitchedapps/frost/activities/BaseMainActivity.kt  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'app')

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 b2946852..29ba4a3c 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/activities/BaseMainActivity.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/activities/BaseMainActivity.kt
@@ -490,8 +490,8 @@ abstract class BaseMainActivity : BaseActivity(), MainActivityContract,
         controlWebview?.resumeTimers()
         launch {
             FbCookie.switchBackUser()
-            if (shouldReload)
-                refreshAll()
+//            if (shouldReload)
+//                refreshAll()
         }
     }
 
-- 
cgit v1.2.3


From 0055ab5fdab9c86bed7982afde1739e95b093336 Mon Sep 17 00:00:00 2001
From: Allan Wang <me@allanwang.ca>
Date: Sun, 21 Jul 2019 01:07:06 -0700
Subject: Add prefs

---
 .../frost/activities/BaseMainActivity.kt           | 40 ++++++++++++++--------
 .../com/pitchedapps/frost/settings/Behaviour.kt    | 19 ++++++++--
 .../kotlin/com/pitchedapps/frost/utils/Prefs.kt    |  2 ++
 app/src/main/res/values/strings_pref_behaviour.xml |  2 ++
 4 files changed, 46 insertions(+), 17 deletions(-)

(limited to 'app')

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 29ba4a3c..73bd5b2f 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/activities/BaseMainActivity.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/activities/BaseMainActivity.kt
@@ -271,7 +271,10 @@ abstract class BaseMainActivity : BaseActivity(), MainActivityContract,
                 }
                 profileSetting(nameRes = R.string.kau_add_account) {
                     iconDrawable =
-                        IconicsDrawable(this@BaseMainActivity, GoogleMaterial.Icon.gmd_add).actionBar().paddingDp(5)
+                        IconicsDrawable(
+                            this@BaseMainActivity,
+                            GoogleMaterial.Icon.gmd_add
+                        ).actionBar().paddingDp(5)
                             .color(Prefs.textColor)
                     textColor = Prefs.textColor.toLong()
                     identifier = -3L
@@ -362,14 +365,15 @@ abstract class BaseMainActivity : BaseActivity(), MainActivityContract,
         }
     }
 
-    private fun Builder.secondaryFrostItem(@StringRes title: Int, onClick: () -> Unit) = this.secondaryItem(title) {
-        textColor = Prefs.textColor.toLong()
-        selectedIconColor = Prefs.textColor.toLong()
-        selectedTextColor = Prefs.textColor.toLong()
-        selectedColor = 0x00000001.toLong()
-        identifier = title.toLong()
-        onClick { _ -> onClick(); false }
-    }
+    private fun Builder.secondaryFrostItem(@StringRes title: Int, onClick: () -> Unit) =
+        this.secondaryItem(title) {
+            textColor = Prefs.textColor.toLong()
+            selectedIconColor = Prefs.textColor.toLong()
+            selectedTextColor = Prefs.textColor.toLong()
+            selectedColor = 0x00000001.toLong()
+            identifier = title.toLong()
+            onClick { _ -> onClick(); false }
+        }
 
     private fun refreshAll() {
         L.d { "Refresh all" }
@@ -413,7 +417,8 @@ abstract class BaseMainActivity : BaseActivity(), MainActivityContract,
                     }
                 }
                 textDebounceInterval = 300
-                searchCallback = { query, _ -> launchWebOverlay("${FbItem._SEARCH.url}/?q=$query"); true }
+                searchCallback =
+                    { query, _ -> launchWebOverlay("${FbItem._SEARCH.url}/?q=$query"); true }
                 closeListener = { _ -> searchViewCache.clear() }
                 foregroundColor = Prefs.textColor
                 backgroundColor = Prefs.bgColor.withMinAlpha(200)
@@ -429,7 +434,11 @@ abstract class BaseMainActivity : BaseActivity(), MainActivityContract,
                 val intent = Intent(this, SettingsActivity::class.java)
                 intent.putParcelableArrayListExtra(EXTRA_COOKIES, cookies())
                 val bundle =
-                    ActivityOptions.makeCustomAnimation(this, R.anim.kau_slide_in_right, R.anim.kau_fade_out).toBundle()
+                    ActivityOptions.makeCustomAnimation(
+                        this,
+                        R.anim.kau_slide_in_right,
+                        R.anim.kau_fade_out
+                    ).toBundle()
                 startActivityForResult(intent, ACTIVITY_SETTINGS, bundle)
             }
             else -> return super.onOptionsItemSelected(item)
@@ -490,8 +499,9 @@ abstract class BaseMainActivity : BaseActivity(), MainActivityContract,
         controlWebview?.resumeTimers()
         launch {
             FbCookie.switchBackUser()
-//            if (shouldReload)
-//                refreshAll()
+            if (shouldReload && Prefs.autoRefreshFeed) {
+                refreshAll()
+            }
         }
     }
 
@@ -557,7 +567,9 @@ abstract class BaseMainActivity : BaseActivity(), MainActivityContract,
             this.pages.forEachIndexed { index, fbItem ->
                 tabs.addTab(
                     tabs.newTab()
-                        .setCustomView(BadgedIcon(this@BaseMainActivity).apply { iicon = fbItem.icon }.also {
+                        .setCustomView(BadgedIcon(this@BaseMainActivity).apply {
+                            iicon = fbItem.icon
+                        }.also {
                             it.setAllAlpha(if (index == 0) SELECTED_TAB_ALPHA else UNSELECTED_TAB_ALPHA)
                         })
                 )
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/settings/Behaviour.kt b/app/src/main/kotlin/com/pitchedapps/frost/settings/Behaviour.kt
index b77c0f2d..c774892e 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/settings/Behaviour.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/settings/Behaviour.kt
@@ -29,6 +29,10 @@ import com.pitchedapps.frost.utils.launchWebOverlay
  */
 fun SettingsActivity.getBehaviourPrefs(): KPrefAdapterBuilder.() -> Unit = {
 
+    checkbox(R.string.auto_refresh_feed, Prefs::autoRefreshFeed, { Prefs.autoRefreshFeed = it }) {
+        descRes = R.string.auto_refresh_feed_desc
+    }
+
     checkbox(R.string.fancy_animations, Prefs::animate, { Prefs.animate = it; animate = it }) {
         descRes = R.string.fancy_animations_desc
     }
@@ -40,11 +44,17 @@ fun SettingsActivity.getBehaviourPrefs(): KPrefAdapterBuilder.() -> Unit = {
         descRes = R.string.overlay_swipe_desc
     }
 
-    checkbox(R.string.overlay_full_screen_swipe, Prefs::overlayFullScreenSwipe, { Prefs.overlayFullScreenSwipe = it }) {
+    checkbox(
+        R.string.overlay_full_screen_swipe,
+        Prefs::overlayFullScreenSwipe,
+        { Prefs.overlayFullScreenSwipe = it }) {
         descRes = R.string.overlay_full_screen_swipe_desc
     }
 
-    checkbox(R.string.open_links_in_default, Prefs::linksInDefaultApp, { Prefs.linksInDefaultApp = it }) {
+    checkbox(
+        R.string.open_links_in_default,
+        Prefs::linksInDefaultApp,
+        { Prefs.linksInDefaultApp = it }) {
         descRes = R.string.open_links_in_default_desc
     }
 
@@ -52,7 +62,10 @@ fun SettingsActivity.getBehaviourPrefs(): KPrefAdapterBuilder.() -> Unit = {
         descRes = R.string.viewpager_swipe_desc
     }
 
-    checkbox(R.string.force_message_bottom, Prefs::messageScrollToBottom, { Prefs.messageScrollToBottom = it }) {
+    checkbox(
+        R.string.force_message_bottom,
+        Prefs::messageScrollToBottom,
+        { Prefs.messageScrollToBottom = it }) {
         descRes = R.string.force_message_bottom_desc
     }
 
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/utils/Prefs.kt b/app/src/main/kotlin/com/pitchedapps/frost/utils/Prefs.kt
index 51eb856b..c10a95ce 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/utils/Prefs.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/utils/Prefs.kt
@@ -173,6 +173,8 @@ object Prefs : KPref() {
 
     var blackMediaBg: Boolean by kpref("black_media_bg", false)
 
+    var autoRefreshFeed: Boolean by kpref("auto_refresh_feed", false)
+
     inline val mainActivityLayout: MainActivityLayout
         get() = MainActivityLayout(mainActivityLayoutType)
 
diff --git a/app/src/main/res/values/strings_pref_behaviour.xml b/app/src/main/res/values/strings_pref_behaviour.xml
index 77c35c1c..32188698 100644
--- a/app/src/main/res/values/strings_pref_behaviour.xml
+++ b/app/src/main/res/values/strings_pref_behaviour.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
+    <string name="auto_refresh_feed">Auto Refresh Feed</string>
+    <string name="auto_refresh_feed_desc">Refresh the feed after 30 minutes of inactivity</string>
     <string name="fancy_animations">Fancy Animations</string>
     <string name="fancy_animations_desc">Reveal webviews using ripples and animate transitions</string>
     <string name="overlay_swipe">Enable Overlays</string>
-- 
cgit v1.2.3


From 6f0c6334366d037696e9249bbbd2f165448716e6 Mon Sep 17 00:00:00 2001
From: Allan Wang <me@allanwang.ca>
Date: Sun, 21 Jul 2019 01:28:19 -0700
Subject: Update changelog

---
 app/src/main/res/xml/frost_changelog.xml | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'app')

diff --git a/app/src/main/res/xml/frost_changelog.xml b/app/src/main/res/xml/frost_changelog.xml
index a7048756..01d0a6fb 100644
--- a/app/src/main/res/xml/frost_changelog.xml
+++ b/app/src/main/res/xml/frost_changelog.xml
@@ -6,6 +6,15 @@
     <item text="" />
     -->
 
+
+    <version title="v2.3.2" />
+    <item text="Disable auto feed refresh by default and add setting to re-enable it" />
+    <item text="Update theme" />
+    <item text="" />
+    <item text="" />
+    <item text="" />
+    <item text="" />
+
     <version title="v2.3.1" />
     <item text="Hide all story panels if enabled" />
     <item text="Prevent swipe to refresh if not at the very top" />
-- 
cgit v1.2.3


From b6f05964d9955ab54cde619bc28b7b55a0525773 Mon Sep 17 00:00:00 2001
From: Allan Wang <me@allanwang.ca>
Date: Mon, 22 Jul 2019 23:53:13 -0700
Subject: Make analytics opt in and disable bugsnag altogether

---
 .../main/kotlin/com/pitchedapps/frost/settings/Behaviour.kt | 13 ++++++++++++-
 app/src/main/kotlin/com/pitchedapps/frost/utils/Prefs.kt    |  3 ++-
 2 files changed, 14 insertions(+), 2 deletions(-)

(limited to 'app')

diff --git a/app/src/main/kotlin/com/pitchedapps/frost/settings/Behaviour.kt b/app/src/main/kotlin/com/pitchedapps/frost/settings/Behaviour.kt
index c774892e..06687c05 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/settings/Behaviour.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/settings/Behaviour.kt
@@ -17,6 +17,8 @@
 package com.pitchedapps.frost.settings
 
 import ca.allanwang.kau.kpref.activity.KPrefAdapterBuilder
+import com.bugsnag.android.Bugsnag
+import com.pitchedapps.frost.BuildConfig
 import com.pitchedapps.frost.R
 import com.pitchedapps.frost.activities.SettingsActivity
 import com.pitchedapps.frost.facebook.FB_URL_BASE
@@ -84,7 +86,16 @@ fun SettingsActivity.getBehaviourPrefs(): KPrefAdapterBuilder.() -> Unit = {
         descRes = R.string.exit_confirmation_desc
     }
 
-    checkbox(R.string.analytics, Prefs::analytics, { Prefs.analytics = it }) {
+    checkbox(R.string.analytics, Prefs::analytics, {
+        if (!BuildConfig.DEBUG) {
+            if (it) {
+                Bugsnag.enableExceptionHandler()
+            } else {
+                Bugsnag.disableExceptionHandler()
+            }
+        }
+        Prefs.analytics = it
+    }) {
         descRes = R.string.analytics_desc
     }
 }
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/utils/Prefs.kt b/app/src/main/kotlin/com/pitchedapps/frost/utils/Prefs.kt
index c10a95ce..b73f7fca 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/utils/Prefs.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/utils/Prefs.kt
@@ -22,6 +22,7 @@ import ca.allanwang.kau.kpref.KPref
 import ca.allanwang.kau.utils.colorToForeground
 import ca.allanwang.kau.utils.isColorVisibleOn
 import ca.allanwang.kau.utils.withAlpha
+import com.pitchedapps.frost.BuildConfig
 import com.pitchedapps.frost.enums.FACEBOOK_BLUE
 import com.pitchedapps.frost.enums.FeedSort
 import com.pitchedapps.frost.enums.MainActivityLayout
@@ -153,7 +154,7 @@ object Prefs : KPref() {
 
     var verboseLogging: Boolean by kpref("verbose_logging", false)
 
-    var analytics: Boolean by kpref("analytics", true)
+    var analytics: Boolean by kpref("analytics", false)
 
     var biometricsEnabled: Boolean by kpref("biometrics_enabled", false)
 
-- 
cgit v1.2.3


From 66dd55a0793513b45c885fdcb01bc4804b8bfd7a Mon Sep 17 00:00:00 2001
From: Allan Wang <me@allanwang.ca>
Date: Tue, 23 Jul 2019 00:22:48 -0700
Subject: Add intro panel

---
 .../pitchedapps/frost/activities/IntroActivity.kt  |  2 +
 .../pitchedapps/frost/intro/IntroMainFragments.kt  | 40 +++++++++++++++--
 .../com/pitchedapps/frost/settings/Behaviour.kt    | 13 +-----
 .../kotlin/com/pitchedapps/frost/utils/Prefs.kt    | 15 ++++++-
 .../com/pitchedapps/frost/views/FrostVideoView.kt  | 23 ++++++----
 app/src/main/play/en-US/whatsnew                   | 10 ++---
 app/src/main/res/layout/intro_analytics.xml        | 52 ++++++++++++++++++++++
 app/src/main/res/values/styles.xml                 |  4 ++
 docs/Changelog.md                                  |  4 ++
 9 files changed, 131 insertions(+), 32 deletions(-)
 create mode 100644 app/src/main/res/layout/intro_analytics.xml

(limited to 'app')

diff --git a/app/src/main/kotlin/com/pitchedapps/frost/activities/IntroActivity.kt b/app/src/main/kotlin/com/pitchedapps/frost/activities/IntroActivity.kt
index 1e106765..2844d833 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/activities/IntroActivity.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/activities/IntroActivity.kt
@@ -45,6 +45,7 @@ import com.mikepenz.google_material_typeface_library.GoogleMaterial
 import com.pitchedapps.frost.R
 import com.pitchedapps.frost.intro.BaseIntroFragment
 import com.pitchedapps.frost.intro.IntroAccountFragment
+import com.pitchedapps.frost.intro.IntroFragmentAnalytics
 import com.pitchedapps.frost.intro.IntroFragmentEnd
 import com.pitchedapps.frost.intro.IntroFragmentTheme
 import com.pitchedapps.frost.intro.IntroFragmentWelcome
@@ -80,6 +81,7 @@ class IntroActivity : KauBaseActivity(), ViewPager.PageTransformer, ViewPager.On
         IntroAccountFragment(),
         IntroTabTouchFragment(),
         IntroTabContextFragment(),
+        IntroFragmentAnalytics(),
         IntroFragmentEnd()
     )
 
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/intro/IntroMainFragments.kt b/app/src/main/kotlin/com/pitchedapps/frost/intro/IntroMainFragments.kt
index 8536dd1a..635bcfa5 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/intro/IntroMainFragments.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/intro/IntroMainFragments.kt
@@ -30,10 +30,13 @@ import androidx.fragment.app.Fragment
 import ca.allanwang.kau.kotlin.LazyResettableRegistry
 import ca.allanwang.kau.utils.Kotterknife
 import ca.allanwang.kau.utils.bindViewResettable
+import ca.allanwang.kau.utils.setIcon
 import ca.allanwang.kau.utils.setOnSingleTapListener
+import com.mikepenz.google_material_typeface_library.GoogleMaterial
 import com.pitchedapps.frost.R
 import com.pitchedapps.frost.activities.IntroActivity
 import com.pitchedapps.frost.utils.Prefs
+import kotlinx.android.synthetic.main.intro_analytics.*
 
 /**
  * Created by Allan Wang on 2017-07-28.
@@ -56,7 +59,8 @@ abstract class BaseIntroFragment(val layoutRes: Int) : Fragment() {
         val increment = maxTranslation / views.size
         views.forEachIndexed { i, group ->
             group.forEach {
-                it.translationX = if (offset > 0) -maxTranslation + i * increment else -(i + 1) * increment
+                it.translationX =
+                    if (offset > 0) -maxTranslation + i * increment else -(i + 1) * increment
                 it.alpha = 1 - Math.abs(offset)
             }
         }
@@ -73,9 +77,14 @@ abstract class BaseIntroFragment(val layoutRes: Int) : Fragment() {
     protected val image: ImageView by bindViewResettable(R.id.intro_image)
     protected val desc: TextView by bindViewResettable(R.id.intro_desc)
 
-    protected fun defaultViewArray(): Array<Array<out View>> = arrayOf(arrayOf(title), arrayOf(image), arrayOf(desc))
+    protected fun defaultViewArray(): Array<Array<out View>> =
+        arrayOf(arrayOf(title), arrayOf(image), arrayOf(desc))
 
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View? {
         return inflater.inflate(layoutRes, container, false)
     }
 
@@ -128,6 +137,31 @@ class IntroFragmentWelcome : BaseIntroFragment(R.layout.intro_welcome) {
     }
 }
 
+class IntroFragmentAnalytics : BaseIntroFragment(R.layout.intro_analytics) {
+
+    val container: ConstraintLayout by bindViewResettable(R.id.intro_end_container)
+
+    override fun viewArray(): Array<Array<out View>> = arrayOf(
+        arrayOf(title), arrayOf(image),
+        arrayOf(intro_switch), arrayOf(desc)
+    )
+
+    override fun themeFragmentImpl() {
+        super.themeFragmentImpl()
+        image.imageTintList = ColorStateList.valueOf(Prefs.textColor)
+    }
+
+    @SuppressLint("ClickableViewAccessibility")
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        image.setIcon(GoogleMaterial.Icon.gmd_bug_report, 120)
+        intro_switch.isSelected = Prefs.analytics
+        intro_switch.setOnCheckedChangeListener { _, isChecked ->
+            Prefs.analytics = isChecked
+        }
+    }
+}
+
 class IntroFragmentEnd : BaseIntroFragment(R.layout.intro_end) {
 
     val container: ConstraintLayout by bindViewResettable(R.id.intro_end_container)
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/settings/Behaviour.kt b/app/src/main/kotlin/com/pitchedapps/frost/settings/Behaviour.kt
index 06687c05..c774892e 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/settings/Behaviour.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/settings/Behaviour.kt
@@ -17,8 +17,6 @@
 package com.pitchedapps.frost.settings
 
 import ca.allanwang.kau.kpref.activity.KPrefAdapterBuilder
-import com.bugsnag.android.Bugsnag
-import com.pitchedapps.frost.BuildConfig
 import com.pitchedapps.frost.R
 import com.pitchedapps.frost.activities.SettingsActivity
 import com.pitchedapps.frost.facebook.FB_URL_BASE
@@ -86,16 +84,7 @@ fun SettingsActivity.getBehaviourPrefs(): KPrefAdapterBuilder.() -> Unit = {
         descRes = R.string.exit_confirmation_desc
     }
 
-    checkbox(R.string.analytics, Prefs::analytics, {
-        if (!BuildConfig.DEBUG) {
-            if (it) {
-                Bugsnag.enableExceptionHandler()
-            } else {
-                Bugsnag.disableExceptionHandler()
-            }
-        }
-        Prefs.analytics = it
-    }) {
+    checkbox(R.string.analytics, Prefs::analytics, { Prefs.analytics = it }) {
         descRes = R.string.analytics_desc
     }
 }
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/utils/Prefs.kt b/app/src/main/kotlin/com/pitchedapps/frost/utils/Prefs.kt
index b73f7fca..c11583d1 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/utils/Prefs.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/utils/Prefs.kt
@@ -22,6 +22,7 @@ import ca.allanwang.kau.kpref.KPref
 import ca.allanwang.kau.utils.colorToForeground
 import ca.allanwang.kau.utils.isColorVisibleOn
 import ca.allanwang.kau.utils.withAlpha
+import com.bugsnag.android.Bugsnag
 import com.pitchedapps.frost.BuildConfig
 import com.pitchedapps.frost.enums.FACEBOOK_BLUE
 import com.pitchedapps.frost.enums.FeedSort
@@ -42,7 +43,9 @@ object Prefs : KPref() {
 
     var prevId: Long by kpref("prev_id", -1L)
 
-    var theme: Int by kpref("theme", 0, postSetter = { _: Int -> loader.invalidate() })
+    var theme: Int by kpref("theme", 0) { _: Int ->
+        loader.invalidate()
+    }
 
     var customTextColor: Int by kpref("color_text", 0xffeceff1.toInt())
 
@@ -154,7 +157,15 @@ object Prefs : KPref() {
 
     var verboseLogging: Boolean by kpref("verbose_logging", false)
 
-    var analytics: Boolean by kpref("analytics", false)
+    var analytics: Boolean by kpref("analytics", false) {
+        if (!BuildConfig.DEBUG) {
+            if (it) {
+                Bugsnag.enableExceptionHandler()
+            } else {
+                Bugsnag.disableExceptionHandler()
+            }
+        }
+    }
 
     var biometricsEnabled: Boolean by kpref("biometrics_enabled", false)
 
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/views/FrostVideoView.kt b/app/src/main/kotlin/com/pitchedapps/frost/views/FrostVideoView.kt
index b3912bab..f21476fb 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/views/FrostVideoView.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/views/FrostVideoView.kt
@@ -33,8 +33,8 @@ import ca.allanwang.kau.utils.toast
 import com.devbrackets.android.exomedia.ui.widget.VideoControls
 import com.devbrackets.android.exomedia.ui.widget.VideoView
 import com.pitchedapps.frost.R
+import com.pitchedapps.frost.facebook.formattedFbUrl
 import com.pitchedapps.frost.utils.L
-import com.pitchedapps.frost.utils.Prefs
 
 /**
  * Created by Allan Wang on 2017-10-13.
@@ -154,8 +154,7 @@ class FrostVideoView @JvmOverloads constructor(
             if (isExpanded) showControls()
         }
         setOnErrorListener {
-            if (Prefs.analytics)
-                L.e(it) { "Failed to load video $videoUri" }
+            L.e(it) { "Failed to load video ${videoUri?.toString()?.formattedFbUrl}" }
             toast(R.string.video_load_failed, Toast.LENGTH_SHORT)
             destroy()
             true
@@ -168,7 +167,10 @@ class FrostVideoView @JvmOverloads constructor(
         v.setOnTouchListener(VideoTouchListener(context))
         setOnVideoSizedChangedListener { intrinsicWidth, intrinsicHeight, pixelWidthHeightRatio ->
             // todo use provided ratio?
-            val ratio = Math.min(width.toFloat() / intrinsicWidth, height.toFloat() / intrinsicHeight.toFloat())
+            val ratio = Math.min(
+                width.toFloat() / intrinsicWidth,
+                height.toFloat() / intrinsicHeight.toFloat()
+            )
             /**
              * Only remap if not expanded and if dimensions have changed
              */
@@ -237,7 +239,8 @@ class FrostVideoView @JvmOverloads constructor(
     }
 
     private fun onHorizontalSwipe(offset: Float) {
-        val alpha = Math.max((1f - Math.abs(offset / SWIPE_TO_CLOSE_OFFSET_THRESHOLD)) * 0.5f + 0.5f, 0f)
+        val alpha =
+            Math.max((1f - Math.abs(offset / SWIPE_TO_CLOSE_OFFSET_THRESHOLD)) * 0.5f + 0.5f, 0f)
         this.alpha = alpha
     }
 
@@ -247,7 +250,8 @@ class FrostVideoView @JvmOverloads constructor(
      * -------------------------------------------------------------------
      */
 
-    private inner class FrameTouchListener(context: Context) : GestureDetector.SimpleOnGestureListener(),
+    private inner class FrameTouchListener(context: Context) :
+        GestureDetector.SimpleOnGestureListener(),
         View.OnTouchListener {
 
         private val gestureDetector: GestureDetector = GestureDetector(context, this)
@@ -274,7 +278,8 @@ class FrostVideoView @JvmOverloads constructor(
     /**
      * Monitors the view click events to show and hide the video controls if they have been specified.
      */
-    private inner class VideoTouchListener(context: Context) : GestureDetector.SimpleOnGestureListener(),
+    private inner class VideoTouchListener(context: Context) :
+        GestureDetector.SimpleOnGestureListener(),
         View.OnTouchListener {
 
         private val gestureDetector: GestureDetector = GestureDetector(context, this)
@@ -314,7 +319,9 @@ class FrostVideoView @JvmOverloads constructor(
                         if (Math.abs(baseSwipeX - event.rawX) > SWIPE_TO_CLOSE_OFFSET_THRESHOLD)
                             destroy()
                         else
-                            animate().translationX(baseTranslateX).setDuration(FAST_ANIMATION_DURATION).withStartAction {
+                            animate().translationX(baseTranslateX).setDuration(
+                                FAST_ANIMATION_DURATION
+                            ).withStartAction {
                                 animate().alpha(1f)
                             }
                     }
diff --git a/app/src/main/play/en-US/whatsnew b/app/src/main/play/en-US/whatsnew
index 7d32c3ed..765565f1 100644
--- a/app/src/main/play/en-US/whatsnew
+++ b/app/src/main/play/en-US/whatsnew
@@ -1,8 +1,4 @@
-v2.3.1
+v2.3.2
 
-* Hide all story panels if enabled
-* Prevent swipe to refresh if not at the very top
-* Add vertical swipe to dismiss when viewing images
-* Add horizontal scroll support for webviews
-* Fix theme for F-Droid builds
-* Added Greek translations
\ No newline at end of file
+* Disable auto feed refresh by default and add setting to re-enable it
+* Update theme
\ No newline at end of file
diff --git a/app/src/main/res/layout/intro_analytics.xml b/app/src/main/res/layout/intro_analytics.xml
new file mode 100644
index 00000000..e0998721
--- /dev/null
+++ b/app/src/main/res/layout/intro_analytics.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/intro_end_container"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <TextView
+        android:id="@id/intro_title"
+        style="@style/IntroTitle"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/analytics"
+        app:layout_constraintBottom_toTopOf="@id/intro_image"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_chainStyle="spread" />
+
+    <ImageView
+        android:id="@id/intro_image"
+        android:layout_width="120dp"
+        android:layout_height="120dp"
+        android:scaleType="fitCenter"
+        app:layout_constraintBottom_toTopOf="@id/intro_switch"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/intro_title"
+        tools:layout_editor_absoluteX="112dp" />
+
+    <Switch
+        android:id="@+id/intro_switch"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:layout_constraintBottom_toTopOf="@id/intro_desc"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/intro_image" />
+
+    <TextView
+        android:id="@id/intro_desc"
+        style="@style/IntroSubTitle"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/analytics_desc"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/intro_switch" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 33f36174..90978724 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -86,11 +86,15 @@
     <style name="IntroTitle" parent="TextAppearance.AppCompat.Title">
         <item name="android:textSize">20sp</item>
         <item name="android:textAlignment">center</item>
+        <item name="android:paddingStart">@dimen/kau_activity_horizontal_margin</item>
+        <item name="android:paddingEnd">@dimen/kau_activity_horizontal_margin</item>
     </style>
 
     <style name="IntroSubTitle" parent="TextAppearance.AppCompat.Subhead">
         <item name="android:textSize">18sp</item>
         <item name="android:textAlignment">center</item>
+        <item name="android:paddingStart">@dimen/kau_activity_horizontal_margin</item>
+        <item name="android:paddingEnd">@dimen/kau_activity_horizontal_margin</item>
     </style>
 
     <style name="IntroButton" parent="TextAppearance.AppCompat.Button">
diff --git a/docs/Changelog.md b/docs/Changelog.md
index 65911524..2fd4a2b2 100644
--- a/docs/Changelog.md
+++ b/docs/Changelog.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## v2.3.2
+* Disable auto feed refresh by default and add setting to re-enable it
+* Update theme
+
 ## v2.3.1
 * Hide all story panels if enabled
 * Prevent swipe to refresh if not at the very top
-- 
cgit v1.2.3


From d746e687b217d03c7b03beed3763e7503358de74 Mon Sep 17 00:00:00 2001
From: Allan Wang <me@allanwang.ca>
Date: Tue, 23 Jul 2019 00:23:14 -0700
Subject: Update changelog

---
 app/src/main/res/xml/frost_changelog.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'app')

diff --git a/app/src/main/res/xml/frost_changelog.xml b/app/src/main/res/xml/frost_changelog.xml
index 01d0a6fb..09bb9d2e 100644
--- a/app/src/main/res/xml/frost_changelog.xml
+++ b/app/src/main/res/xml/frost_changelog.xml
@@ -10,7 +10,7 @@
     <version title="v2.3.2" />
     <item text="Disable auto feed refresh by default and add setting to re-enable it" />
     <item text="Update theme" />
-    <item text="" />
+    <item text="Disable bugsnag completely when opting out of analytics" />
     <item text="" />
     <item text="" />
     <item text="" />
-- 
cgit v1.2.3


From 1796aa0ee637c3fd65eb58392a287ea0abdd6e70 Mon Sep 17 00:00:00 2001
From: Allan Wang <me@allanwang.ca>
Date: Sat, 27 Jul 2019 21:50:56 -0700
Subject: Disable auto session capture until analytics is disabled

---
 .../main/kotlin/com/pitchedapps/frost/FrostApp.kt  | 36 ++++++++++++++--------
 .../main/kotlin/com/pitchedapps/frost/utils/L.kt   | 21 ++++++++-----
 app/src/main/play/en-US/whatsnew                   |  3 +-
 docs/Changelog.md                                  |  1 +
 4 files changed, 41 insertions(+), 20 deletions(-)

(limited to 'app')

diff --git a/app/src/main/kotlin/com/pitchedapps/frost/FrostApp.kt b/app/src/main/kotlin/com/pitchedapps/frost/FrostApp.kt
index 0c762b41..65f7f495 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/FrostApp.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/FrostApp.kt
@@ -25,6 +25,7 @@ import android.widget.ImageView
 import ca.allanwang.kau.logging.KL
 import ca.allanwang.kau.utils.buildIsLollipopAndUp
 import com.bugsnag.android.Bugsnag
+import com.bugsnag.android.Configuration
 import com.bumptech.glide.request.RequestOptions
 import com.bumptech.glide.signature.ApplicationVersionSignature
 import com.mikepenz.materialdrawer.util.AbstractDrawerImageLoader
@@ -92,8 +93,12 @@ class FrostApp : Application() {
         Prefs.verboseLogging = false
         L.i { "Begin Frost for Facebook" }
         FrostPglAdBlock.init(this)
-        if (Prefs.installDate == -1L) Prefs.installDate = System.currentTimeMillis()
-        if (Prefs.identifier == -1) Prefs.identifier = Random().nextInt(Int.MAX_VALUE)
+        if (Prefs.installDate == -1L) {
+            Prefs.installDate = System.currentTimeMillis()
+        }
+        if (Prefs.identifier == -1) {
+            Prefs.identifier = Random().nextInt(Int.MAX_VALUE)
+        }
         Prefs.lastLaunch = System.currentTimeMillis()
 
         super.onCreate()
@@ -137,25 +142,32 @@ class FrostApp : Application() {
                 }
             })
         startKoin {
-            if (BuildConfig.DEBUG)
+            if (BuildConfig.DEBUG) {
                 androidLogger()
+            }
             androidContext(this@FrostApp)
             modules(FrostDatabase.module(this@FrostApp))
         }
     }
 
     private fun initBugsnag() {
-        if (BuildConfig.DEBUG) return
-        Bugsnag.init(this)
-        Bugsnag.disableExceptionHandler()
-        if (!BuildConfig.APPLICATION_ID.startsWith("com.pitchedapps.frost")) return
+        if (BuildConfig.DEBUG) {
+            return
+        }
+        if (!BuildConfig.APPLICATION_ID.startsWith("com.pitchedapps.frost")) {
+            return
+        }
         val version = BuildUtils.match(BuildConfig.VERSION_NAME)
             ?: return L.d { "Bugsnag disabled for ${BuildConfig.VERSION_NAME}" }
-        Bugsnag.enableExceptionHandler()
-        Bugsnag.setNotifyReleaseStages(*BuildUtils.getAllStages())
-        Bugsnag.setAppVersion(version.versionName)
-        Bugsnag.setReleaseStage(BuildUtils.getStage(BuildConfig.BUILD_TYPE))
-        Bugsnag.setAutoCaptureSessions(true)
+        val config = Configuration("83cf680ed01a6fda10fe497d1c0962bb").apply {
+            enableExceptionHandler = true
+            appVersion = version.versionName
+            releaseStage = BuildUtils.getStage(BuildConfig.BUILD_TYPE)
+            notifyReleaseStages = BuildUtils.getAllStages()
+            autoCaptureSessions = Prefs.analytics
+        }
+        Bugsnag.init(this, config)
+        L.bugsnagInit = true
         Bugsnag.setUserId(Prefs.frostId)
         Bugsnag.addToTab("Build", "Application", BuildConfig.APPLICATION_ID)
         Bugsnag.addToTab("Build", "Version", BuildConfig.VERSION_NAME)
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/utils/L.kt b/app/src/main/kotlin/com/pitchedapps/frost/utils/L.kt
index 7c8c1895..6da4f598 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/utils/L.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/utils/L.kt
@@ -41,28 +41,35 @@ object L : KauLogger("Frost", {
     }
 
     inline fun _i(message: () -> Any?) {
-        if (BuildConfig.DEBUG)
+        if (BuildConfig.DEBUG) {
             i(message)
+        }
     }
 
     inline fun _d(message: () -> Any?) {
-        if (BuildConfig.DEBUG)
+        if (BuildConfig.DEBUG) {
             d(message)
+        }
     }
 
     inline fun _e(e: Throwable?, message: () -> Any?) {
-        if (BuildConfig.DEBUG)
+        if (BuildConfig.DEBUG) {
             e(e, message)
+        }
     }
 
+    var bugsnagInit = false
+
     override fun logImpl(priority: Int, message: String?, t: Throwable?) {
-        if (BuildConfig.DEBUG)
+        if (BuildConfig.DEBUG || !bugsnagInit || Prefs.analytics) {
             super.logImpl(priority, message, t)
-        else {
-            if (message != null)
+        } else {
+            if (message != null) {
                 Bugsnag.leaveBreadcrumb(message)
-            if (t != null)
+            }
+            if (t != null) {
                 Bugsnag.notify(t)
+            }
         }
     }
 }
diff --git a/app/src/main/play/en-US/whatsnew b/app/src/main/play/en-US/whatsnew
index 765565f1..d2b73404 100644
--- a/app/src/main/play/en-US/whatsnew
+++ b/app/src/main/play/en-US/whatsnew
@@ -1,4 +1,5 @@
 v2.3.2
 
 * Disable auto feed refresh by default and add setting to re-enable it
-* Update theme
\ No newline at end of file
+* Update theme
+* Disable bugsnag completely when opting out of analytics
\ No newline at end of file
diff --git a/docs/Changelog.md b/docs/Changelog.md
index 2fd4a2b2..949eb8d4 100644
--- a/docs/Changelog.md
+++ b/docs/Changelog.md
@@ -3,6 +3,7 @@
 ## v2.3.2
 * Disable auto feed refresh by default and add setting to re-enable it
 * Update theme
+* Disable bugsnag completely when opting out of analytics
 
 ## v2.3.1
 * Hide all story panels if enabled
-- 
cgit v1.2.3


From 25ad3000743b108f7018bae8fb65b4988d953c3c Mon Sep 17 00:00:00 2001
From: Allan Wang <me@allanwang.ca>
Date: Sat, 27 Jul 2019 21:52:04 -0700
Subject: Fix analytics flag

---
 app/src/main/kotlin/com/pitchedapps/frost/utils/L.kt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'app')

diff --git a/app/src/main/kotlin/com/pitchedapps/frost/utils/L.kt b/app/src/main/kotlin/com/pitchedapps/frost/utils/L.kt
index 6da4f598..e5dd30e3 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/utils/L.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/utils/L.kt
@@ -61,7 +61,7 @@ object L : KauLogger("Frost", {
     var bugsnagInit = false
 
     override fun logImpl(priority: Int, message: String?, t: Throwable?) {
-        if (BuildConfig.DEBUG || !bugsnagInit || Prefs.analytics) {
+        if (BuildConfig.DEBUG || !bugsnagInit || !Prefs.analytics) {
             super.logImpl(priority, message, t)
         } else {
             if (message != null) {
-- 
cgit v1.2.3


From 65ad23e07634f2a1605dcc7768488d933a0aa6fb Mon Sep 17 00:00:00 2001
From: Allan Wang <me@allanwang.ca>
Date: Sat, 27 Jul 2019 22:02:33 -0700
Subject: Toggle auto capture sessions

---
 app/src/main/kotlin/com/pitchedapps/frost/FrostApp.kt    | 2 +-
 app/src/main/kotlin/com/pitchedapps/frost/utils/L.kt     | 5 +++++
 app/src/main/kotlin/com/pitchedapps/frost/utils/Prefs.kt | 2 ++
 3 files changed, 8 insertions(+), 1 deletion(-)

(limited to 'app')

diff --git a/app/src/main/kotlin/com/pitchedapps/frost/FrostApp.kt b/app/src/main/kotlin/com/pitchedapps/frost/FrostApp.kt
index 65f7f495..a465eb7b 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/FrostApp.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/FrostApp.kt
@@ -160,11 +160,11 @@ class FrostApp : Application() {
         val version = BuildUtils.match(BuildConfig.VERSION_NAME)
             ?: return L.d { "Bugsnag disabled for ${BuildConfig.VERSION_NAME}" }
         val config = Configuration("83cf680ed01a6fda10fe497d1c0962bb").apply {
-            enableExceptionHandler = true
             appVersion = version.versionName
             releaseStage = BuildUtils.getStage(BuildConfig.BUILD_TYPE)
             notifyReleaseStages = BuildUtils.getAllStages()
             autoCaptureSessions = Prefs.analytics
+            enableExceptionHandler = Prefs.analytics
         }
         Bugsnag.init(this, config)
         L.bugsnagInit = true
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/utils/L.kt b/app/src/main/kotlin/com/pitchedapps/frost/utils/L.kt
index e5dd30e3..dd8cf594 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/utils/L.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/utils/L.kt
@@ -61,6 +61,11 @@ object L : KauLogger("Frost", {
     var bugsnagInit = false
 
     override fun logImpl(priority: Int, message: String?, t: Throwable?) {
+        /*
+         * Debug flag is constant and should help with optimization
+         * bugsnagInit is changed per application and helps prevent crashes (if calling pre init)
+         * analytics is changed by the user, and may be toggled throughout the app
+         */
         if (BuildConfig.DEBUG || !bugsnagInit || !Prefs.analytics) {
             super.logImpl(priority, message, t)
         } else {
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/utils/Prefs.kt b/app/src/main/kotlin/com/pitchedapps/frost/utils/Prefs.kt
index c11583d1..0885109a 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/utils/Prefs.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/utils/Prefs.kt
@@ -160,8 +160,10 @@ object Prefs : KPref() {
     var analytics: Boolean by kpref("analytics", false) {
         if (!BuildConfig.DEBUG) {
             if (it) {
+                Bugsnag.setAutoCaptureSessions(true)
                 Bugsnag.enableExceptionHandler()
             } else {
+                Bugsnag.setAutoCaptureSessions(false)
                 Bugsnag.disableExceptionHandler()
             }
         }
-- 
cgit v1.2.3


From 4744662f5cbd1d40b91503ab4242ff5b9f423d9d Mon Sep 17 00:00:00 2001
From: Allan Wang <me@allanwang.ca>
Date: Sun, 28 Jul 2019 11:08:47 -0700
Subject: Init bugsnag after pref setup

---
 .../main/kotlin/com/pitchedapps/frost/FrostApp.kt  | 26 +++++++++++++---------
 1 file changed, 15 insertions(+), 11 deletions(-)

(limited to 'app')

diff --git a/app/src/main/kotlin/com/pitchedapps/frost/FrostApp.kt b/app/src/main/kotlin/com/pitchedapps/frost/FrostApp.kt
index a465eb7b..65c6d463 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/FrostApp.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/FrostApp.kt
@@ -84,22 +84,13 @@ class FrostApp : Application() {
                 .withDatabase(NotificationDb.NAME, NotificationDb::class)
                 .build()
         )
-        Showcase.initialize(this, "${BuildConfig.APPLICATION_ID}.showcase")
-        Prefs.initialize(this, "${BuildConfig.APPLICATION_ID}.prefs")
 //        if (LeakCanary.isInAnalyzerProcess(this)) return
 //        refWatcher = LeakCanary.install(this)
+        initPrefs()
         initBugsnag()
-        KL.shouldLog = { BuildConfig.DEBUG }
-        Prefs.verboseLogging = false
+
         L.i { "Begin Frost for Facebook" }
         FrostPglAdBlock.init(this)
-        if (Prefs.installDate == -1L) {
-            Prefs.installDate = System.currentTimeMillis()
-        }
-        if (Prefs.identifier == -1) {
-            Prefs.identifier = Random().nextInt(Int.MAX_VALUE)
-        }
-        Prefs.lastLaunch = System.currentTimeMillis()
 
         super.onCreate()
 
@@ -150,6 +141,19 @@ class FrostApp : Application() {
         }
     }
 
+    private fun initPrefs() {
+        Prefs.initialize(this, "${BuildConfig.APPLICATION_ID}.prefs")
+        KL.shouldLog = { BuildConfig.DEBUG }
+        Prefs.verboseLogging = false
+        if (Prefs.installDate == -1L) {
+            Prefs.installDate = System.currentTimeMillis()
+        }
+        if (Prefs.identifier == -1) {
+            Prefs.identifier = Random().nextInt(Int.MAX_VALUE)
+        }
+        Prefs.lastLaunch = System.currentTimeMillis()
+    }
+
     private fun initBugsnag() {
         if (BuildConfig.DEBUG) {
             return
-- 
cgit v1.2.3


From af20a977ef11197178a11e3a6d047967b2a1beae Mon Sep 17 00:00:00 2001
From: Allan Wang <me@allanwang.ca>
Date: Sun, 28 Jul 2019 11:10:01 -0700
Subject: Readd showcase init

---
 app/src/main/kotlin/com/pitchedapps/frost/FrostApp.kt | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'app')

diff --git a/app/src/main/kotlin/com/pitchedapps/frost/FrostApp.kt b/app/src/main/kotlin/com/pitchedapps/frost/FrostApp.kt
index 65c6d463..d6d6faea 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/FrostApp.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/FrostApp.kt
@@ -114,7 +114,7 @@ class FrostApp : Application() {
                     .thumbnail(old).into(imageView)
             }
         })
-        if (BuildConfig.DEBUG)
+        if (BuildConfig.DEBUG) {
             registerActivityLifecycleCallbacks(object : ActivityLifecycleCallbacks {
                 override fun onActivityPaused(activity: Activity) {}
                 override fun onActivityResumed(activity: Activity) {}
@@ -132,6 +132,7 @@ class FrostApp : Application() {
                     L.d { "Activity ${activity.localClassName} created" }
                 }
             })
+        }
         startKoin {
             if (BuildConfig.DEBUG) {
                 androidLogger()
@@ -142,6 +143,7 @@ class FrostApp : Application() {
     }
 
     private fun initPrefs() {
+        Showcase.initialize(this, "${BuildConfig.APPLICATION_ID}.showcase")
         Prefs.initialize(this, "${BuildConfig.APPLICATION_ID}.prefs")
         KL.shouldLog = { BuildConfig.DEBUG }
         Prefs.verboseLogging = false
-- 
cgit v1.2.3


From dd391481881683e7b58a69ef2b9b671fb6197208 Mon Sep 17 00:00:00 2001
From: Allan Wang <me@allanwang.ca>
Date: Sun, 4 Aug 2019 22:45:18 -0700
Subject: Switch theme when selected in intro

---
 .../com/pitchedapps/frost/activities/IntroActivity.kt  |  2 ++
 .../com/pitchedapps/frost/intro/IntroMainFragments.kt  |  2 +-
 .../main/kotlin/com/pitchedapps/frost/utils/Utils.kt   | 18 +++++++++++-------
 app/src/main/res/layout/intro_analytics.xml            |  2 +-
 app/src/main/res/layout/intro_end.xml                  |  2 +-
 5 files changed, 16 insertions(+), 10 deletions(-)

(limited to 'app')

diff --git a/app/src/main/kotlin/com/pitchedapps/frost/activities/IntroActivity.kt b/app/src/main/kotlin/com/pitchedapps/frost/activities/IntroActivity.kt
index 2844d833..94f8d6c1 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/activities/IntroActivity.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/activities/IntroActivity.kt
@@ -55,6 +55,7 @@ import com.pitchedapps.frost.utils.Prefs
 import com.pitchedapps.frost.utils.cookies
 import com.pitchedapps.frost.utils.launchNewTask
 import com.pitchedapps.frost.utils.loadAssets
+import com.pitchedapps.frost.utils.setFrostTheme
 import com.pitchedapps.frost.widgets.NotificationWidget
 import kotlinx.coroutines.NonCancellable
 import kotlinx.coroutines.launch
@@ -113,6 +114,7 @@ class IntroActivity : KauBaseActivity(), ViewPager.PageTransformer, ViewPager.On
         indicator.setColour(Prefs.textColor)
         indicator.invalidate()
         fragments.forEach { it.themeFragment() }
+        setFrostTheme(true)
     }
 
     /**
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/intro/IntroMainFragments.kt b/app/src/main/kotlin/com/pitchedapps/frost/intro/IntroMainFragments.kt
index 635bcfa5..22dd086b 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/intro/IntroMainFragments.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/intro/IntroMainFragments.kt
@@ -139,7 +139,7 @@ class IntroFragmentWelcome : BaseIntroFragment(R.layout.intro_welcome) {
 
 class IntroFragmentAnalytics : BaseIntroFragment(R.layout.intro_analytics) {
 
-    val container: ConstraintLayout by bindViewResettable(R.id.intro_end_container)
+    val container: ConstraintLayout by bindViewResettable(R.id.intro_analytics_container)
 
     override fun viewArray(): Array<Array<out View>> = arrayOf(
         arrayOf(title), arrayOf(image),
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/utils/Utils.kt b/app/src/main/kotlin/com/pitchedapps/frost/utils/Utils.kt
index 0574aeae..8544aac3 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/utils/Utils.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/utils/Utils.kt
@@ -137,7 +137,8 @@ private inline fun <reified T : WebOverlayActivityBase> Context.launchWebOverlay
 
 fun Context.launchWebOverlay(url: String) = launchWebOverlayImpl<WebOverlayActivity>(url)
 
-fun Context.launchWebOverlayDesktop(url: String) = launchWebOverlayImpl<WebOverlayDesktopActivity>(url)
+fun Context.launchWebOverlayDesktop(url: String) =
+    launchWebOverlayImpl<WebOverlayDesktopActivity>(url)
 
 private fun Context.fadeBundle() = ActivityOptions.makeCustomAnimation(
     this,
@@ -154,9 +155,11 @@ fun Context.launchImageActivity(imageUrl: String, text: String? = null, cookie:
 }
 
 fun Activity.launchTabCustomizerActivity() {
-    startActivityForResult<TabCustomizerActivity>(SettingsActivity.ACTIVITY_REQUEST_TABS, bundleBuilder = {
-        with(fadeBundle())
-    })
+    startActivityForResult<TabCustomizerActivity>(
+        SettingsActivity.ACTIVITY_REQUEST_TABS,
+        bundleBuilder = {
+            with(fadeBundle())
+        })
 }
 
 fun WebOverlayActivity.url(): String {
@@ -165,11 +168,12 @@ fun WebOverlayActivity.url(): String {
 
 fun Activity.setFrostTheme(forceTransparent: Boolean = false) {
     val isTransparent =
-        (Color.alpha(Prefs.bgColor) != 255) || (Color.alpha(Prefs.headerColor) != 255) || forceTransparent
-    if (Prefs.bgColor.isColorDark)
+        forceTransparent || (Color.alpha(Prefs.bgColor) != 255) || (Color.alpha(Prefs.headerColor) != 255)
+    if (Prefs.bgColor.isColorDark) {
         setTheme(if (isTransparent) R.style.FrostTheme_Transparent else R.style.FrostTheme)
-    else
+    } else {
         setTheme(if (isTransparent) R.style.FrostTheme_Light_Transparent else R.style.FrostTheme_Light)
+    }
 }
 
 class ActivityThemeUtils {
diff --git a/app/src/main/res/layout/intro_analytics.xml b/app/src/main/res/layout/intro_analytics.xml
index e0998721..a62a0b0f 100644
--- a/app/src/main/res/layout/intro_analytics.xml
+++ b/app/src/main/res/layout/intro_analytics.xml
@@ -2,7 +2,7 @@
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/intro_end_container"
+    android:id="@+id/intro_analytics_container"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
diff --git a/app/src/main/res/layout/intro_end.xml b/app/src/main/res/layout/intro_end.xml
index 501cf1a9..fbaa2042 100644
--- a/app/src/main/res/layout/intro_end.xml
+++ b/app/src/main/res/layout/intro_end.xml
@@ -2,8 +2,8 @@
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
     android:id="@+id/intro_end_container"
+    android:layout_width="match_parent"
     android:layout_height="match_parent">
 
     <TextView
-- 
cgit v1.2.3