From 94110f575cc52a071d773f96ef6267a279d79b70 Mon Sep 17 00:00:00 2001
From: Harsh2118-hub <22bit125@ietdavv.edu.in>
Date: Fri, 21 Feb 2025 19:22:05 +0530
Subject: [PATCH 1/2] fix(#5661): Standardize TextView styles and remove
exceptions
Updated TextView elements to use centrally managed styles, ensuring consistency across the app. Removed their IDs from the exception list in .
This change improves UI consistency and maintains adherence to Oppia Android's styling guidelines.
---
.../walkthrough_final_fragment.xml | 19 ++---
app/src/main/res/layout/drawer_fragment.xml | 2 +-
app/src/main/res/layout/feedback_item.xml | 11 +--
.../item_selection_interaction_items.xml | 4 +-
.../layout/lessons_completed_chapter_view.xml | 11 +--
.../lessons_in_progress_chapter_view.xml | 8 +-
.../layout/lessons_locked_chapter_view.xml | 8 +-
.../lessons_not_started_chapter_view.xml | 11 +--
.../onboarding_language_dropdown_item.xml | 7 +-
.../layout/profile_list_sync_status_item.xml | 7 +-
...st_text_view_bindable_adapter_activity.xml | 8 +-
.../res/layout/walkthrough_final_fragment.xml | 19 ++---
app/src/main/res/values/styles.xml | 78 +++++++++++++++++++
.../android/scripts/xml/TextViewStyleCheck.kt | 42 ----------
14 files changed, 105 insertions(+), 130 deletions(-)
diff --git a/app/src/main/res/layout-land/walkthrough_final_fragment.xml b/app/src/main/res/layout-land/walkthrough_final_fragment.xml
index d6956a5369a..e0d0dde1253 100644
--- a/app/src/main/res/layout-land/walkthrough_final_fragment.xml
+++ b/app/src/main/res/layout-land/walkthrough_final_fragment.xml
@@ -53,13 +53,11 @@
+ android:text="@string/no" />
+ android:text="@string/yes" />
diff --git a/app/src/main/res/layout/drawer_fragment.xml b/app/src/main/res/layout/drawer_fragment.xml
index 59ee16aa952..6f4715ff124 100644
--- a/app/src/main/res/layout/drawer_fragment.xml
+++ b/app/src/main/res/layout/drawer_fragment.xml
@@ -72,11 +72,11 @@
diff --git a/app/src/main/res/layout/feedback_item.xml b/app/src/main/res/layout/feedback_item.xml
index 4bc646346bc..500563d7b28 100644
--- a/app/src/main/res/layout/feedback_item.xml
+++ b/app/src/main/res/layout/feedback_item.xml
@@ -42,18 +42,13 @@
diff --git a/app/src/main/res/layout/lessons_in_progress_chapter_view.xml b/app/src/main/res/layout/lessons_in_progress_chapter_view.xml
index dfd3b226eda..5425b32709d 100644
--- a/app/src/main/res/layout/lessons_in_progress_chapter_view.xml
+++ b/app/src/main/res/layout/lessons_in_progress_chapter_view.xml
@@ -29,18 +29,14 @@
+ android:textAlignment="center" />
+ android:textAlignment="center" />
diff --git a/app/src/main/res/layout/onboarding_language_dropdown_item.xml b/app/src/main/res/layout/onboarding_language_dropdown_item.xml
index 2e5dfb53e28..8221fb9ca38 100644
--- a/app/src/main/res/layout/onboarding_language_dropdown_item.xml
+++ b/app/src/main/res/layout/onboarding_language_dropdown_item.xml
@@ -6,12 +6,7 @@
diff --git a/app/src/main/res/layout/profile_list_sync_status_item.xml b/app/src/main/res/layout/profile_list_sync_status_item.xml
index 3f6685f7755..0327fc79754 100644
--- a/app/src/main/res/layout/profile_list_sync_status_item.xml
+++ b/app/src/main/res/layout/profile_list_sync_status_item.xml
@@ -9,9 +9,6 @@
+ style="@style/LearnerAnalyticsSyncStatusTextViewStyle"
+ android:text="@{viewModel.syncStatus}" />
diff --git a/app/src/main/res/layout/test_text_view_bindable_adapter_activity.xml b/app/src/main/res/layout/test_text_view_bindable_adapter_activity.xml
index 418cfe14dd6..7bcd6866058 100644
--- a/app/src/main/res/layout/test_text_view_bindable_adapter_activity.xml
+++ b/app/src/main/res/layout/test_text_view_bindable_adapter_activity.xml
@@ -3,10 +3,6 @@
+ style="@style/TestTextViewStyle"
+ android:text="@string/app_name" />
diff --git a/app/src/main/res/layout/walkthrough_final_fragment.xml b/app/src/main/res/layout/walkthrough_final_fragment.xml
index 9c5b1567f6b..db4c4245ac6 100644
--- a/app/src/main/res/layout/walkthrough_final_fragment.xml
+++ b/app/src/main/res/layout/walkthrough_final_fragment.xml
@@ -58,13 +58,11 @@
+ android:text="@string/no" />
+ android:text="@string/yes" />
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 1cc8f1ea810..46f7548c4ce 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -826,4 +826,82 @@
- @drawable/ic_arrow_drop_down_black_24dp
- @color/component_color_shared_black_background_color
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/scripts/src/java/org/oppia/android/scripts/xml/TextViewStyleCheck.kt b/scripts/src/java/org/oppia/android/scripts/xml/TextViewStyleCheck.kt
index b840bc1ece7..08a7490faa8 100644
--- a/scripts/src/java/org/oppia/android/scripts/xml/TextViewStyleCheck.kt
+++ b/scripts/src/java/org/oppia/android/scripts/xml/TextViewStyleCheck.kt
@@ -189,17 +189,6 @@ private class TextViewStyleCheck {
// TODO(#5661): Add missing styles for TextView IDs.
private val attributeIds = listOf(
- "@+id/developer_options_text_view",
- "@+id/onboarding_language_text_view",
- "@+id/walkthrough_final_no_text_view",
- "@+id/walkthrough_final_yes_text_view",
- "@+id/walkthrough_final_title_text_view",
- "@+id/chapter_index",
- "@+id/chapter_index",
- "@+id/test_text_view",
- "@+id/feedback_text_view",
- "@+id/item_selection_contents_text_view",
- "@+id/learner_analytics_sync_status_text_view",
"@+id/text_view_for_int_no_data_binding",
"@+id/walkthrough_topic_name_text_view",
"@+id/walkthrough_lesson_count_text_view",
@@ -238,55 +227,24 @@ private val attributeIds = listOf(
"@+id/chapter_title",
"@+id/walkthrough_welcome_title_text_view",
"@+id/story_name_text_view",
- "@+id/topic_name_text_view",
- "@+id/chapter_index",
"@+id/copyright_license_text_view",
- "@+id/multiple_choice_content_text_view",
"@+id/ga_update_notice_dialog_message",
"@+id/create_profile_picture_prompt",
"@+id/profile_reset_pin_main",
"@+id/submitted_answer_text_view",
- "@+id/language_text_view",
"@+id/end_session_header_text_view",
"@+id/end_session_body_text_view",
"@+id/question_progress_text",
"@+id/congratulations_text_view",
"@+id/beta_notice_dialog_message",
- "@+id/chapter_index",
"@+id/onboarding_language_explanation",
- "@+id/onboarding_steps_count",
- "@+id/create_profile_picture_prompt",
"@+id/create_profile_title",
- "@+id/end_session_header_text_view",
- "@+id/end_session_body_text_view",
- "@+id/question_progress_text",
- "@+id/congratulations_text_view",
- "@+id/walkthrough_final_no_text_view",
- "@+id/walkthrough_final_yes_text_view",
- "@+id/walkthrough_final_title_text_view",
"@+id/profile_name_text_view",
- "@+id/create_profile_picture_prompt",
- "@+id/create_profile_title",
- "@+id/end_session_header_text_view",
- "@+id/end_session_body_text_view",
- "@+id/question_progress_text",
- "@+id/congratulations_text_view",
"@+id/resume_lesson_chapter_title_text_view",
- "@+id/topic_name_text_view",
"@+id/story_count_text_view",
"@+id/download_size_text_view",
- "@+id/onboarding_language_explanation",
- "@+id/onboarding_steps_count",
- "@+id/create_profile_picture_prompt",
- "@+id/create_profile_title",
- "@+id/end_session_header_text_view",
- "@+id/end_session_body_text_view",
- "@+id/question_progress_text",
"@+id/options_activity_selected_options_title",
"@+id/profile_select_text",
- "@+id/continue_studying_text_view",
"@+id/extra_controls_title",
- "@+id/chapter_title",
- "@+id/options_activity_selected_options_title",
"@+id/view_all_text_view"
)
From 4824c251dfb37bf643c8dfb559393cf07ac8f18a Mon Sep 17 00:00:00 2001
From: Harsh2118-hub <22bit125@ietdavv.edu.in>
Date: Fri, 21 Feb 2025 19:34:58 +0530
Subject: [PATCH 2/2] update
---
app/src/main/res/values/styles.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 46f7548c4ce..f59932aecad 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -859,7 +859,7 @@
- 24sp
- @color/component_color_shared_primary_text_color
- sans-serif
- - @string/great"
+ - @string/great