diff options
author | Allan Wang <me@allanwang.ca> | 2017-07-30 15:57:27 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-07-30 15:57:27 -0700 |
commit | 14185936f46160997ef9eaae92cb3c8eacae93c5 (patch) | |
tree | 616d132c4191cd025788e9d7faa9654cf20fa9fd /app/src/main/res | |
parent | d94bc858c8a0c273d87d705eb06d35cfd9cf9e08 (diff) | |
download | frost-14185936f46160997ef9eaae92cb3c8eacae93c5.tar.gz frost-14185936f46160997ef9eaae92cb3c8eacae93c5.tar.bz2 frost-14185936f46160997ef9eaae92cb3c8eacae93c5.zip |
Intro (#100)v1.4.1
* 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
Diffstat (limited to 'app/src/main/res')
21 files changed, 629 insertions, 42 deletions
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 @@ +<?xml version="1.0" encoding="utf-8"?> +<layer-list xmlns:android="http://schemas.android.com/apk/res/android"> + <item android:bottom="149.9dp"> + <shape> + <corners + android:topLeftRadius="5dp" + android:topRightRadius="5dp" /> + <size + android:width="90dp" + android:height="10.1dp" /> + <solid android:color="#888" /> + </shape> + </item> + <item android:top="149.9dp"> + <shape> + <corners + android:bottomLeftRadius="5dp" + android:bottomRightRadius="5dp" /> + <size + android:width="90dp" + android:height="10.1dp" /> + <solid android:color="#888" /> + </shape> + </item> + <item + android:bottom="10dp" + android:right="87dp" + android:top="10dp"> + <shape> + <size + android:width="3dp" + android:height="140dp" /> + <solid android:color="#888" /> + </shape> + </item> + <item + android:bottom="10dp" + android:left="87dp" + android:top="10dp"> + <shape> + <size + android:width="3dp" + android:height="140dp" /> + <solid android:color="#888" /> + </shape> + </item> +</layer-list>
\ 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 @@ +<?xml version="1.0" encoding="utf-8"?> +<layer-list xmlns:android="http://schemas.android.com/apk/res/android"> + <item + android:id="@id/intro_phone" + android:drawable="@drawable/intro_phone_case" /> + <item + android:id="@id/intro_phone_screen" + android:drawable="@drawable/intro_phone_screen" /> + <item + android:id="@+id/intro_phone_toolbar" + android:bottom="135dp" + android:left="3dp" + android:right="3dp" + android:top="10dp"> + <shape> + <solid android:color="#f0f" /> + </shape> + </item> + <item + android:id="@+id/intro_phone_image" + android:bottom="65dp" + android:left="3dp" + android:right="3dp" + android:top="30dp"> + <shape> + <solid android:color="#f0f" /> + </shape> + </item> + <item + android:id="@+id/intro_phone_image_indicator" + android:bottom="95.5dp" + android:left="43dp" + android:right="43dp" + android:top="60.5dp"> + <shape android:shape="oval"> + <solid android:color="#800000ff" /> + </shape> + </item> + <item + android:id="@+id/intro_phone_like" + android:bottom="57dp" + android:left="3dp" + android:right="60dp" + android:top="95dp"> + <shape> + <solid android:color="#f00" /> + </shape> + </item> + <item + android:id="@+id/intro_phone_comment" + android:bottom="57dp" + android:left="30dp" + android:right="30dp" + android:top="95dp"> + <shape> + <solid android:color="#ddff0000" /> + </shape> + </item> + <item + android:id="@+id/intro_phone_share" + android:bottom="57dp" + android:left="60dp" + android:right="3dp" + android:top="95dp"> + <shape> + <solid android:color="#aaff0000" /> + </shape> + </item> + <item + android:id="@+id/intro_phone_comment_indicator" + android:bottom="59dp" + android:left="43dp" + android:right="43dp" + android:top="97dp"> + <shape android:shape="oval"> + <solid android:color="#800000ff" /> + </shape> + </item> + <item + android:id="@+id/intro_phone_card_1" + android:bottom="10dp" + android:left="3dp" + android:right="31dp" + android:top="115dp"> + <shape> + <solid android:color="#aaff0000" /> + </shape> + </item> + <item + android:id="@+id/intro_phone_card_2" + android:bottom="10dp" + android:left="61dp" + android:right="3dp" + android:top="115dp"> + <shape> + <solid android:color="#aaff0000" /> + </shape> + </item> + <item + android:id="@+id/intro_phone_card_indicator" + android:bottom="25.5dp" + android:left="43dp" + android:right="43dp" + android:top="130.5dp"> + <shape android:shape="oval"> + <solid android:color="#800000ff" /> + </shape> + </item> +</layer-list>
\ 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 @@ +<?xml version="1.0" encoding="utf-8"?> +<layer-list xmlns:android="http://schemas.android.com/apk/res/android"> + <item + android:id="@id/intro_phone" + android:drawable="@drawable/intro_phone_case" /> + <item + android:id="@id/intro_phone_screen" + android:drawable="@drawable/intro_phone_screen" /> + <item + android:id="@+id/intro_phone_nav" + android:bottom="10dp" + android:left="3dp" + android:right="23dp" + android:top="50dp"> + <shape> + <solid android:color="#f0f" /> + </shape> + </item> + <item + android:id="@+id/intro_phone_header" + android:bottom="110dp" + android:left="3dp" + android:right="23dp" + android:top="10dp"> + <shape> + <solid android:color="#f00" /> + </shape> + </item> + <item + android:id="@+id/intro_phone_avatar_1" + android:bottom="130dp" + android:left="8dp" + android:right="67dp" + android:top="15dp"> + <shape android:shape="oval"> + <solid android:color="#f0f" /> + </shape> + </item> + <item + android:id="@+id/intro_phone_avatar_2" + android:bottom="135dp" + android:left="53dp" + android:right="27dp" + android:top="15dp"> + <shape android:shape="oval"> + <solid android:color="#f0f" /> + </shape> + </item> +</layer-list>
\ 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 @@ +<?xml version="1.0" encoding="utf-8"?> +<layer-list xmlns:android="http://schemas.android.com/apk/res/android"> + <item + android:bottom="10dp" + android:left="3dp" + android:right="3dp" + android:top="10dp"> + <shape> + <solid android:color="#000" /> + </shape> + </item> +</layer-list>
\ 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 @@ +<?xml version="1.0" encoding="utf-8"?> +<layer-list xmlns:android="http://schemas.android.com/apk/res/android"> + <item + android:id="@id/intro_phone" + android:drawable="@drawable/intro_phone_case" /> + <item + android:id="@id/intro_phone_screen" + android:drawable="@drawable/intro_phone_screen" /> + <item + android:id="@+id/intro_phone_tab" + android:bottom="135dp" + android:left="3dp" + android:right="3dp" + android:top="10dp"> + <shape> + <solid android:color="#f0f" /> + </shape> + </item> + <item + android:id="@+id/intro_phone_icon_1" + android:bottom="140dp" + android:left="11dp" + android:right="74dp" + android:top="15dp"> + <shape> + <corners android:radius="1.5dp" /> + <solid android:color="#f00" /> + </shape> + </item> + <item + android:id="@+id/intro_phone_icon_2" + android:bottom="140dp" + android:left="32dp" + android:right="53dp" + android:top="15dp"> + <shape> + <corners android:radius="1.5dp" /> + <solid android:color="#f00" /> + </shape> + </item> + <item + android:id="@+id/intro_phone_icon_3" + android:bottom="140dp" + android:left="53dp" + android:right="32dp" + android:top="15dp"> + <shape> + <corners android:radius="1.5dp" /> + <solid android:color="#f00" /> + </shape> + </item> + <item + android:id="@+id/intro_phone_icon_4" + android:bottom="140dp" + android:left="74dp" + android:right="11dp" + android:top="15dp"> + <shape> + <corners android:radius="1.5dp" /> + <solid android:color="#f00" /> + </shape> + </item> + <item + android:id="@+id/intro_phone_icon_ripple" + android:bottom="129dp" + android:left="0dp" + android:right="63dp" + android:top="4dp"> + <shape android:shape="oval"> + <solid android:color="#800000ff" /> + </shape> + </item> +</layer-list>
\ 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" /> </android.support.design.widget.CoordinatorLayout>
\ 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 @@ +<?xml version="1.0" encoding="utf-8"?> +<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:app="http://schemas.android.com/apk/res-auto" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:fitsSystemWindows="true"> + + <ca.allanwang.kau.ui.views.RippleCanvas + android:id="@+id/intro_ripple" + android:layout_width="0dp" + android:layout_height="0dp" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" /> + + <android.support.constraint.Guideline + android:id="@+id/intro_bar_guide" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:orientation="horizontal" + app:layout_constraintGuide_end="@dimen/intro_bar_height" /> + + <android.support.v4.view.ViewPager + android:id="@+id/intro_viewpager" + android:layout_width="0dp" + android:layout_height="0dp" + app:layout_constraintBottom_toTopOf="@id/intro_bar_guide" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" /> + + <Button + android:id="@+id/intro_skip" + style="@style/IntroBarButton" + android:layout_width="wrap_content" + android:layout_height="0dp" + android:text="@string/skip" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@id/intro_bar_guide" /> + + <ca.allanwang.kau.ui.widgets.InkPageIndicator + android:id="@+id/intro_indicator" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintHorizontal_bias="0.5" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@id/intro_bar_guide" + app:layout_constraintVertical_bias="0.5" /> + + <ImageButton + android:id="@+id/intro_next" + style="@style/IntroBarButton" + android:layout_width="wrap_content" + android:layout_height="0dp" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintTop_toBottomOf="@id/intro_bar_guide" /> + +</android.support.constraint.ConstraintLayout>
\ No newline at end of file diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 0da7f179..440cbba3 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -43,7 +43,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="gone" /> </android.support.design.widget.CoordinatorLayout> diff --git a/app/src/main/res/layout/activity_selector.xml b/app/src/main/res/layout/activity_selector.xml index e3e9642a..a5f90aab 100644 --- a/app/src/main/res/layout/activity_selector.xml +++ b/app/src/main/res/layout/activity_selector.xml @@ -5,17 +5,17 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:id="@+id/container" - android:paddingBottom="@dimen/activity_vertical_margin" - android:paddingEnd="@dimen/activity_horizontal_margin" - android:paddingStart="@dimen/activity_horizontal_margin" - android:paddingTop="@dimen/activity_vertical_margin"> + android:paddingBottom="@dimen/kau_activity_vertical_margin" + android:paddingEnd="@dimen/kau_activity_horizontal_margin" + android:paddingStart="@dimen/kau_activity_horizontal_margin" + android:paddingTop="@dimen/kau_activity_vertical_margin"> <android.support.v7.widget.AppCompatTextView android:id="@+id/text_select_account" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center_horizontal" - android:layout_marginTop="@dimen/activity_vertical_margin" + android:layout_marginTop="@dimen/kau_activity_vertical_margin" android:text="@string/select_facebook_account" android:textColor="@android:color/white" app:layout_constraintEnd_toEndOf="parent" diff --git a/app/src/main/res/layout/intro_end.xml b/app/src/main/res/layout/intro_end.xml new file mode 100644 index 00000000..10132546 --- /dev/null +++ b/app/src/main/res/layout/intro_end.xml @@ -0,0 +1,44 @@ +<?xml version="1.0" encoding="utf-8"?> +<android.support.constraint.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_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/intro_end" + 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" + android:src="@drawable/frost_f_256" + app:layout_constraintBottom_toTopOf="@id/intro_desc" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@id/intro_title" + tools:layout_editor_absoluteX="112dp" /> + + <TextView + android:id="@id/intro_desc" + style="@style/IntroSubTitle" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/intro_tap_to_exit" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@id/intro_image" /> + +</android.support.constraint.ConstraintLayout>
\ No newline at end of file diff --git a/app/src/main/res/layout/intro_image.xml b/app/src/main/res/layout/intro_image.xml new file mode 100644 index 00000000..5b1e317d --- /dev/null +++ b/app/src/main/res/layout/intro_image.xml @@ -0,0 +1,45 @@ +<?xml version="1.0" encoding="utf-8"?> +<android.support.constraint.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:layout_height="match_parent"> + + <TextView + android:id="@id/intro_title" + style="@style/IntroTitle" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:lines="1" + android:padding="@dimen/kau_padding_large" + 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="0dp" + android:layout_height="0dp" + android:padding="@dimen/kau_padding_large" + android:scaleType="fitCenter" + app:layout_constraintBottom_toTopOf="@id/intro_desc" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@id/intro_title" + tools:layout_editor_absoluteX="112dp" /> + + <TextView + android:id="@id/intro_desc" + style="@style/IntroSubTitle" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:lines="3" + android:padding="@dimen/kau_padding_large" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@id/intro_image" /> + +</android.support.constraint.ConstraintLayout>
\ No newline at end of file diff --git a/app/src/main/res/layout/intro_theme.xml b/app/src/main/res/layout/intro_theme.xml new file mode 100644 index 00000000..2a8cead3 --- /dev/null +++ b/app/src/main/res/layout/intro_theme.xml @@ -0,0 +1,78 @@ +<?xml version="1.0" encoding="utf-8"?> +<android.support.constraint.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: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/intro_select_theme" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintHorizontal_bias="0.5" + app:layout_constraintVertical_bias="0.15" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" /> + + <Button + android:id="@+id/intro_theme_light" + style="@style/IntroButton" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/kau_light" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintHorizontal_bias="0.25" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@id/intro_title" + app:layout_constraintVertical_bias="0.33" + tools:layout_editor_absoluteX="112dp" /> + + <Button + android:id="@+id/intro_theme_dark" + style="@style/IntroButton" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/kau_dark" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintHorizontal_bias="0.75" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@id/intro_title" + app:layout_constraintVertical_bias="0.33" + tools:layout_editor_absoluteX="112dp" /> + + <Button + android:id="@+id/intro_theme_amoled" + style="@style/IntroButton" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/kau_amoled" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintHorizontal_bias="0.25" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@id/intro_title" + app:layout_constraintVertical_bias="0.66" + tools:layout_editor_absoluteX="112dp" /> + + <Button + android:id="@+id/intro_theme_glass" + style="@style/IntroButton" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/kau_glass" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintHorizontal_bias="0.75" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@id/intro_title" + app:layout_constraintVertical_bias="0.66" + tools:layout_editor_absoluteX="112dp" /> + + +</android.support.constraint.ConstraintLayout>
\ No newline at end of file diff --git a/app/src/main/res/layout/intro_welcome.xml b/app/src/main/res/layout/intro_welcome.xml new file mode 100644 index 00000000..b53af755 --- /dev/null +++ b/app/src/main/res/layout/intro_welcome.xml @@ -0,0 +1,43 @@ +<?xml version="1.0" encoding="utf-8"?> +<android.support.constraint.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: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/intro_welcome_to_frost" + 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" + android:src="@drawable/frost_f_256" + app:layout_constraintBottom_toTopOf="@id/intro_desc" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@id/intro_title" + tools:layout_editor_absoluteX="112dp" /> + + <TextView + android:id="@id/intro_desc" + style="@style/IntroSubTitle" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/intro_slide_to_continue" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@id/intro_image" /> + +</android.support.constraint.ConstraintLayout>
\ No newline at end of file diff --git a/app/src/main/res/layout/view_account.xml b/app/src/main/res/layout/view_account.xml index 92486184..63d3e9cd 100644 --- a/app/src/main/res/layout/view_account.xml +++ b/app/src/main/res/layout/view_account.xml @@ -3,7 +3,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:orientation="vertical" - android:padding="@dimen/activity_vertical_margin"> + android:padding="@dimen/kau_activity_vertical_margin"> <ImageView android:id="@+id/account_image" 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> |