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 part of #5661: Add Missing style Attributes to TextViews #5682

Open
wants to merge 10 commits into
base: develop
Choose a base branch
from
Open

Fix part of #5661: Add Missing style Attributes to TextViews #5682

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
5ea3aaa
- Created appropriate styles in styles.xml for the updated TextViews
Harsh2118-hub Jan 31, 2025
1c14e4f
update
Harsh2118-hub Feb 1, 2025
0d8c29e
Merge branch 'develop' into fix5661
Harsh2118-hub Feb 1, 2025
282cdd0
Update styles.xml
Harsh2118-hub Feb 1, 2025
d7a2d8a
update
Harsh2118-hub Feb 2, 2025
4000f70
update
Harsh2118-hub Feb 2, 2025
f5325bc
update
Harsh2118-hub Feb 2, 2025
21c408d
Update
Harsh2118-hub Feb 3, 2025
c7f5fc5
Merge branch 'develop' into fix5661
Harsh2118-hub Feb 4, 2025
cc75485
Merge branch 'develop' into fix5661
Harsh2118-hub Feb 7, 2025
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
19 changes: 5 additions & 14 deletions app/src/main/res/layout-land/walkthrough_final_fragment.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,13 +53,11 @@

<TextView
android:id="@+id/walkthrough_final_no_text_view"
style="@style/WalkthroughFinalNoTextViewStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:fontFamily="sans-serif"
android:text="@string/no"
android:textColor="@color/component_color_shared_primary_text_color"
android:textSize="20sp" />
android:text="@string/no" />

<TextView
android:id="@+id/walkthrough_final_no_center_text_view"
Expand Down Expand Up @@ -88,13 +86,11 @@

<TextView
android:id="@+id/walkthrough_final_yes_text_view"
style="@style/WalkthroughFinalYesTextViewStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:fontFamily="sans-serif"
android:text="@string/yes"
android:textColor="@color/component_color_shared_secondary_6_text_color"
android:textSize="20sp" />
android:text="@string/yes" />

<TextView
android:id="@+id/walkthrough_final_yes_center_text_view"
Expand Down Expand Up @@ -127,12 +123,7 @@

<TextView
android:id="@+id/walkthrough_final_title_text_view"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:fontFamily="sans-serif"
android:text="@string/great"
android:textColor="@color/component_color_shared_primary_text_color"
android:textSize="24sp"
style="@style/WalkthroughFinalTitleTextViewStyle"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@+id/walkthrough_final_image_view"
app:layout_constraintTop_toTopOf="@+id/walkthrough_final_image_view" />
Expand Down
5 changes: 2 additions & 3 deletions app/src/main/res/layout/drawer_fragment.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,14 +72,13 @@

<TextView
android:id="@+id/developer_options_text_view"
style="@style/DeveloperOptionsTextViewStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginStart="12dp"
android:fontFamily="sans-serif-medium"
android:text="@string/developer_options"
android:textColor="@{footerViewModel.isDeveloperOptionsSelected ? @color/component_color_drawer_fragment_developer_options_selected_text_color : @color/component_color_shared_primary_dark_text_color}"
android:textSize="14sp" />
android:textColor="@{footerViewModel.isDeveloperOptionsSelected ? @color/component_color_drawer_fragment_developer_options_selected_text_color : @color/component_color_shared_primary_dark_text_color}" />
</LinearLayout>

<LinearLayout
Expand Down
22 changes: 3 additions & 19 deletions app/src/main/res/layout/feedback_item.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,27 +42,11 @@

