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

Fixes part of #4177: Dark mode Topic Activity Part 2 (Info Tab) #4570

Merged
merged 31 commits into from
Sep 14, 2022
Merged

Fixes part of #4177: Dark mode Topic Activity Part 2 (Info Tab) #4570

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
f8ee55f
fixed text cut off
MohitGupta121 May 25, 2022
d4bcf1d
Merge branch 'oppia:develop' into develop
MohitGupta121 May 25, 2022
bb3d3d4
fix text cutoff in all layouts
MohitGupta121 May 28, 2022
7153aef
Merge branch 'oppia:develop' into develop
MohitGupta121 May 28, 2022
4113302
add proper naming
MohitGupta121 May 28, 2022
c033a39
Merge branch 'develop' of https://github.com/MohitGupta121/oppia-andr…
MohitGupta121 May 28, 2022
9ea9d7c
Merge branch 'oppia:develop' into develop
MohitGupta121 Jun 6, 2022
8ba669b
Merge branch 'oppia:develop' into develop
MohitGupta121 Jun 8, 2022
7dc1b4a
Merge branch 'oppia:develop' into develop
MohitGupta121 Jun 14, 2022
0708dd6
Merge branch 'oppia:develop' into develop
MohitGupta121 Jun 23, 2022
2f3b9ec
Merge branch 'oppia:develop' into develop
MohitGupta121 Jul 1, 2022
ce3872a
develop updated
MohitGupta121 Jul 6, 2022
12bb87f
minor changes
MohitGupta121 Jul 6, 2022
690ba7e
Merge branch 'oppia:develop' into develop
MohitGupta121 Jul 12, 2022
bce7b61
Merge branch 'oppia:develop' into develop
MohitGupta121 Jul 12, 2022
9912ffc
Merge branch 'oppia:develop' into develop
MohitGupta121 Jul 22, 2022
f48f663
Merge branch 'oppia:develop' into develop
MohitGupta121 Aug 11, 2022
dacc6ee
Merge branch 'oppia:develop' into develop
MohitGupta121 Aug 16, 2022
656c283
Merge branch 'oppia:develop' into develop
MohitGupta121 Aug 17, 2022
f40026f
Merge branch 'oppia:develop' into develop
MohitGupta121 Aug 24, 2022
5461595
Merge branch 'oppia:develop' into develop
MohitGupta121 Aug 24, 2022
57268f3
Merge branch 'oppia:develop' into develop
MohitGupta121 Aug 25, 2022
b6b2363
Merge branch 'oppia:develop' into develop
MohitGupta121 Aug 30, 2022
0c77b97
Merge branch 'oppia:develop' into develop
MohitGupta121 Sep 3, 2022
53ea822
Merge branch 'oppia:develop' into develop
MohitGupta121 Sep 7, 2022
cc61a49
Merge branch 'oppia:develop' into develop
MohitGupta121 Sep 7, 2022
01e56e7
dark_mode:info section
MohitGupta121 Sep 8, 2022
e07ccd0
Merge branch 'develop' into dark_mode-TopicActivityPart2
MohitGupta121 Sep 8, 2022
332d9e7
Merge branch 'develop' into dark_mode-TopicActivityPart2
MohitGupta121 Sep 9, 2022
dd10f01
Merge branch 'oppia:develop' into dark_mode-TopicActivityPart2
MohitGupta121 Sep 13, 2022
061d2c4
changes: minor requested
MohitGupta121 Sep 13, 2022
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
4 changes: 2 additions & 2 deletions app/src/main/res/drawable/thumbnail_gradient.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
android:shape="rectangle">
<gradient
android:angle="270"
android:startColor="#00FFFFFF"
android:endColor="#FFFFFFFF"
android:startColor="@color/component_color_topic_info_fragment_thumbnail_gradient_start_color"
android:endColor="@color/component_color_topic_info_fragment_thumbnail_gradient_end_color"
android:type="linear" />
</shape>
15 changes: 8 additions & 7 deletions app/src/main/res/layout/topic_info_fragment.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<ScrollView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/color_def_white"
android:background="@color/component_color_topic_info_fragment_background_color"
android:overScrollMode="never"
android:scrollbars="none">

Expand Down Expand Up @@ -56,7 +56,7 @@
android:layout_marginBottom="8dp"
android:fontFamily="sans-serif"
android:text="@{viewModel.topicTitle}"
android:textColor="@color/oppia_primary_text"
android:textColor="@color/component_color_topic_info_fragment_topic_name_text_color"
android:textSize="24sp"
app:layout_constraintBottom_toBottomOf="@+id/topic_thumbnail_image_view"
app:layout_constraintEnd_toEndOf="parent"
Expand All @@ -73,7 +73,7 @@
android:layout_marginEnd="32dp"
android:fontFamily="sans-serif"
android:text="@{viewModel.storyCountText}"
android:textColor="@color/oppia_primary_text"
android:textColor="@color/component_color_topic_info_fragment_story_count_text_color"
android:textSize="16sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.0"
Expand Down Expand Up @@ -106,7 +106,7 @@
android:onClick="@{(v) -> viewModel.clickSeeMore()}"
android:paddingTop="8dp"
android:text="@{viewModel.isDescriptionExpanded() ? @string/see_less : @string/see_more}"
android:textColor="@color/oppia_primary"
android:textColor="@color/component_color_topic_info_fragment_see_more_text_color"
android:textSize="16sp"
android:textStyle="bold"
android:visibility="@{viewModel.isSeeMoreVisible() ? View.VISIBLE : View.GONE}"
Expand All @@ -125,7 +125,8 @@
app:srcCompat="@{viewModel.downloadStatusIndicatorDrawableResourceId, default=@drawable/ic_available_offline_primary_24dp}"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/see_more_text_view" />
app:layout_constraintTop_toBottomOf="@+id/see_more_text_view"
app:tint="@color/component_color_topic_info_fragment_download_status_image_color" />

