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

Dark mode implementation - Fixed Post PR Changes Part 2 #4867

Merged
merged 1 commit into from
Feb 4, 2023
Merged

Dark mode implementation - Fixed Post PR Changes Part 2 #4867

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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/radio_checked.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<shape android:shape="oval">
<stroke
android:width="2dp"
android:color="@color/audio_language_activity_radio_button" />
android:color="@color/component_color_shared_radio_button_checked_color" />
<size
android:width="20dp"
android:height="20dp" />
Expand All @@ -16,7 +16,7 @@
android:right="5dp"
android:top="5dp">
<shape android:shape="oval">
<solid android:color="@color/audio_language_activity_radio_button" />
<solid android:color="@color/component_color_shared_radio_button_checked_color" />
<size
android:width="10dp"
android:height="10dp" />
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/drawable/radio_unchecked.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
android:shape="oval">
<stroke
android:width="2dp"
android:color="@color/color_def_black_54" />
android:color="@color/component_color_shared_radio_button_unchecked_color" />
<size
android:width="20dp"
android:height="20dp" />
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/layout-land/profile_chooser_fragment.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
android:layout_marginTop="@dimen/profile_chooser_fragment_profile_select_text_margin_top"
android:layout_marginEnd="36dp"
android:text="@string/profile_chooser_select"
android:textColor="@color/component_color_profile_chooser_activity_white_text_color"
android:textColor="@color/component_color_shared_secondary_4_text_color"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />

Expand Down
6 changes: 3 additions & 3 deletions app/src/main/res/layout-land/profile_chooser_profile_view.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,14 +60,14 @@
android:maxLines="2"
android:singleLine="false"
android:text="@{viewModel.profile.name}"
android:textColor="@color/component_color_profile_chooser_activity_white_text_color" />
android:textColor="@color/component_color_shared_secondary_4_text_color" />

<TextView
android:id="@+id/profile_last_visited"
style="@style/SubtitleLight1Center"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/component_color_profile_chooser_activity_white_text_color"
android:textColor="@color/component_color_shared_secondary_4_text_color"
android:visibility="@{viewModel.profile.lastLoggedInTimestampMs > 0 ? View.VISIBLE : View.GONE}"
profile:lastVisited="@{viewModel.profile.lastLoggedInTimestampMs}" />

Expand All @@ -77,7 +77,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/profile_chooser_admin"
android:textColor="@color/component_color_profile_chooser_activity_white_text_color"
android:textColor="@color/component_color_shared_secondary_4_text_color"
android:visibility="@{viewModel.profile.isAdmin ? View.VISIBLE : View.GONE}" />
</LinearLayout>
</LinearLayout>
Expand Down
6 changes: 3 additions & 3 deletions app/src/main/res/layout-sw600dp-land/profile_chooser_profile_view.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
android:maxLines="2"
android:singleLine="false"
android:text="@{viewModel.profile.name}"
android:textColor="@color/component_color_profile_chooser_activity_white_text_color"
android:textColor="@color/component_color_shared_secondary_4_text_color"
app:layoutMarginTop="@{hasProfileEverBeenAddedValue ? @dimen/profile_chooser_profile_view_name_margin_top_profile_already_added : @dimen/space_0dp}" />
<!-- Note: The style set here is without the Gravity property, as the gravity set for this TextView is conditional and its not doable through styles. -->
<TextView
Expand All @@ -78,7 +78,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="4dp"
android:gravity="@{hasProfileEverBeenAddedValue ? Gravity.CENTER_HORIZONTAL : Gravity.CENTER_VERTICAL}"
android:textColor="@color/component_color_profile_chooser_activity_white_text_color"
android:textColor="@color/component_color_shared_secondary_4_text_color"
android:visibility="@{viewModel.profile.lastLoggedInTimestampMs > 0 ? View.VISIBLE : View.GONE}"
app:layoutMarginTop="@{hasProfileEverBeenAddedValue ? @dimen/profile_chooser_profile_view_last_visited_margin_top_profile_already_added : @dimen/profile_chooser_profile_view_last_visited_margin_top_profile_not_added}"
profile:lastVisited="@{viewModel.profile.lastLoggedInTimestampMs}" />
Expand All @@ -91,7 +91,7 @@
android:layout_marginTop="4dp"
android:gravity="@{hasProfileEverBeenAddedValue ? Gravity.CENTER_HORIZONTAL : Gravity.CENTER_VERTICAL}"
android:text="@string/profile_chooser_admin"
android:textColor="@color/component_color_profile_chooser_activity_white_text_color"
android:textColor="@color/component_color_shared_secondary_4_text_color"
android:visibility="@{viewModel.profile.isAdmin ? View.VISIBLE : View.GONE}"
app:layoutMarginTop="@{hasProfileEverBeenAddedValue ? @dimen/profile_chooser_profile_view_is_admin_margin_top_profile_already_added : @dimen/space_0dp}" />
</LinearLayout>
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/layout-sw600dp-land/topic_lessons_story_summary.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@
app:isRotationAnimationClockwise="@{isListExpanded}"
app:rotationAnimationAngle="@{180f}"
app:srcCompat="@drawable/ic_arrow_drop_down_black_24dp"
app:tint="@color/component_color_lessons_tab_activity_lesson_card_drop_down_arrow_color" />
app:tint="@color/component_color_shared_multipane_icon_color" />
</FrameLayout>
</LinearLayout>
</LinearLayout>
Expand Down
6 changes: 3 additions & 3 deletions app/src/main/res/layout-sw600dp-port/profile_chooser_profile_view.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
android:maxLines="2"
android:singleLine="false"
android:text="@{viewModel.profile.name}"
android:textColor="@color/component_color_profile_chooser_activity_white_text_color"
android:textColor="@color/component_color_shared_secondary_4_text_color"
app:layoutMarginTop="@{hasProfileEverBeenAddedValue ? @dimen/profile_chooser_profile_view_name_margin_top_profile_already_added : @dimen/space_0dp}" />