<TextView
android:id="@+id/feedback_text_view"
style="@style/FeedbackTextViewStyle"
android:breakStrategy="simple"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:breakStrategy="simple"
tools:targetApi="23"
android:fontFamily="sans-serif"
android:minWidth="48dp"
android:minHeight="48dp"
android:text="@{htmlContent}"
android:textColor="@color/component_color_shared_primary_text_color"
android:textColorLink="@color/component_color_shared_link_text_color"
android:textSize="16sp"
android:visibility="@{htmlContent.length() > 0 ? View.VISIBLE : View.GONE, default=gone}"
app:explorationSplitViewPaddingApplicable="@{viewModel.hasConversationView &amp;&amp; viewModel.isSplitView}"
app:explorationSplitViewPaddingBottom="@{@dimen/feedback_item_exploration_split_view_padding_bottom}"
app:explorationSplitViewPaddingEnd="@{@dimen/feedback_item_exploration_split_view_padding_end}"
app:explorationSplitViewPaddingStart="@{@dimen/feedback_item_exploration_split_view_padding_start}"
app:explorationSplitViewPaddingTop="@{@dimen/feedback_item_exploration_split_view_padding_top}"
app:explorationViewPaddingApplicable="@{viewModel.hasConversationView &amp;&amp; !viewModel.isSplitView}"
app:explorationViewPaddingBottom="@{@dimen/feedback_item_exploration_view_padding_bottom}"
app:explorationViewPaddingEnd="@{@dimen/feedback_item_exploration_view_padding_end}"
app:explorationViewPaddingStart="@{@dimen/feedback_item_exploration_view_padding_start}"
app:explorationViewPaddingTop="@{@dimen/feedback_item_exploration_view_padding_top}" />
android:visibility="@{htmlContent.length() > 0 ? View.VISIBLE : View.GONE, default=gone}" />
</FrameLayout>
</layout>
10 changes: 2 additions & 8 deletions app/src/main/res/layout/item_selection_interaction_items.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,15 +35,9 @@
android:checked="@{viewModel.answerSelected}" />
<TextView
android:id="@+id/item_selection_contents_text_view"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:layout_marginTop="4dp"
android:layout_marginEnd="8dp"
style="@style/ItemSelectionContentsTextViewStyle"
android:layout_toEndOf="@+id/item_selection_checkbox"
android:fontFamily="sans-serif"
android:text="@{htmlContent}"
android:textColor="@{viewModel.isEnabled ? @color/component_color_shared_item_selection_interaction_enabled_color : @color/component_color_shared_item_selection_interaction_disabled_color}"
android:textSize="16sp" />
android:textColor="@{viewModel.isEnabled ? @color/component_color_shared_item_selection_interaction_enabled_color : @color/component_color_shared_item_selection_interaction_disabled_color}" />
</RelativeLayout>
</layout>
11 changes: 1 addition & 10 deletions app/src/main/res/layout/lessons_completed_chapter_view.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,21 +22,12 @@

<TextView
android:id="@+id/chapter_index"
android:layout_width="wrap_content"
android:layout_height="match_parent"
style="@style/ChapterIndexTextViewStyle"
android:background="@color/component_color_lessons_tab_activity_lessons_completed_chapter_index_background_color"
android:fontFamily="sans-serif"
android:gravity="center"
android:importantForAccessibility="yes"
android:minWidth="60dp"
android:minHeight="48dp"
android:paddingStart="8dp"
android:paddingTop="12dp"
android:paddingEnd="8dp"
android:paddingBottom="12dp"
android:text="@{viewModel.computePlayChapterIndexText()}"
android:textColor="@color/component_color_shared_secondary_4_text_color"
android:textSize="20sp"
android:contentDescription="@{viewModel.computeChapterPlayStateIconContentDescription()}"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
Expand Down
8 changes: 2 additions & 6 deletions app/src/main/res/layout/lessons_in_progress_chapter_view.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,18 +29,14 @@

<TextView
android:id="@+id/chapter_index"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
style="@style/ChapterIndexTextViewStyle"
android:layout_gravity="center"
android:layout_marginStart="10dp"
android:fontFamily="sans-serif"
android:importantForAccessibility="no"
android:minWidth="20dp"
android:minHeight="20dp"
android:text="@{viewModel.computePlayChapterIndexText()}"
android:textAlignment="center"
android:textColor="@color/component_color_shared_secondary_4_text_color"
android:textSize="16sp" />
android:textAlignment="center" />

<ImageView
android:id="@+id/chapter_play_state_icon"
Expand Down
8 changes: 2 additions & 6 deletions app/src/main/res/layout/lessons_locked_chapter_view.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,18 +30,14 @@

