Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ALTAPPS-1068: Android update app first screen #790

Merged
merged 2 commits into from
Dec 15, 2023
Merged

ALTAPPS-1068: Android update app first screen #790

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8b74da1
Update welcome screen
XanderZhu Dec 14, 2023
6d93b29
Merge branch 'develop' into feature/ALTAPPS-1068/Android-update-first…
ivan-magda Dec 15, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added androidHyperskillApp/src/main/res/drawable-hdpi/img_welcome_screen.webp
View file
Open in desktop
Binary file not shown.
Binary file added androidHyperskillApp/src/main/res/drawable-mdpi/img_welcome_screen.webp
View file
Open in desktop
Binary file not shown.
Binary file added androidHyperskillApp/src/main/res/drawable-xhdpi/img_welcome_screen.webp
View file
Open in desktop
Binary file not shown.
Binary file added androidHyperskillApp/src/main/res/drawable-xxhdpi/img_welcome_screen.webp
View file
Open in desktop
Binary file not shown.
Binary file added androidHyperskillApp/src/main/res/drawable-xxxhdpi/img_welcome_screen.webp
View file
Open in desktop
Binary file not shown.
120 changes: 0 additions & 120 deletions androidHyperskillApp/src/main/res/layout-night/fragment_welcome.xml
View file
Open in desktop

This file was deleted.

61 changes: 25 additions & 36 deletions androidHyperskillApp/src/main/res/layout/fragment_welcome.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,26 +16,17 @@
android:layout_height="match_parent"
android:padding="20dp">

<ImageView
android:id="@+id/welcomeSplashLogoImageView"
android:layout_width="@dimen/welcome_splash_icon_width"
android:layout_height="@dimen/welcome_splash_icon_height"
android:src="@drawable/branded_logo"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />

<TextView
android:id="@+id/welcomeWelcomeTextView"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="20dp"
android:layout_marginTop="60dp"
android:textAlignment="center"
android:textAppearance="@style/TextAppearance.AppCompat.Body2"
android:textSize="34sp"
android:textAppearance="@style/TextAppearance.AppTheme.Headline4"
android:textColor="@color/text_primary"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/welcomeSplashLogoImageView"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintWidth_max="@dimen/auth_button_max_width"
android:text="@string/onboarding_title" />

Expand All @@ -45,8 +36,9 @@
android:layout_height="wrap_content"
android:layout_marginTop="20dp"
android:textAlignment="center"
android:textAppearance="@style/TextAppearance.AppCompat.Body1"
android:textSize="16sp"
android:textAppearance="@style/TextAppearance.AppTheme.Headline6"
android:textSize="20sp"
android:textColor="@color/color_on_surface_alpha_87"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/welcomeWelcomeTextView"
Expand All @@ -56,57 +48,54 @@
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/onboarding_problem_of_the_day_pic"
android:src="@drawable/img_welcome_screen"
app:layout_constraintBottom_toTopOf="@+id/welcomeSignInButton"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/welcomeDescriptionTextView" />
app:layout_constraintTop_toBottomOf="@+id/welcomeDescriptionTextView"
app:layout_constraintVertical_bias="0.25"
android:importantForAccessibility="no"/>

<com.google.android.material.button.MaterialButton
android:id="@+id/welcomeSignInButton"
android:id="@+id/welcomeSignUpButton"
android:layout_width="0dp"
android:layout_height="@dimen/auth_button_height"
android:layout_height="wrap_content"
app:layout_constraintWidth_max="@dimen/auth_button_max_width"
android:maxWidth="@dimen/auth_button_max_width"
android:text="@string/onboarding_primary_button_text"
android:layout_marginTop="24dp"
android:layout_marginBottom="20dp"
android:insetTop="0dp"
android:insetBottom="0dp"
android:maxWidth="@dimen/auth_button_max_width"
app:layout_constraintBottom_toTopOf="@+id/welcomeSignUpButton"
app:layout_constraintBottom_toTopOf="@+id/welcomeSignInButton"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintWidth_max="@dimen/auth_button_max_width"
app:strokeColor="?colorPrimary"
android:text="@string/onboarding_sign_in" />

/>