<!-- Note: The style set here is without the Gravity property, as the gravity set for this TextView is conditional and its not doable through styles. -->
Expand All @@ -79,7 +79,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="4dp"
android:gravity="@{hasProfileEverBeenAddedValue ? Gravity.CENTER_HORIZONTAL : Gravity.CENTER_VERTICAL}"
android:textColor="@color/component_color_profile_chooser_activity_white_text_color"
android:textColor="@color/component_color_shared_secondary_4_text_color"
android:visibility="@{viewModel.profile.lastLoggedInTimestampMs > 0 ? View.VISIBLE : View.GONE}"
profile:lastVisited="@{viewModel.profile.lastLoggedInTimestampMs}" />

Expand All @@ -91,7 +91,7 @@
android:layout_marginTop="4dp"
android:gravity="@{hasProfileEverBeenAddedValue ? Gravity.CENTER_HORIZONTAL : Gravity.CENTER_VERTICAL}"
android:text="@string/profile_chooser_admin"
android:textColor="@color/component_color_profile_chooser_activity_white_text_color"
android:textColor="@color/component_color_shared_secondary_4_text_color"
android:visibility="@{viewModel.profile.isAdmin ? View.VISIBLE : View.GONE}" />
</LinearLayout>
</LinearLayout>
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/layout-sw600dp/profile_chooser_fragment.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
android:layout_marginTop="80dp"
android:fontFamily="sans-serif"
android:text="@string/profile_chooser_select"
android:textColor="@color/component_color_profile_chooser_activity_white_text_color"
android:textColor="@color/component_color_shared_secondary_4_text_color"
android:textSize="36sp"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/layout/profile_chooser_fragment.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
android:layout_marginTop="@dimen/profile_chooser_fragment_profile_select_text_margin_top"
android:layout_marginEnd="36dp"
android:text="@string/profile_chooser_select"
android:textColor="@color/component_color_profile_chooser_activity_white_text_color"
android:textColor="@color/component_color_shared_secondary_4_text_color"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />

Expand Down
6 changes: 3 additions & 3 deletions app/src/main/res/layout/profile_chooser_profile_view.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
android:maxLines="2"
android:singleLine="false"
android:text="@{viewModel.profile.name}"
android:textColor="@color/component_color_profile_chooser_activity_white_text_color"
android:textColor="@color/component_color_shared_secondary_4_text_color"
app:layoutMarginTop="@{hasProfileEverBeenAddedValue ? @dimen/profile_chooser_profile_view_name_margin_top_profile_already_added : @dimen/space_0dp}" />
<!-- Note: The style set here is without the Gravity property, as the gravity set for this TextView is conditional and its not doable through styles. -->
<TextView
Expand All @@ -73,7 +73,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="4dp"
android:gravity="@{hasProfileEverBeenAddedValue ? Gravity.CENTER_HORIZONTAL : Gravity.CENTER_VERTICAL}"
android:textColor="@color/component_color_profile_chooser_activity_white_text_color"
android:textColor="@color/component_color_shared_secondary_4_text_color"
android:visibility="@{viewModel.profile.lastLoggedInTimestampMs > 0 ? View.VISIBLE : View.GONE}"
profile:lastVisited="@{viewModel.profile.lastLoggedInTimestampMs}" />
<!-- Note: The style set here is without the Gravity property, as the gravity set for this TextView is conditional and its not doable through styles. -->
Expand All @@ -85,7 +85,7 @@
android:layout_marginTop="@dimen/profile_chooser_profile_view_is_admin_margin_top"
android:gravity="@{hasProfileEverBeenAddedValue ? Gravity.CENTER_HORIZONTAL : Gravity.CENTER_VERTICAL}"
android:text="@string/profile_chooser_admin"
android:textColor="@color/component_color_profile_chooser_activity_white_text_color"
android:textColor="@color/component_color_shared_secondary_4_text_color"
android:visibility="@{viewModel.profile.isAdmin ? View.VISIBLE : View.GONE}" />
</LinearLayout>
</LinearLayout>
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/layout/topic_lessons_story_summary.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@
app:isRotationAnimationClockwise="@{isListExpanded}"
app:rotationAnimationAngle="@{180f}"
app:srcCompat="@drawable/ic_arrow_drop_down_black_24dp"
app:tint="@color/component_color_lessons_tab_activity_lesson_card_drop_down_arrow_color" />
app:tint="@color/component_color_shared_multipane_icon_color" />
</FrameLayout>
</LinearLayout>
</LinearLayout>
Expand Down
2 changes: 2 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 @@ -137,6 +137,8 @@
<color name="color_palette_secondary_container_background_color">@color/color_def_oppia_metallic_blue</color>
<color name="color_palette_fragment_status_bar_color">@color/color_def_dark_purple</color>
<color name="color_palette_hint_dialog_status_bar_color">@color/color_def_catalina_blue</color>
<color name="color_palette_shared_radio_button_unchecked_color">@color/color_def_stroke_silver</color>
<color name="color_palette_shared_radio_button_checked_color">@color/color_def_radio_green</color>
<color name="color_palette_topic_revision_background_color">@color/color_def_oppia_light_black</color>
<color name="color_palette_completed_progress_activity_background_color">@color/color_def_oppia_light_black</color>
<color name="color_palette_topic_fragments_background_color">@color/color_def_oppia_light_black</color>
Expand Down
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 @@ -77,6 +77,7 @@
<color name="color_def_dark_mode_question_player_progress_bar_gradient_end">#00C7B6</color>
<color name="color_def_whitish_grey">#E5E5E5</color>
<color name="color_def_checkbox_green">#008577</color>
<color name="color_def_radio_green">#00A89F</color>
<color name="color_def_stroke_silver">#777777</color>
<color name="color_def_drag_drop_single_item_gradient_center">#F7F7F7</color>
<color name="color_def_drag_drop_single_item_gradient_end">#DCDCDC</color>
Expand Down
2 changes: 2 additions & 0 deletions 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 @@ -139,6 +139,8 @@
<color name="color_palette_secondary_container_background_color">@color/color_def_teal_blue</color>
<color name="color_palette_fragment_status_bar_color">@color/color_def_oppia_reddish_brown</color>
<color name="color_palette_hint_dialog_status_bar_color">@color/color_def_catalina_blue</color>
<color name="color_palette_shared_radio_button_unchecked_color">@color/color_def_black_54</color>
<color name="color_palette_shared_radio_button_checked_color">@color/color_def_radio_green</color>
<color name="color_palette_topic_revision_background_color">@color/color_def_oppia_white</color>
<color name="color_palette_view_all_text_color">@color/color_def_oppia_green</color>
<color name="color_palette_completed_progress_activity_background_color">@color/color_def_white</color>
Expand Down
4 changes: 2 additions & 2 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 @@ -105,6 +105,8 @@
<color name="component_color_shared_text_input_layout_helper_text_color">@color/color_palette_helper_text_color</color>
<color name="component_color_general_item_secondary_background_stroke_color">@color/color_palette_stroke_color</color>
<color name="component_color_shared_hint_dialog_status_bar_color">@color/color_palette_hint_dialog_status_bar_color</color>
<color name="component_color_shared_radio_button_unchecked_color">@color/color_palette_shared_radio_button_unchecked_color</color>
<color name="component_color_shared_radio_button_checked_color">@color/color_palette_shared_radio_button_checked_color</color>
<!-- Add Profile Activity -->
<color name="component_color_add_profile_activity_info_icon_color">@color/color_palette_info_icon_color</color>
<color name="component_color_add_profile_activity_switch_description_color">@color/color_palette_description_text_color</color>
Expand Down Expand Up @@ -148,7 +150,6 @@
<!-- Lessons Tab Fragment -->
<color name="component_color_lessons_tab_activity_background_color">@color/color_palette_primary_container_background_color</color>
<color name="component_color_lessons_tab_activity_lesson_card_ripple_color">@color/color_palette_transparent_background_color</color>
<color name="component_color_lessons_tab_activity_lesson_card_drop_down_arrow_color">@color/color_palette_lesson_card_drop_down_arrow_color</color>
<color name="component_color_lessons_tab_activity_lesson_card_dashed_divider_color">@color/color_palette_lesson_card_dashed_divider_color</color>
<color name="component_color_lessons_tab_activity_lessons_in_progress_chapter_index_background_color">@color/color_palette_lesson_in_progress_chapter_index_background_color</color>
<color name="component_color_lessons_tab_activity_lessons_in_progress_chapter_name_background_color">@color/color_palette_lesson_in_progress_chapter_name_background_color</color>
Expand Down Expand Up @@ -224,6 +225,5 @@
<!-- Profile Chooser Activity -->
<color name="component_color_profile_chooser_activity_background_color">@color/color_palette_profile_chooser_charcoal_black_background_color</color>
<color name="component_color_profile_chooser_activity_secondary_options_color">@color/color_palette_profile_chooser_silver_text_color</color>
<color name="component_color_profile_chooser_activity_white_text_color">@color/color_palette_profile_chooser_white_text_color</color>
<color name="component_color_profile_chooser_activity_avatar_border_color">@color/color_palette_profile_chooser_avatar_border_color</color>
</resources>