<TextView
android:id="@+id/chapter_index"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
style="@style/ChapterIndexTextViewStyle"
android:layout_gravity="center"
android:layout_marginStart="10dp"
android:fontFamily="sans-serif"
android:importantForAccessibility="no"
android:minWidth="20dp"
android:minHeight="20dp"
android:text="@{viewModel.computePlayChapterIndexText()}"
android:textAlignment="center"
android:textColor="@color/component_color_shared_secondary_4_text_color"
android:textSize="16sp" />
android:textAlignment="center" />

<ImageView
android:id="@+id/chapter_play_state_icon"
Expand Down
11 changes: 1 addition & 10 deletions app/src/main/res/layout/lessons_not_started_chapter_view.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,20 +24,11 @@

<TextView
android:id="@+id/chapter_index"
android:layout_width="wrap_content"
android:layout_height="match_parent"
style="@style/ChapterIndexTextViewStyle"
android:layout_marginStart="0dp"
android:background="@drawable/chapter_dark_green_bg_with_bright_green_border"
android:fontFamily="sans-serif"
android:gravity="center"
android:importantForAccessibility="no"
android:minWidth="60dp"
android:minHeight="48dp"
android:paddingStart="8dp"
android:paddingEnd="8dp"
android:text="@{viewModel.computePlayChapterIndexText()}"
android:textColor="@color/component_color_shared_secondary_4_text_color"
android:textSize="20sp"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />

Expand Down
9 changes: 3 additions & 6 deletions app/src/main/res/layout/onboarding_language_dropdown_item.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,9 @@

<TextView
android:id="@+id/onboarding_language_text_view"
style="@style/OnboardingLanguageTextViewStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:fontFamily="sans-serif"
android:padding="@dimen/onboarding_shared_padding_medium"
android:textColor="@color/component_color_onboarding_shared_text_color"
android:textSize="@dimen/onboarding_shared_text_size_medium"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
android:text="Language"
/>
</FrameLayout>
10 changes: 3 additions & 7 deletions app/src/main/res/layout/profile_list_sync_status_item.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
<?xml version="1.0" encoding="utf-8"?>
<layout xmlns:android="http://schemas.android.com/apk/res/android">

<data>
Expand All @@ -9,9 +8,6 @@

<TextView
android:id="@+id/learner_analytics_sync_status_text_view"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="bottom"
android:text="@{viewModel.syncStatus}"
android:textSize="16sp" />
</layout>
style="@style/LearnerAnalyticsSyncStatusTextViewStyle"
android:text="@{viewModel.syncStatus}" />
</layout>
8 changes: 2 additions & 6 deletions app/src/main/res/layout/test_text_view_bindable_adapter_activity.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,6 @@

<TextView
android:id="@+id/test_text_view"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:fontFamily="sans-serif-medium"
android:padding="10dp"
android:text="@string/app_name"
android:textSize="18sp" />
style="@style/TestTextViewStyle"
android:text="@string/app_name" />
</layout>
20 changes: 6 additions & 14 deletions app/src/main/res/layout/walkthrough_final_fragment.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,13 +58,11 @@

<TextView
android:id="@+id/walkthrough_final_no_text_view"
style="@style/WalkthroughFinalNoTextViewStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:fontFamily="sans-serif"
android:text="@string/no"
android:textColor="@color/component_color_shared_primary_text_color"
android:textSize="20sp" />
android:text="@string/no" />

<TextView
android:id="@+id/walkthrough_final_no_center_text_view"
Expand Down Expand Up @@ -93,13 +91,12 @@

<TextView
android:id="@+id/walkthrough_final_yes_text_view"
style="@style/WalkthroughFinalYesTextViewStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:fontFamily="sans-serif"
android:text="@string/yes"
android:textColor="@color/component_color_shared_secondary_6_text_color"
android:textSize="20sp" />
android:text="@string/yes" />


<TextView
android:id="@+id/walkthrough_final_yes_center_text_view"
Expand Down Expand Up @@ -134,13 +131,8 @@

<TextView
android:id="@+id/walkthrough_final_title_text_view"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
style="@style/WalkthroughFinalTitleTextViewStyle"
android:layout_marginTop="32dp"
android:fontFamily="sans-serif"
android:text="@string/great"
android:textColor="@color/component_color_shared_primary_text_color"
android:textSize="24sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
Expand Down
86 changes: 86 additions & 0 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 @@ -826,4 +826,90 @@
<item name="endIconDrawable">@drawable/ic_arrow_drop_down_black_24dp</item>
<item name="endIconTint">@color/component_color_shared_black_background_color</item>
</style>

