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.

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

Fixed #5182 - All warnings in "Internationalization" #5183

Merged
merged 5 commits into from
Oct 14, 2023
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
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/profile_progress_header.xml
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@
android:contentDescription="@string/edit_profile_picture_content_description"
android:onClick="@{() -> viewModel.clickOnProfilePicture()}"
android:paddingStart="12dp"
android:paddingEnd="0dp"
android:paddingTop="12dp"
android:elevation="4dp"
app:layout_constraintBottom_toBottomOf="@+id/profile_edit_image"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
android:paddingTop="28dp"
android:paddingEnd="16dp"
android:paddingBottom="20dp"
android:text="Learner Study Analytics"
android:text="@string/learner_analytics_title"
Rd4dev marked this conversation as resolved.
Show resolved Hide resolved
android:textColor="@color/component_color_shared_active_text_color"
app:layout_constraintBottom_toTopOf="@id/profile_and_device_id_text_view"
app:layout_constraintEnd_toEndOf="parent"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@
android:elevation="4dp"
android:onClick="@{() -> viewModel.clickOnProfilePicture()}"
android:paddingStart="12dp"
android:paddingEnd="0dp"
android:paddingTop="12dp"
app:layout_constraintBottom_toBottomOf="@+id/profile_edit_image"
app:layout_constraintEnd_toEndOf="@+id/profile_edit_image"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@
android:layout_margin="8dp"
android:background="@drawable/edit_text_background"
android:focusable="true"
android:hint="Write the digit here."
android:hint="@string/text_number_input_hint"
Rd4dev marked this conversation as resolved.
Show resolved Hide resolved
android:textColor="@color/component_color_shared_primary_text_color"
android:textColorHint="@color/component_color_shared_edit_text_hint_color"
android:longClickable="false"
Expand Down Expand Up @@ -154,7 +154,7 @@
android:layout_margin="8dp"
android:background="@drawable/edit_text_background"
android:focusable="true"
android:hint="Write here."
android:hint="@string/text_text_input_hint"
Rd4dev marked this conversation as resolved.
Show resolved Hide resolved
android:inputType="text"
android:longClickable="false"
android:maxLength="200"
Expand All @@ -181,7 +181,7 @@
android:layout_height="wrap_content"
android:layout_margin="8dp"
android:onClick="getPendingAnswerErrorOnSubmitClick"
android:text="Submit"
android:text="@string/state_submit_button"
Rd4dev marked this conversation as resolved.
Show resolved Hide resolved
android:textColor="@color/component_color_shared_secondary_4_text_color" />
</LinearLayout>
</ScrollView>
Expand Down
1 change: 1 addition & 0 deletions app/src/main/res/layout/add_profile_activity.xml
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@
android:contentDescription="@string/edit_profile_picture_content_description"
android:elevation="4dp"
android:paddingStart="12dp"
android:paddingEnd="0dp"
android:paddingTop="12dp"
app:layout_constraintBottom_toBottomOf="@+id/add_profile_activity_user_image_view"
app:layout_constraintEnd_toEndOf="@+id/add_profile_activity_user_image_view"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
android:paddingTop="28dp"
android:paddingEnd="16dp"
android:paddingBottom="20dp"
android:text="Learner Study Analytics"
android:text="@string/learner_analytics_title"
android:textColor="@color/component_color_shared_active_text_color"
app:layout_constraintBottom_toTopOf="@id/profile_and_device_id_text_view"
app:layout_constraintEnd_toEndOf="parent"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +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="@string/concept_card_one_button_text"
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="@string/concept_card_two_button_text"
android:textAllCaps="false" />
</LinearLayout>
2 changes: 1 addition & 1 deletion app/src/main/res/layout/exploration_test_activity.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
android:id="@+id/play_exploration_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Play exploration"
android:text="@string/play_exploration_button_text"
android:textAllCaps="false"/>

