From 353da6dc201b0dbf90929a1ca83c09aabf4f7444 Mon Sep 17 00:00:00 2001
From: Allan Wang <me@allanwang.ca>
Date: Sun, 17 Sep 2017 02:08:22 -0400
Subject: Add release layout

---
 .../kotlin/com/pitchedapps/frost/StartActivity.kt  | 14 +++++----
 .../pitchedapps/frost/activities/MainActivity.kt   | 11 -------
 .../frost/activities/ReleaseActivity.kt            | 34 ++++++++++++++++++++++
 3 files changed, 43 insertions(+), 16 deletions(-)
 create mode 100644 app/src/main/kotlin/com/pitchedapps/frost/activities/ReleaseActivity.kt

(limited to 'app/src/main/kotlin')

diff --git a/app/src/main/kotlin/com/pitchedapps/frost/StartActivity.kt b/app/src/main/kotlin/com/pitchedapps/frost/StartActivity.kt
index 5de07b7a..dea0c852 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/StartActivity.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/StartActivity.kt
@@ -4,11 +4,13 @@ import android.os.Bundle
 import ca.allanwang.kau.internal.KauBaseActivity
 import com.pitchedapps.frost.activities.LoginActivity
 import com.pitchedapps.frost.activities.MainActivity
+import com.pitchedapps.frost.activities.ReleaseActivity
 import com.pitchedapps.frost.activities.SelectorActivity
 import com.pitchedapps.frost.dbflow.loadFbCookiesAsync
 import com.pitchedapps.frost.facebook.FbCookie
 import com.pitchedapps.frost.utils.L
 import com.pitchedapps.frost.utils.Prefs
+import com.pitchedapps.frost.utils.Showcase
 import com.pitchedapps.frost.utils.launchNewTask
 
 /**
@@ -19,12 +21,14 @@ class StartActivity : KauBaseActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         FbCookie.switchBackUser {
-            loadFbCookiesAsync {
-                cookies ->
+            loadFbCookiesAsync { cookies ->
                 L.d("Cookies loaded at time ${System.currentTimeMillis()}", cookies.toString())
-                if (cookies.isNotEmpty())
-                    launchNewTask(if (Prefs.userId != -1L) MainActivity::class.java else SelectorActivity::class.java, ArrayList(cookies))
-                else
+                if (cookies.isNotEmpty()) {
+                    if (BuildConfig.DEBUG || (!Showcase.shownRelease && Prefs.installDate < 1503201600000L)) {//08/20/2017
+                        launchNewTask(ReleaseActivity::class.java, ArrayList(cookies))
+                    } else
+                        launchNewTask(if (Prefs.userId != -1L) MainActivity::class.java else SelectorActivity::class.java, ArrayList(cookies))
+                } else
                     launchNewTask(LoginActivity::class.java)
             }
         }
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/activities/MainActivity.kt b/app/src/main/kotlin/com/pitchedapps/frost/activities/MainActivity.kt
index 2893afeb..dd8ed558 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/activities/MainActivity.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/activities/MainActivity.kt
@@ -125,17 +125,6 @@ class MainActivity : BaseActivity(), SearchWebView.SearchContract,
                         "Build type" to BuildConfig.BUILD_TYPE,
                         "Frost id" to Prefs.frostId)
             }
-            if (!Showcase.shownRelease && Prefs.installDate < 1503201600000L) {//08/20/2017
-                materialDialogThemed {
-                    title("The time has come!")
-                    content("Frost for Facebook has been officially released. We thank you immensely for being with us from the start, and for allowing us to grow to what we are now." +
-                            "\nYou are now free to opt out of beta and get monthly stable updates, or stick with the beta channel and help squash bugs. It will also be amazing if you can give us a rating, and help others find this great open source alternative." +
-                            "\n\nRegards,\nAllan Wang")
-                    neutralText(R.string.kau_rate)
-                    onNeutral { _, _ -> startPlayStoreLink(R.string.play_store_package_id) }
-                    positiveText(R.string.kau_great)
-                }
-            }
         }
         setContentView(Prefs.mainActivityLayout.layoutRes)
         setSupportActionBar(toolbar)
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/activities/ReleaseActivity.kt b/app/src/main/kotlin/com/pitchedapps/frost/activities/ReleaseActivity.kt
new file mode 100644
index 00000000..cf5f125f
--- /dev/null
+++ b/app/src/main/kotlin/com/pitchedapps/frost/activities/ReleaseActivity.kt
@@ -0,0 +1,34 @@
+package com.pitchedapps.frost.activities
+
+import android.os.Bundle
+import android.widget.Button
+import android.widget.TextView
+import ca.allanwang.kau.utils.bindView
+import ca.allanwang.kau.utils.startLink
+import com.pitchedapps.frost.R
+import com.pitchedapps.frost.utils.*
+
+/**
+ * Created by Allan Wang on 2017-09-17.
+ */
+class ReleaseActivity : BaseActivity() {
+
+    val main: TextView by bindView(R.id.main)
+
+    val opt: Button by bindView(R.id.opt)
+
+    val ctn: Button by bindView(R.id.ctn)
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.activity_release)
+        opt.setOnClickListener { v ->
+            startLink(R.string.play_store_beta_link)
+        }
+        ctn.setOnClickListener { v ->
+            launchNewTask(if (Prefs.userId != -1L) MainActivity::class.java else SelectorActivity::class.java, cookies())
+        }
+        setFrostTheme()
+        setFrostColors(texts = arrayOf(opt, ctn,main ))
+    }
+}
\ No newline at end of file
-- 
cgit v1.2.3