Skip to content

Commit

Permalink
Fixes part of #4177: Dark mode Topic Activity Part 4 (Practice Tab) (#…
Browse files Browse the repository at this point in the history
…4598)

* fixed text cut off

* fix text cutoff in all layouts

* add proper naming

* develop updated

* minor changes

* dark_mode: Practice Fragmnet

* conflict: Resolved

* color: common color for background

* minor fixes

* color:topic fragment background
  • Loading branch information
MohitGupta121 authored Sep 27, 2022
1 parent 106330b commit d1e6fdb
Show file tree
Hide file tree
Showing 6 changed files with 14 additions and 6 deletions.
2 changes: 1 addition & 1 deletion app/src/main/res/layout/topic_practice_fragment.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
android:id="@+id/topic_practice_skill_list"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/oppia_background"
android:background="@color/component_color_topic_practice_fragment_background_color"
android:clipToPadding="false"
android:overScrollMode="never"
android:paddingStart="@dimen/topic_practice_fragment_padding_start"
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/layout/topic_practice_header_view.xml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
style="@style/Subtitle1ViewStart"
android:layout_marginTop="4dp"
android:text="@string/topic_practice_skills_description"
android:textColor="@color/oppia_secondary_text"
android:textColor="@color/component_color_topic_practice_header_view_description_text_color"
app:layout_constraintStart_toStartOf="@+id/master_skills_text_view"
app:layout_constraintTop_toBottomOf="@+id/master_skills_text_view" />
</androidx.constraintlayout.widget.ConstraintLayout>
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/layout/topic_practice_subtopic.xml
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
android:minHeight="@dimen/clickable_item_min_height"
android:text="@{viewModel.subtopicTitle}"
android:textAlignment="viewStart"
android:textColor="@color/oppia_primary_text"
android:textColor="@color/color_palette_topic_practice_subtopic_text_color"
android:textSize="16sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
Expand Down
4 changes: 3 additions & 1 deletion app/src/main/res/values-night/color_palette.xml
Original file line number Diff line number Diff line change
Expand Up @@ -105,5 +105,7 @@
<color name="color_palette_menu_text_color">@color/color_def_white</color>
<color name="color_palette_secondary_container_background_color">@color/color_def_oppia_metallic_blue</color>
<color name="color_palette_concept_status_bar_color">@color/color_def_dark_purple</color>
<color name="color_palette_topic_revision_background_color">@color/color_def_oppia_light_black</color>
<color name="color_palette_topic_fragments_background_color">@color/color_def_oppia_light_black</color>
<color name="color_palette_topic_practice_header_description_color">@color/color_def_oppia_silver</color>
<color name="color_palette_topic_practice_subtopic_text_color">@color/color_def_white</color>
</resources>
4 changes: 3 additions & 1 deletion app/src/main/res/values/color_palette.xml
Original file line number Diff line number Diff line change
Expand Up @@ -105,5 +105,7 @@
<color name="color_palette_menu_text_color">@color/color_def_black</color>
<color name="color_palette_secondary_container_background_color">@color/color_def_teal_blue</color>
<color name="color_palette_concept_status_bar_color">@color/color_def_dark_red</color>
<color name="color_palette_topic_revision_background_color">@color/color_def_oppia_white_2</color>
<color name="color_palette_topic_fragments_background_color">@color/color_def_oppia_white_2</color>
<color name="color_palette_topic_practice_header_description_color">@color/color_def_accessible_light_grey_2</color>
<color name="color_palette_topic_practice_subtopic_text_color">@color/color_def_accessible_grey</color>
</resources>
6 changes: 5 additions & 1 deletion app/src/main/res/values/component_colors.xml
Original file line number Diff line number Diff line change
Expand Up @@ -280,6 +280,10 @@
<color name="component_color_audio_fragment_seekbar_progress_color">@color/color_palette_icon_background_secondary_color</color>
<color name="component_color_audio_fragment_seekbar_color">@color/color_palette_seekbar_progress_background_color</color>
<!-- Topic Revision Fragment -->
<color name="component_color_topic_revision_fragment_background_color">@color/color_palette_topic_revision_background_color</color>
<color name="component_color_topic_revision_fragment_background_color">@color/color_palette_topic_fragments_background_color</color>
<!-- Topic Practice Fragment -->
<color name="component_color_topic_practice_fragment_background_color">@color/color_palette_topic_fragments_background_color</color>
<color name="component_color_topic_practice_header_view_description_text_color">@color/color_palette_topic_practice_header_description_color</color>
<color name="component_color_topic_practice_subtopic_checkbox_text_color">@color/color_palette_primary_container_background_color</color>

</resources>

0 comments on commit d1e6fdb

Please sign in to comment.