<TextView
android:id="@+id/download_story_count_text_view"
Expand All @@ -135,7 +136,7 @@
android:layout_marginStart="12dp"
android:fontFamily="sans-serif"
android:text="@string/topic_downloaded"
android:textColor="@color/oppia_primary_text"
android:textColor="@color/component_color_topic_info_fragment_download_story_count_text_color"
android:textSize="18sp"
app:layout_constraintBottom_toBottomOf="@+id/download_status_image_view"
app:layout_constraintHorizontal_bias="0.0"
Expand All @@ -151,7 +152,7 @@
android:layout_marginEnd="32dp"
android:fontFamily="sans-serif"
android:text="@{viewModel.topicSizeText}"
android:textColor="@color/oppia_primary_text"
android:textColor="@color/component_color_topic_info_fragment_download_story_size_text_color"
android:textSize="18sp"
android:textStyle="italic"
app:layout_constraintBottom_toBottomOf="@+id/download_status_image_view"
Expand Down
3 changes: 3 additions & 0 deletions app/src/main/res/values-night/color_palette.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,4 +90,7 @@
<color name="color_palette_confetti_red_color">@color/color_def_confetti_rosy_pink</color>
<color name="color_palette_confetti_yellow_color">@color/color_def_confetti_bright_gold</color>
<color name="color_palette_confetti_blue_color">@color/color_def_confetti_crystal_blue</color>
<color name="color_palette_forward_arrow_button_color">@color/color_def_oppia_turquoise</color>
rt4914 marked this conversation as resolved.
Show resolved Hide resolved
<color name="color_palette_thumbnail_gradient_end_color">@color/color_def_accessible_grey</color>
<color name="color_palette_thumbnail_gradient_start_color">@color/color_def_white_0</color>
</resources>
1 change: 1 addition & 0 deletions app/src/main/res/values/color_defs.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,4 +79,5 @@
<color name="color_def_confetti_rosy_pink">#EA6390</color>
<color name="color_def_confetti_bright_gold">#EFCF24</color>
<color name="color_def_confetti_crystal_blue">#49A9E5</color>
<color name="color_def_white_0">#00FFFFFF</color>
</resources>
4 changes: 3 additions & 1 deletion app/src/main/res/values/color_palette.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,8 +87,10 @@
<color name="color_palette_drag_drop_single_item_gradient_center_color">@color/color_def_drag_drop_single_item_gradient_center</color>
<color name="color_palette_drag_drop_single_item_gradient_start_color">@color/color_def_white</color>
<color name="color_palette_drag_drop_single_item_stroke_color">@color/color_def_stroke_silver</color>
<color name="color_palette_forward_arrow_button_color">@color/color_def_oppia_dark_blue</color>
<color name="color_palette_confetti_red_color">@color/color_def_confetti_ruby_red</color>
<color name="color_palette_confetti_yellow_color">@color/color_def_confetti_light_gold</color>
<color name="color_palette_confetti_blue_color">@color/color_def_oppia_dark_blue</color>
<color name="color_palette_forward_arrow_button_color">@color/color_def_oppia_dark_blue</color>
<color name="color_palette_thumbnail_gradient_end_color">@color/color_def_white</color>
<color name="color_palette_thumbnail_gradient_start_color">@color/color_def_white_0</color>
</resources>
10 changes: 10 additions & 0 deletions app/src/main/res/values/component_colors.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -246,5 +246,15 @@
<color name="component_color_confetti_red_color">@color/color_palette_confetti_red_color</color>
<color name="component_color_confetti_yellow_color">@color/color_palette_confetti_yellow_color</color>
<color name="component_color_confetti_blue_color">@color/color_palette_confetti_blue_color</color>
<!-- Topic Info Fragment -->
<color name="component_color_topic_info_fragment_background_color">@color/color_palette_primary_background_color</color>
<color name="component_color_topic_info_fragment_topic_name_text_color">@color/color_palette_highlighted_text_color</color>
<color name="component_color_topic_info_fragment_story_count_text_color">@color/color_palette_highlighted_text_color</color>
<color name="component_color_topic_info_fragment_thumbnail_gradient_end_color">@color/color_palette_thumbnail_gradient_end_color</color>
<color name="component_color_topic_info_fragment_thumbnail_gradient_start_color">@color/color_palette_thumbnail_gradient_start_color</color>
<color name="component_color_topic_info_fragment_see_more_text_color">@color/color_palette_primary_color</color>
<color name="component_color_topic_info_fragment_download_status_image_color">@color/color_palette_primary_color</color>
<color name="component_color_topic_info_fragment_download_story_count_text_color">@color/color_palette_show_text_color</color>
<color name="component_color_topic_info_fragment_download_story_size_text_color">@color/color_palette_show_text_color</color>

</resources>