From 14185936f46160997ef9eaae92cb3c8eacae93c5 Mon Sep 17 00:00:00 2001 From: Allan Wang 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/drawable/intro_phone_case.xml | 47 +++++++++ .../main/res/drawable/intro_phone_long_press.xml | 109 +++++++++++++++++++++ app/src/main/res/drawable/intro_phone_nav.xml | 49 +++++++++ app/src/main/res/drawable/intro_phone_screen.xml | 12 +++ app/src/main/res/drawable/intro_phone_tab.xml | 73 ++++++++++++++ .../main/res/layout/activity_image_textless.xml | 2 +- app/src/main/res/layout/activity_intro.xml | 63 ++++++++++++ app/src/main/res/layout/activity_main.xml | 2 +- app/src/main/res/layout/activity_selector.xml | 10 +- app/src/main/res/layout/intro_end.xml | 44 +++++++++ app/src/main/res/layout/intro_image.xml | 45 +++++++++ app/src/main/res/layout/intro_theme.xml | 78 +++++++++++++++ app/src/main/res/layout/intro_welcome.xml | 43 ++++++++ app/src/main/res/layout/view_account.xml | 2 +- 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 +++++ 21 files changed, 629 insertions(+), 42 deletions(-) create mode 100644 app/src/main/res/drawable/intro_phone_case.xml create mode 100644 app/src/main/res/drawable/intro_phone_long_press.xml create mode 100644 app/src/main/res/drawable/intro_phone_nav.xml create mode 100644 app/src/main/res/drawable/intro_phone_screen.xml create mode 100644 app/src/main/res/drawable/intro_phone_tab.xml create mode 100644 app/src/main/res/layout/activity_intro.xml create mode 100644 app/src/main/res/layout/intro_end.xml create mode 100644 app/src/main/res/layout/intro_image.xml create mode 100644 app/src/main/res/layout/intro_theme.xml create mode 100644 app/src/main/res/layout/intro_welcome.xml 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') diff --git a/app/src/main/res/drawable/intro_phone_case.xml b/app/src/main/res/drawable/intro_phone_case.xml new file mode 100644 index 00000000..105eadef --- /dev/null +++ b/app/src/main/res/drawable/intro_phone_case.xml @@ -0,0 +1,47 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/intro_phone_long_press.xml b/app/src/main/res/drawable/intro_phone_long_press.xml new file mode 100644 index 00000000..68f78e77 --- /dev/null +++ b/app/src/main/res/drawable/intro_phone_long_press.xml @@ -0,0 +1,109 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/intro_phone_nav.xml b/app/src/main/res/drawable/intro_phone_nav.xml new file mode 100644 index 00000000..a4ead7d0 --- /dev/null +++ b/app/src/main/res/drawable/intro_phone_nav.xml @@ -0,0 +1,49 @@ + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/intro_phone_screen.xml b/app/src/main/res/drawable/intro_phone_screen.xml new file mode 100644 index 00000000..69aeb26d --- /dev/null +++ b/app/src/main/res/drawable/intro_phone_screen.xml @@ -0,0 +1,12 @@ + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/intro_phone_tab.xml b/app/src/main/res/drawable/intro_phone_tab.xml new file mode 100644 index 00000000..822769f0 --- /dev/null +++ b/app/src/main/res/drawable/intro_phone_tab.xml @@ -0,0 +1,73 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_image_textless.xml b/app/src/main/res/layout/activity_image_textless.xml index 3c0cc685..c5da87e6 100644 --- a/app/src/main/res/layout/activity_image_textless.xml +++ b/app/src/main/res/layout/activity_image_textless.xml @@ -24,7 +24,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="end|bottom" - android:layout_margin="@dimen/fab_margin" + android:layout_margin="@dimen/kau_fab_margin" android:visibility="invisible" /> \ No newline at end of file diff --git a/app/src/main/res/layout/activity_intro.xml b/app/src/main/res/layout/activity_intro.xml new file mode 100644 index 00000000..839e33a9 --- /dev/null +++ b/app/src/main/res/layout/activity_intro.xml @@ -0,0 +1,63 @@ + + + + + + + + + +