<com.google.android.material.button.MaterialButton
android:id="@+id/welcomeSignUpButton"
style="@style/Widget.MaterialComponents.Button.OutlinedButton"
android:id="@+id/welcomeSignInButton"
style="@style/Widget.AppTheme.Button.OutlinedButton"
android:layout_width="0dp"
android:layout_height="@dimen/auth_button_height"
android:layout_height="wrap_content"
app:layout_constraintWidth_max="@dimen/auth_button_max_width"
android:text="@string/onboarding_secondary_button_text"
android:insetTop="0dp"
android:insetBottom="0dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintVertical_bias="0"
app:layout_constraintWidth_max="@dimen/auth_button_max_width"
app:strokeColor="?colorPrimary"
android:text="@string/onboarding_sign_up" />
/>

</androidx.constraintlayout.widget.ConstraintLayout>


</androidx.core.widget.NestedScrollView>

<me.zhanghai.android.materialprogressbar.MaterialProgressBar
android:id="@+id/welcomeProgressBar"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
android:layout_gravity="center"
/>

<include
Expand Down
2 changes: 1 addition & 1 deletion androidHyperskillApp/src/main/res/values/dimens.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<!-- Auth screen -->

<dimen name="auth_button_max_width">380dp</dimen>
<dimen name="auth_button_height">48dp</dimen>
<dimen name="auth_button_height">46dp</dimen>
<dimen name="auth_button_logo_margin_left">12dp</dimen>
<dimen name="auth_button_text_size">14sp</dimen>
<dimen name="auth_hyperskill_logo_width">48dp</dimen>
Expand Down
4 changes: 4 additions & 0 deletions androidHyperskillApp/src/main/res/values/styles.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,15 @@
<item name="elevation">0dp</item>
<item name="android:insetTop">0dp</item>
<item name="android:insetBottom">0dp</item>
<item name="backgroundTint">@color/button_primary</item>
<item name="android:textColor">@color/text_on_color</item>
</style>

<style name="Widget.AppTheme.Button.OutlinedButton" parent="@style/Widget.MaterialComponents.Button.OutlinedButton">
<item name="android:insetTop">0dp</item>
<item name="android:insetBottom">0dp</item>
<item name="strokeColor">@color/button_tertiary</item>
<item name="android:textColor">@color/button_tertiary</item>
</style>

<style name="Widget.AppTheme.Button.OutlinedButton.Icon" parent="@style/Widget.Material3.Button.IconButton.Outlined">
Expand Down
1 change: 1 addition & 0 deletions androidHyperskillApp/src/main/res/values/themes.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
<item name="textAppearanceHeadline1">@style/TextAppearance.AppTheme.Headline1</item>
<item name="textAppearanceHeadline2">@style/TextAppearance.AppTheme.Headline2</item>
<item name="textAppearanceHeadline3">@style/TextAppearance.AppTheme.Headline3</item>
<item name="textAppearanceHeadline4">@style/TextAppearance.AppTheme.Headline4</item>
<item name="textAppearanceHeadline5">@style/TextAppearance.AppTheme.Headline5</item>
<item name="textAppearanceHeadline6">@style/TextAppearance.AppTheme.Headline6</item>

Expand Down
7 changes: 7 additions & 0 deletions androidHyperskillApp/src/main/res/values/type.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,13 @@
<item name="android:textColor">?android:textColorPrimary</item>
</style>

<style name="TextAppearance.AppTheme.Headline4" parent="TextAppearance.MaterialComponents.Headline3">
<item name="android:textColor">?android:textColorPrimary</item>
<item name="android:textSize">34sp</item>
<item name="fontFamily">@font/roboto_medium</item>
<item name="android:fontFamily">@font/roboto_medium</item>
</style>

<style name="TextAppearance.AppTheme.Headline5" parent="TextAppearance.MaterialComponents.Headline5">
<item name="android:textColor">?android:textColorPrimary</item>
<item name="android:textSize">24sp</item>
Expand Down
3 changes: 0 additions & 3 deletions shared/src/commonMain/resources/MR/base/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -393,9 +393,6 @@
<string name="onboarding_text">Code a little every day, wherever you are.</string>
<string name="onboarding_primary_button_text">Start for free</string>
<string name="onboarding_secondary_button_text">I already have an account</string>
<!-- TODO: ALTAPPS-1068 delete this resources -->
<string name="onboarding_sign_in">Sign in</string>
<string name="onboarding_sign_up">Sign up</string>

<!-- Notifications onboarding -->
<!-- TODO: ALTAPPS-1071 delete this string resources notifications_onboarding_title, notifications_onboarding_description -->
Expand Down