From 14185936f46160997ef9eaae92cb3c8eacae93c5 Mon Sep 17 00:00:00 2001
From: Allan Wang <me@allanwang.ca>
Date: Sun, 30 Jul 2017 15:57:27 -0700
Subject: Intro (#100)

* Create base activity

* Created some testers

* Update theme and fix mess up

* Update theme and replace paint

* WIP intro drawables

* Create intro screens

* Clear unnecessary dependencies

* Finalize intro panels

* Clean up intro

* Attack intro to settings

* Fix lint

* Finalize intro
---
 app/src/main/res/values/dimens.xml          | 10 ++--------
 app/src/main/res/values/ids.xml             |  6 ++++++
 app/src/main/res/values/strings_intro.xml   | 17 +++++++++++++++++
 app/src/main/res/values/strings_libs.xml    | 26 --------------------------
 app/src/main/res/values/strings_preferences |  1 +
 app/src/main/res/values/strings_temp.xml    |  6 ++++++
 app/src/main/res/values/styles.xml          | 26 ++++++++++++++++++++++++++
 7 files changed, 58 insertions(+), 34 deletions(-)
 create mode 100644 app/src/main/res/values/strings_intro.xml
 delete mode 100644 app/src/main/res/values/strings_libs.xml
 create mode 100644 app/src/main/res/values/strings_temp.xml

(limited to 'app/src/main/res/values')

diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 4fc2f6c7..f7855b5b 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -1,15 +1,9 @@
 <resources>
-    <!-- Default screen margins, per the Android Design guidelines. -->
-    <dimen name="activity_horizontal_margin">16dp</dimen>
-    <dimen name="activity_vertical_margin">16dp</dimen>
-    <dimen name="dialog_margin">24dp</dimen>
-    <dimen name="dialog_margin_bottom">16dp</dimen>
-
-    <dimen name="fab_margin">16dp</dimen>
-    <dimen name="appbar_padding_top">8dp</dimen>
     <dimen name="splash_logo">16dp</dimen>
     <dimen name="progress_bar_height">1dip</dimen>
     <dimen name="account_image_size">100dp</dimen>
 
     <dimen name="context_menu_height">60dp</dimen>
+
+    <dimen name="intro_bar_height">64dp</dimen>
 </resources>
diff --git a/app/src/main/res/values/ids.xml b/app/src/main/res/values/ids.xml
index a0bb0a87..d32a3b71 100644
--- a/app/src/main/res/values/ids.xml
+++ b/app/src/main/res/values/ids.xml
@@ -3,4 +3,10 @@
     <item name="item_account" type="id" />
     <item name="item_keyword" type="id" />
     <item name="item_about_links" type="id" />
+
+    <item name="intro_phone" type="id" />
+    <item name="intro_phone_screen" type="id" />
+    <item name="intro_title" type="id" />
+    <item name="intro_image" type="id" />
+    <item name="intro_desc" type="id" />
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings_intro.xml b/app/src/main/res/values/strings_intro.xml
new file mode 100644
index 00000000..866772bc
--- /dev/null
+++ b/app/src/main/res/values/strings_intro.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="skip">Skip</string>
+    <string name="intro_welcome_to_frost">Welcome to Frost</string>
+    <string name="intro_slide_to_continue">Slide to continue</string>
+    <string name="intro_select_theme">Select a theme</string>
+
+    <string name="intro_multiple_accounts">Multiple Accounts</string>
+    <string name="intro_multiple_accounts_desc">Add and switch accounts directly from the navigation bar.\nTap the current avatar to jump to your profile.</string>
+    <string name="intro_easy_navigation">Easy Navigation</string>
+    <string name="intro_easy_navigation_desc">Slide between views with a swipe, and click the tab icon to go back to the top.\nClick the icon again to reload the page.</string>
+    <string name="intro_context_aware">Context Aware</string>
+    <string name="intro_context_aware_desc">Long press links to copy and share them.\nLong press images to zoom and download.\nLong press cards to scroll horizontally.</string>
+
+    <string name="intro_end">Let\'s Begin!</string>
+    <string name="intro_tap_to_exit">Tap anywhere to exit</string>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings_libs.xml b/app/src/main/res/values/strings_libs.xml
deleted file mode 100644
index 9cbb77d7..00000000
--- a/app/src/main/res/values/strings_libs.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="define_dbflow" />
-    <!-- Author section -->
-    <string name="library_dbflow_author">Raizlabs</string>
-    <string name="library_dbflow_authorWebsite">https://www.raizlabs.com/</string>
-    <!-- Library section -->
-    <string name="library_dbflow_libraryName">DbFlow</string>
-    <string name="library_dbflow_libraryDescription">
-        <![CDATA[
-        A robust, powerful, and very simple ORM android database library with <b>annotation processing</b>.
-        <br/><br/>
-        The library is built on speed, performance, and approachability. It not only eliminates most boiler-plate code for dealing with databases, but also provides a powerful and simple API to manage interactions.
-        Let DBFlow make SQL code <i>flow</i> like a steady stream so you can focus on writing amazing apps.
-        ]]>
-    </string>
-    <string name="library_dbflow_libraryWebsite">https://github.com/Raizlabs/DBFlow</string>
-    <string name="library_dbflow_libraryVersion">4.0.4</string>
-    <!-- OpenSource section -->
-    <string name="library_dbflow_isOpenSource">true</string>
-    <string name="library_dbflow_repositoryLink">https://github.com/Raizlabs/DBFlow</string>
-    <!-- ClassPath for autoDetect section -->
-    <string name="library_dbflow_classPath">com.raizlabs.android.dbflow</string>
-    <!-- License section -->
-    <string name="library_dbflow_licenseId">mit</string>
-</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings_preferences b/app/src/main/res/values/strings_preferences
index 0bb1d22f..1108d08d 100644
--- a/app/src/main/res/values/strings_preferences
+++ b/app/src/main/res/values/strings_preferences
@@ -16,4 +16,5 @@
     <string name="get_pro">Get Frost Pro</string>
     <string name="get_pro_desc">Purchase or restore pro and unlock the full potential of Frost! Includes ad blockers, custom themes, full configurations, and much more to come!</string>
 
+    <string name="replay_intro">Replay Introduction</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings_temp.xml b/app/src/main/res/values/strings_temp.xml
new file mode 100644
index 00000000..526b102d
--- /dev/null
+++ b/app/src/main/res/values/strings_temp.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="intro_title">Frost now has an intro screen</string>
+    <string name="intro_desc">Would you like to see it? You can always replay it under settings</string>
+
+</resources>
\ 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 a483b5f0..b91710d2 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -56,8 +56,34 @@
         <item name="colorAccent">@color/frost_splash_background</item>
     </style>
 
+    <style name="FrostTheme.Intro" parent="FrostTheme.Transparent" />
+
     <style name="FrostProgressBar" parent="Widget.AppCompat.ProgressBar.Horizontal">
         <item name="android:minHeight">@dimen/progress_bar_height</item>
         <item name="android:maxHeight">@dimen/progress_bar_height</item>
     </style>
+
+    <style name="IntroBarButton" parent="Widget.AppCompat.Button.Borderless">
+        <item name="android:elevation">0dp</item>
+        <item name="android:minWidth">100dp</item>
+        <item name="android:layout_marginStart">@dimen/kau_padding_small</item>
+        <item name="android:layout_marginEnd">@dimen/kau_padding_small</item>
+    </style>
+
+    <style name="IntroTitle" parent="TextAppearance.AppCompat.Title">
+        <item name="android:textSize">20sp</item>
+        <item name="android:textAlignment">center</item>
+    </style>
+
+    <style name="IntroSubTitle" parent="TextAppearance.AppCompat.Subhead">
+        <item name="android:textSize">18sp</item>
+        <item name="android:textAlignment">center</item>
+    </style>
+
+    <style name="IntroButton" parent="TextAppearance.AppCompat.Button">
+        <item name="android:elevation">0dp</item>
+        <item name="android:background">?android:selectableItemBackgroundBorderless</item>
+        <item name="android:padding">@dimen/kau_padding_large</item>
+    </style>
+
 </resources>
-- 
cgit v1.2.3