diff --git a/app/src/main/res/layout-land/onboarding_slide_final.xml b/app/src/main/res/layout-land/onboarding_slide_final.xml index 6881cdcbcce..a62021edc69 100644 --- a/app/src/main/res/layout-land/onboarding_slide_final.xml +++ b/app/src/main/res/layout-land/onboarding_slide_final.xml @@ -79,6 +79,7 @@ android:text="@string/get_started" android:textColor="@color/component_color_shared_secondary_4_text_color" android:textSize="14sp" + android:textAllCaps="false" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toEndOf="@+id/slide_image_view" app:layout_constraintTop_toBottomOf="@id/slide_description_text_view" /> diff --git a/app/src/main/res/layout-land/resume_lesson_fragment.xml b/app/src/main/res/layout-land/resume_lesson_fragment.xml index 41675fc3d42..e317a2eff27 100644 --- a/app/src/main/res/layout-land/resume_lesson_fragment.xml +++ b/app/src/main/res/layout-land/resume_lesson_fragment.xml @@ -81,7 +81,7 @@ android:minWidth="144dp" android:minHeight="@dimen/clickable_item_min_height" android:text="@string/start_over_lesson_button" - android:textAllCaps="true" + android:textAllCaps="false" android:textColor="@color/component_color_shared_secondary_button_background_trim_color" android:textSize="14sp" app:backgroundTint="@null" @@ -100,7 +100,7 @@ android:minWidth="144dp" android:minHeight="@dimen/clickable_item_min_height" android:text="@string/resume_lesson_button" - android:textAllCaps="true" + android:textAllCaps="false" android:textColor="@color/component_color_shared_secondary_4_text_color" android:textSize="14sp" app:backgroundTint="@null" diff --git a/app/src/main/res/layout-sw600dp-land/onboarding_slide_final.xml b/app/src/main/res/layout-sw600dp-land/onboarding_slide_final.xml index 2877085c736..b33f3480486 100644 --- a/app/src/main/res/layout-sw600dp-land/onboarding_slide_final.xml +++ b/app/src/main/res/layout-sw600dp-land/onboarding_slide_final.xml @@ -73,6 +73,7 @@ android:text="@string/get_started" android:textColor="@color/component_color_shared_secondary_4_text_color" android:textSize="14sp" + android:textAllCaps="false" app:layout_constraintEnd_toEndOf="@+id/slide_title_text_view" app:layout_constraintStart_toStartOf="@+id/slide_title_text_view" app:layout_constraintTop_toBottomOf="@id/slide_description_text_view" /> diff --git a/app/src/main/res/layout-sw600dp-land/resume_lesson_fragment.xml b/app/src/main/res/layout-sw600dp-land/resume_lesson_fragment.xml index bd3bad52c20..5997f1069a4 100644 --- a/app/src/main/res/layout-sw600dp-land/resume_lesson_fragment.xml +++ b/app/src/main/res/layout-sw600dp-land/resume_lesson_fragment.xml @@ -111,7 +111,7 @@ android:minWidth="144dp" android:minHeight="@dimen/clickable_item_min_height" android:text="@string/start_over_lesson_button" - android:textAllCaps="true" + android:textAllCaps="false" android:textColor="@color/component_color_shared_secondary_button_background_trim_color" android:textSize="14sp" app:backgroundTint="@null" @@ -130,7 +130,7 @@ android:minWidth="144dp" android:minHeight="@dimen/clickable_item_min_height" android:text="@string/resume_lesson_button" - android:textAllCaps="true" + android:textAllCaps="false" android:textColor="@color/component_color_shared_secondary_4_text_color" android:textSize="14sp" app:backgroundTint="@null" diff --git a/app/src/main/res/layout-sw600dp-port/onboarding_slide_final.xml b/app/src/main/res/layout-sw600dp-port/onboarding_slide_final.xml index ce4f739f08d..7d56635942f 100644 --- a/app/src/main/res/layout-sw600dp-port/onboarding_slide_final.xml +++ b/app/src/main/res/layout-sw600dp-port/onboarding_slide_final.xml @@ -80,6 +80,7 @@ android:text="@string/get_started" android:textColor="@color/component_color_shared_secondary_4_text_color" android:textSize="20sp" + android:textAllCaps="false" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/slide_description_text_view" /> diff --git a/app/src/main/res/layout/add_profile_activity.xml b/app/src/main/res/layout/add_profile_activity.xml index 6a0c53c3282..417092d77a1 100644 --- a/app/src/main/res/layout/add_profile_activity.xml +++ b/app/src/main/res/layout/add_profile_activity.xml @@ -237,7 +237,6 @@ android:enabled="@{viewModel.isButtonActive()}" android:gravity="center" android:text="@string/add_profile_create_btn" - android:textAllCaps="true" android:textColor="@{viewModel.isButtonActive() ? @color/component_color_shared_secondary_4_text_color : @color/component_color_shared_button_inactive_text_color }" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toBottomOf="@+id/add_profile_activity_pin_constraint_layout" /> diff --git a/app/src/main/res/layout/concept_card_fragment_test_activity.xml b/app/src/main/res/layout/concept_card_fragment_test_activity.xml index 9fbbdcb7b6f..4894aac319d 100644 --- a/app/src/main/res/layout/concept_card_fragment_test_activity.xml +++ b/app/src/main/res/layout/concept_card_fragment_test_activity.xml @@ -7,11 +7,13 @@ android:id="@+id/open_dialog_0" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:text="Concept Card 1" /> + android:text="Concept Card 1" + android:textAllCaps="false"/>