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/layout | |
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/layout')
-rw-r--r-- | app/src/main/res/layout/activity_image_textless.xml | 2 | ||||
-rw-r--r-- | app/src/main/res/layout/activity_intro.xml | 63 | ||||
-rw-r--r-- | app/src/main/res/layout/activity_main.xml | 2 | ||||
-rw-r--r-- | app/src/main/res/layout/activity_selector.xml | 10 | ||||
-rw-r--r-- | app/src/main/res/layout/intro_end.xml | 44 | ||||
-rw-r--r-- | app/src/main/res/layout/intro_image.xml | 45 | ||||
-rw-r--r-- | app/src/main/res/layout/intro_theme.xml | 78 | ||||
-rw-r--r-- | app/src/main/res/layout/intro_welcome.xml | 43 | ||||
-rw-r--r-- | app/src/main/res/layout/view_account.xml | 2 |
9 files changed, 281 insertions, 8 deletions
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" |