<FrameLayout
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/layout/font_scale_test_activity.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:fontFamily="sans-serif"
android:text="html Content"
android:text="@string/font_scale_html_content_text"
android:textColor="@color/component_color_shared_primary_text_color"
android:textSize="20sp" />
</FrameLayout>
1 change: 1 addition & 0 deletions app/src/main/res/layout/profile_progress_header.xml
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@
android:elevation="4dp"
android:onClick="@{() -> viewModel.clickOnProfilePicture()}"
android:paddingStart="8dp"
android:paddingEnd="0dp"
android:paddingTop="8dp"
app:layout_constraintBottom_toBottomOf="@+id/profile_edit_image"
app:layout_constraintEnd_toEndOf="@+id/profile_edit_image"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
android:id="@+id/sample_spotlight_target"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="This is a sample text view"
android:text="@string/sample_text_view"
Rd4dev marked this conversation as resolved.
Show resolved Hide resolved
style="@style/TextViewStart"
android:layout_marginTop="80dp"
android:layout_marginStart="80dp"
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/layout/state_fragment_test_activity.xml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:text="Play exploration"
android:text="@string/play_exploration_button_text"
android:textAllCaps="false"
android:visibility="@{viewModel.hasExplorationStarted ? View.GONE : View.VISIBLE}" />
</FrameLayout>
Expand Down
9 changes: 9 additions & 0 deletions app/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
<string name="menu_my_downloads">My Downloads</string>
<string name="menu_help">Help</string>
<string name="exploration_activity_title">Exploration Player</string>
<string name="play_exploration_button_text">Play exploration</string>
<string name="help_activity_title">Help</string>
<string name="bottom_sheet_options_menu_close">Close</string>
<string name="menu_switch_profile">Switch Profile</string>
Expand All @@ -27,6 +28,8 @@
<string name="cellular_data_alert_dialog_description">Streaming audio may use a lot of cellular data.</string>
<string name="cellular_data_alert_dialog_checkbox">Don\'t show this message again</string>
<string name="concept_card_toolbar_title">Concept Card</string>
<string name="concept_card_one_button_text">Concept Card 1</string>
<string name="concept_card_two_button_text">Concept Card 2</string>
<string name="revision_card_toolbar_title">Revision Card</string>
<string name="unsaved_exploration_dialog_title">Leave to Topic Page?</string>
<string name="unsaved_exploration_dialog_description">Your progress will not be saved.</string>
Expand Down Expand Up @@ -68,6 +71,7 @@
<string name="topic_download_text">(%s)</string>
<string name="see_more">See More</string>
<string name="see_less">See Less</string>
<string name="sample_text_view">This is a sample text view</string>
<string name="FAQs">FAQs</string>
<string name="featured_questions">Featured Questions</string>
<string name="frequently_asked_questions">Frequently Asked Questions</string>
Expand Down Expand Up @@ -356,6 +360,8 @@
<string name="add_profile_required">Required</string>
<string name="back_button">Back Button</string>
<string name="next">Next</string>
<!-- ProfileAndDeviceIDsActivity -->
<string name="learner_analytics_title">Learner Study Analytics</string>
<!-- AdministratorControlsFragment -->
<string name="administrator_controls_general_label">General</string>
<string name="administrator_controls_edit_account">Edit account</string>
Expand Down Expand Up @@ -482,6 +488,8 @@
<string name="ratio_content_description_separator" description="The separator that would be used to build the text that would be read out for ratio interaction.For e.g if the input is 1:2:3 the read out text would be 1 to 2 to 3">\u0020to\u0020</string>
<string name="ratio_default_hint_text" description="The default hint text for the ratio interaction if the placeholder text is not available.">Enter a ratio in the form x:y.</string>
<string name="text_input_default_hint_text">Tap here to enter text.</string>
<string name="text_number_input_hint">Write the digit here.</string>
<string name="text_text_input_hint">Write here.</string>
<string name="smallest_text_size_content_description">Smallest text size</string>
<string name="largest_text_size_content_description">Largest text size</string>
<string name="coming_soon">Coming Soon</string>
Expand Down Expand Up @@ -596,4 +604,5 @@
<string name="profile_picture_image_view_content_description">Profile Picture Image View</string>
<string name="lock_icon_content_description">Lock Icon</string>
<string name="download_status_image_content_description">Download Status</string>
<string name="font_scale_html_content_text">html Content</string>
</resources>
Loading