<style name="WalkthroughFinalNoTextViewStyle" parent="TextView.Common1">
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You can reuse these styles for the respective IDs present in layout-land/walkthrough_final_fragment.xml

<item name="android:fontFamily">sans-serif</item>
<item name="android:textSize">16sp</item>
<item name="android:textColor">@color/component_color_shared_primary_text_color</item>
</style>

<style name="WalkthroughFinalYesTextViewStyle" parent="TextView.Common1">
<item name="android:fontFamily">sans-serif</item>
<item name="android:textSize">20sp</item>
<item name="android:textColor">@color/component_color_shared_secondary_6_text_color</item>
</style>

<style name="DeveloperOptionsTextViewStyle" parent="TextView.Common1">
<item name="android:fontFamily">sans-serif-medium</item>
<item name="android:textSize">14sp</item>
<item name="android:textColor">@color/component_color_shared_primary_dark_text_color</item>
</style>

<style name="OnboardingLanguageTextViewStyle" parent="TextView.Common1">
<item name="android:layout_width">wrap_content</item>
<item name="android:layout_height">wrap_content</item>
<item name="android:textSize">16sp</item>
<item name="android:textColor">@color/component_color_shared_primary_text_color</item>
<item name="android:fontFamily">sans-serif</item>
<item name="android:padding">8dp</item>
</style>

<style name="WalkthroughFinalTitleTextViewStyle" parent="TextView.Common1">
<item name="android:layout_width">wrap_content</item>
<item name="android:layout_height">wrap_content</item>
<item name="android:textSize">24sp</item>
<item name="android:textColor">@color/component_color_shared_primary_text_color</item>
<item name="android:fontFamily">sans-serif</item>
</style>

<style name="ChapterIndexTextViewStyle" parent="TextView.Common1">
<item name="android:layout_width">wrap_content</item>
<item name="android:layout_height">match_parent</item>
<item name="android:textSize">20sp</item>
<item name="android:textColor">@color/component_color_shared_secondary_4_text_color</item>
<item name="android:fontFamily">sans-serif</item>
<item name="android:gravity">center</item>
<item name="android:minWidth">60dp</item>
<item name="android:minHeight">48dp</item>
<item name="android:paddingStart">8dp</item>
<item name="android:paddingEnd">8dp</item>
</style>

<style name="TestTextViewStyle" parent="TextView.Common1">
<item name="android:layout_width">wrap_content</item>
<item name="android:layout_height">wrap_content</item>
<item name="android:fontFamily">sans-serif-medium</item>
<item name="android:padding">10dp</item>
<item name="android:textSize">18sp</item>
<item name="android:textColor">@color/component_color_shared_primary_text_color</item>
</style>

<style name="FeedbackTextViewStyle" parent="TextView.Common1">
<item name="android:fontFamily">sans-serif</item>
<item name="android:textSize">16sp</item>
<item name="android:textColor">@color/component_color_shared_primary_text_color</item>
<item name="android:textColorLink">@color/component_color_shared_link_text_color</item>
<item name="android:minWidth">48dp</item>
<item name="android:minHeight">48dp</item>
</style>

<style name="ItemSelectionContentsTextViewStyle" parent="TextView.Common1">
<item name="android:layout_width">wrap_content</item>
<item name="android:layout_height">wrap_content</item>
<item name="android:fontFamily">sans-serif</item>
<item name="android:paddingStart">8dp</item>
<item name="android:paddingTop">4dp</item>
<item name="android:paddingEnd">8dp</item>
<item name="android:textSize">16sp</item>
<item name="android:textColor">@color/component_color_shared_primary_text_color</item>
</style>

<style name="LearnerAnalyticsSyncStatusTextViewStyle" parent="TextView.Common1">
<item name="android:layout_width">match_parent</item>
<item name="android:layout_height">wrap_content</item>
<item name="android:gravity">bottom</item>
<item name="android:textSize">16sp</item>
<item name="android:textColor">@color/component_color_shared_primary_text_color</item>
</style>

</resources>
Loading
Loading