-
Notifications
You must be signed in to change notification settings - Fork 521
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'new-onboarding-ui' of github.com:oppia/oppia-android in…
…to onboarding-profile-configuration
- Loading branch information
Showing
27 changed files
with
2,248 additions
and
90 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
139 changes: 139 additions & 0 deletions
139
app/src/main/res/layout-land/onboarding_profile_type_fragment.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,139 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <layout xmlns:android="http://schemas.android.com/apk/res/android" | ||
| xmlns:app="http://schemas.android.com/apk/res-auto"> | ||
|
|
||
| <androidx.constraintlayout.widget.ConstraintLayout | ||
| android:layout_width="match_parent" | ||
| android:layout_height="match_parent"> | ||
|
|
||
| <TextView | ||
| android:id="@+id/profile_type_title" | ||
| style="@style/OnboardingProfileTypeHeaderStyle" | ||
| android:layout_margin="@dimen/onboarding_shared_margin_xl" | ||
| android:text="@string/onboarding_profile_type_activity_header" | ||
| app:layout_constraintEnd_toEndOf="parent" | ||
| app:layout_constraintStart_toStartOf="parent" | ||
| app:layout_constraintTop_toTopOf="parent" /> | ||
|
|
||
| <androidx.constraintlayout.widget.Guideline | ||
| android:id="@+id/profile_type_center_guide" | ||
| android:layout_width="wrap_content" | ||
| android:layout_height="wrap_content" | ||
| android:orientation="horizontal" | ||
| app:layout_constraintGuide_percent="0.45" /> | ||
|
|
||
| <org.oppia.android.app.customview.OppiaCurveBackgroundView | ||
| android:id="@+id/onboarding_profile_type_background" | ||
| android:layout_width="match_parent" | ||
| android:layout_height="0dp" | ||
| app:customBackgroundColor="@color/component_color_onboarding_profile_type_background_color" | ||
| app:layout_constraintTop_toBottomOf="@id/profile_type_center_guide" /> | ||
|
|
||
| <androidx.constraintlayout.widget.ConstraintLayout | ||
| android:id="@+id/profile_type_learner_navigation_container" | ||
| android:layout_width="match_parent" | ||
| android:layout_height="wrap_content" | ||
| android:layout_marginTop="@dimen/onboarding_shared_margin_small" | ||
| android:layout_marginBottom="@dimen/onboarding_shared_margin_small" | ||
| app:layout_constraintBottom_toTopOf="@id/onboarding_navigation_back" | ||
| app:layout_constraintEnd_toEndOf="parent" | ||
| app:layout_constraintStart_toStartOf="parent" | ||
| app:layout_constraintTop_toBottomOf="@id/profile_type_title"> | ||
|
|
||
| <com.google.android.material.card.MaterialCardView | ||
| android:id="@+id/profile_type_learner_navigation_card" | ||
| style="@style/OnboardingProfileTypeNavigationCardStyle" | ||
| android:layout_width="wrap_content" | ||
| android:layout_height="wrap_content" | ||
| android:layout_marginStart="@dimen/onboarding_shared_margin_medium_small" | ||
| android:layout_marginEnd="@dimen/onboarding_shared_margin_medium_small" | ||
| app:layout_constraintEnd_toStartOf="@id/profile_type_supervisor_navigation_card" | ||
| app:layout_constraintHorizontal_chainStyle="packed" | ||
| app:layout_constraintStart_toStartOf="parent" | ||
| app:layout_constraintTop_toTopOf="parent"> | ||
|
|
||
| <androidx.constraintlayout.widget.ConstraintLayout | ||
| android:layout_width="match_parent" | ||
| android:layout_height="wrap_content"> | ||
|
|
||
| <ImageView | ||
| android:id="@+id/profile_type_learner_image" | ||
| android:layout_width="wrap_content" | ||
| android:layout_height="wrap_content" | ||
| android:contentDescription="@string/onboarding_learner_otter_content_description" | ||
| android:scaleType="centerCrop" | ||
| app:layout_constraintBottom_toTopOf="@id/profile_type_learner_text" | ||
| app:layout_constraintStart_toStartOf="parent" | ||
| app:layout_constraintTop_toTopOf="parent" | ||
| app:srcCompat="@drawable/learner_otter" /> | ||
|
|
||
| <TextView | ||
| android:id="@+id/profile_type_learner_text" | ||
| style="@style/OnboardingProfileTypeTextStyle" | ||
| android:layout_width="0dp" | ||
| android:layout_height="wrap_content" | ||
| android:text="@string/onboarding_profile_type_activity_student_text" | ||
| app:layout_constraintEnd_toEndOf="@id/profile_type_learner_image" | ||
| app:layout_constraintStart_toStartOf="parent" | ||
| app:layout_constraintTop_toBottomOf="@id/profile_type_learner_image" /> | ||
| </androidx.constraintlayout.widget.ConstraintLayout> | ||
| </com.google.android.material.card.MaterialCardView> | ||
|
|
||
| <com.google.android.material.card.MaterialCardView | ||
| android:id="@+id/profile_type_supervisor_navigation_card" | ||
| style="@style/OnboardingProfileTypeNavigationCardStyle" | ||
| android:layout_width="wrap_content" | ||
| android:layout_height="wrap_content" | ||
| android:layout_marginStart="@dimen/onboarding_shared_margin_medium_small" | ||
| android:layout_marginEnd="@dimen/onboarding_shared_margin_medium_small" | ||
| app:layout_constraintEnd_toEndOf="parent" | ||
| app:layout_constraintStart_toEndOf="@id/profile_type_learner_navigation_card" | ||
| app:layout_constraintTop_toTopOf="parent"> | ||
|
|
||
| <androidx.constraintlayout.widget.ConstraintLayout | ||
| android:layout_width="match_parent" | ||
| android:layout_height="wrap_content"> | ||
|
|
||
| <ImageView | ||
| android:id="@+id/profile_type_parent_image" | ||
| android:layout_width="wrap_content" | ||
| android:layout_height="wrap_content" | ||
| android:contentDescription="@string/onboarding_parent_otter_content_description" | ||
| android:scaleType="centerCrop" | ||
| app:layout_constraintStart_toStartOf="parent" | ||
| app:layout_constraintTop_toTopOf="parent" | ||
| app:srcCompat="@drawable/parent_teacher_otter" /> | ||
|
|
||
| <TextView | ||
| android:id="@+id/profile_type_parent_text" | ||
| style="@style/OnboardingProfileTypeTextStyle" | ||
| android:layout_width="0dp" | ||
| android:layout_height="wrap_content" | ||
| android:text="@string/onboarding_profile_type_activity_parent_text" | ||
| app:layout_constraintEnd_toEndOf="@id/profile_type_parent_image" | ||
| app:layout_constraintStart_toStartOf="parent" | ||
| app:layout_constraintTop_toBottomOf="@id/profile_type_parent_image" /> | ||
| </androidx.constraintlayout.widget.ConstraintLayout> | ||
| </com.google.android.material.card.MaterialCardView> | ||
| </androidx.constraintlayout.widget.ConstraintLayout> | ||
|
|
||
| <Button | ||
| android:id="@+id/onboarding_navigation_back" | ||
| android:layout_width="wrap_content" | ||
| android:layout_height="wrap_content" | ||
| android:layout_marginStart="@dimen/onboarding_shared_margin_large" | ||
| android:layout_marginBottom="@dimen/onboarding_shared_margin_medium" | ||
| android:background="@drawable/onboarding_back_button_white_background" | ||
| android:fontFamily="sans-serif-medium" | ||
| android:gravity="center" | ||
| android:minWidth="@dimen/clickable_item_min_width" | ||
| android:minHeight="@dimen/clickable_item_min_height" | ||
| android:padding="@dimen/onboarding_shared_padding_medium_small" | ||
| android:text="@string/onboarding_navigation_back" | ||
| android:textAllCaps="false" | ||
| android:textColor="@color/component_color_onboarding_shared_green_color" | ||
| android:textSize="@dimen/onboarding_shared_text_size_medium" | ||
| app:layout_constraintBottom_toBottomOf="parent" | ||
| app:layout_constraintStart_toStartOf="parent" /> | ||
| </androidx.constraintlayout.widget.ConstraintLayout> | ||
| </layout> |
Oops, something went wrong.