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

Fix #5136: Modifies all caps buttons to sentence case #5157

Merged
merged 8 commits into from
Sep 30, 2023
Merged

Fix #5136: Modifies all caps buttons to sentence case #5157

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
0849722
Modifies all caps buttons to sentence case
theMr17 Sep 23, 2023
3cc6187
Updates test case
theMr17 Sep 24, 2023
a1adb5f
Removes all caps from dialog buttons
theMr17 Sep 26, 2023
ee955d1
Minor fixes
theMr17 Sep 29, 2023
d9f9145
Merge branch 'develop' into feat/remove-all-caps-buttons
adhiamboperes Sep 29, 2023
26b2648
Updates test case
theMr17 Sep 29, 2023
caf2971
Changes cellular data dialog button
theMr17 Sep 29, 2023
218c28c
Merge branch 'develop' into feat/remove-all-caps-buttons
adhiamboperes Sep 30, 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
1 change: 1 addition & 0 deletions app/src/main/res/layout-land/onboarding_slide_final.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand Down
1 change: 1 addition & 0 deletions app/src/main/res/layout-sw600dp-land/onboarding_slide_final.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand Down
1 change: 1 addition & 0 deletions app/src/main/res/layout-sw600dp-port/onboarding_slide_final.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand Down
1 change: 0 additions & 1 deletion app/src/main/res/layout/add_profile_activity.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand Down
6 changes: 4 additions & 2 deletions app/src/main/res/layout/concept_card_fragment_test_activity.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"/>

<Button
android:id="@+id/open_dialog_1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Concept Card 2" />
android:text="Concept Card 2"
android:textAllCaps="false" />
</LinearLayout>
3 changes: 2 additions & 1 deletion app/src/main/res/layout/exploration_test_activity.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@
android:id="@+id/play_exploration_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Play exploration" />
android:text="Play exploration"
android:textAllCaps="false"/>

<FrameLayout
android:id="@+id/exploration_test_fragment_placeholder"
Expand Down
1 change: 1 addition & 0 deletions app/src/main/res/layout/hint_summary.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,7 @@
android:text="@string/reveal_hint"
android:textColor="@color/component_color_hints_and_solution_summary_button_text_color"
android:textSize="14sp"
android:textAllCaps="false"
android:visibility="@{viewModel.isHintRevealed? View.GONE : View.VISIBLE}"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
Expand Down
1 change: 0 additions & 1 deletion app/src/main/res/layout/math_expression_parser_fragment.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,6 @@
android:enabled="true"
android:onClick="@{(v) -> viewModel.onParseButtonClicked()}"
android:text="@string/math_expression_parse_button_label"
android:textAllCaps="true"
android:textSize="14sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />
Expand Down
1 change: 1 addition & 0 deletions app/src/main/res/layout/onboarding_slide_final.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,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_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/slide_description_text_view" />
Expand Down
1 change: 0 additions & 1 deletion app/src/main/res/layout/profile_rename_fragment.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,6 @@
android:clickable="@{viewModel.inputName.length > 0}"
android:enabled="@{viewModel.inputName.length > 0}"
android:text="@string/profile_rename_save"
android:textAllCaps="true"
android:textColor="@{viewModel.inputName.length > 0 ? @color/component_color_shared_secondary_4_text_color : @color/component_color_shared_button_inactive_text_color }"
android:textSize="14sp"
app:layout_constraintEnd_toEndOf="parent"
Expand Down
1 change: 0 additions & 1 deletion app/src/main/res/layout/profile_reset_pin_fragment.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,6 @@
android:clickable="@{viewModel.isButtonActive()}"
android:enabled="@{viewModel.isButtonActive()}"
android:text="@string/profile_rename_save"
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/profile_reset_input_confirm_pin" />
Expand Down
1 change: 1 addition & 0 deletions app/src/main/res/layout/solution_summary.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,7 @@
android:text="@string/show_solution"
android:textColor="@color/component_color_hints_and_solution_summary_button_text_color"
android:textSize="14sp"
android:textAllCaps="false"
android:visibility="@{viewModel.isSolutionRevealed()? View.GONE : View.VISIBLE}"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
Expand Down
1 change: 1 addition & 0 deletions app/src/main/res/layout/state_fragment_test_activity.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:text="Play exploration"
android:textAllCaps="false"
android:visibility="@{viewModel.hasExplorationStarted ? View.GONE : View.VISIBLE}" />
</FrameLayout>
</layout>
6 changes: 3 additions & 3 deletions app/src/main/res/values/styles.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
<item name="android:background">@drawable/state_button_primary_background</item>
<item name="android:fontFamily">sans-serif-medium</item>
<item name="android:minHeight">@dimen/clickable_item_min_height</item>
<item name="android:textAllCaps">true</item>
<item name="android:textAllCaps">false</item>
<item name="android:textColor">@color/component_color_shared_secondary_4_text_color</item>
<item name="android:textSize">14sp</item>
</style>
Expand Down Expand Up @@ -125,7 +125,7 @@
<item name="android:layout_width">wrap_content</item>
<item name="android:layout_height">wrap_content</item>
<item name="android:padding">8dp</item>
<item name="android:textAllCaps">true</item>
<item name="android:textAllCaps">false</item>
<item name="android:background">@android:color/transparent</item>
<item name="android:textColor">#56000000</item>
<item name="android:textSize">14sp</item>
Expand Down Expand Up @@ -418,7 +418,7 @@
<item name="android:minWidth">144dp</item>
<item name="android:drawablePadding">4dp</item>
<item name="drawableTint">@color/component_color_shared_secondary_button_background_trim_color</item>
<item name="android:textAllCaps">true</item>
<item name="android:textAllCaps">false</item>
<item name="android:textColor">@color/component_color_shared_secondary_button_background_trim_color</item>
<item name="android:textSize">14sp</item>
</style>
Expand Down
Loading