Skip to content

Commit

Permalink
Fixes Part of #4195 : Dark mode implementation - Content and Feedback…
Browse files Browse the repository at this point in the history
… Questions and Exploration (#4824)

<!-- READ ME FIRST: Please fill in the explanation section below and
check off every point from the Essential Checklist! -->
## Explanation

Fixes Part of #4195 : Dark mode implementation - Content and Feedback
Questions and Exploration

<!--
- Explain what your PR does. If this PR fixes an existing bug, please
include
- "Fixes #bugnum:" in the explanation so that GitHub can auto-close the
issue
  - when this PR is merged.
  -->

## Essential Checklist
<!-- Please tick the relevant boxes by putting an "x" in them. -->
- [x] The PR title and explanation each start with "Fix #bugnum: " (If
this PR fixes part of an issue, prefix the title with "Fix part of
#bugnum: ...".)
- [ ] Any changes to
[scripts/assets](https://github.com/oppia/oppia-android/tree/develop/scripts/assets)
files have their rationale included in the PR explanation.
- [x] The PR follows the [style
guide](https://github.com/oppia/oppia-android/wiki/Coding-style-guide).
- [x] The PR does not contain any unnecessary code changes from Android
Studio
([reference](https://github.com/oppia/oppia-android/wiki/Guidance-on-submitting-a-PR#undo-unnecessary-changes)).
- [x] The PR is made from a branch that's **not** called "develop" and
is up-to-date with "develop".
- [x] The PR is **assigned** to the appropriate reviewers
([reference](https://github.com/oppia/oppia-android/wiki/Guidance-on-submitting-a-PR#clarification-regarding-assignees-and-reviewers-section)).

## For UI-specific PRs only

### Content and Feedbacks

<img
src="https://user-images.githubusercontent.com/76530270/210980686-d6800a26-6bb9-4c6d-9899-1f07930d3eae.png"
height="400" style="max-width: 100%"> <img
src="https://user-images.githubusercontent.com/76530270/210980738-642bf007-9ef7-4eea-a85b-96aca743dd4b.png"
height="400" style="max-width: 100%">

<img
src="https://user-images.githubusercontent.com/76530270/211056436-a50df474-6e42-4379-b50f-186096ba5f15.png"
height="400" style="max-width: 100%"> <img
src="https://user-images.githubusercontent.com/76530270/211056453-527377d0-2cd8-4489-85b6-b416c9783f7c.png"
height="400" style="max-width: 100%">




<!-- Delete these section if this PR does not include UI-related
changes. -->
If your PR includes UI-related changes, then:
- Add screenshots for portrait/landscape for both a tablet & phone of
the before & after UI changes
- For the screenshots above, include both English and pseudo-localized
(RTL) screenshots (see [RTL
guide](https://github.com/oppia/oppia-android/wiki/RTL-Guidelines))
- Add a video showing the full UX flow with a screen reader enabled (see
[accessibility
guide](https://github.com/oppia/oppia-android/wiki/Accessibility-(A11y)-Guide))
- Add a screenshot demonstrating that you ran affected Espresso tests
locally & that they're passing
  • Loading branch information
MohitGupta121 authored Jan 7, 2023
1 parent c772805 commit c1d63dd
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 13 deletions.
5 changes: 3 additions & 2 deletions app/src/main/res/layout/content_item.xml
Original file line number Diff line number Diff line change
Expand Up @@ -43,12 +43,13 @@
android:id="@+id/content_text_view"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:minWidth="48dp"
android:minHeight="48dp"
android:breakStrategy="simple"
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}"
Expand Down
7 changes: 4 additions & 3 deletions app/src/main/res/layout/feedback_item.xml
Original file line number Diff line number Diff line change
Expand Up @@ -43,12 +43,13 @@
android:id="@+id/feedback_text_view"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:minHeight="48dp"
android:minWidth="48dp"
android:breakStrategy="simple"
android:fontFamily="sans-serif"
android:minWidth="48dp"
android:minHeight="48dp"
android:text="@{htmlContent}"
android:textColor="@color/component_color_shared_feedback_item_text_view_color"
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}"
Expand Down
8 changes: 5 additions & 3 deletions app/src/main/res/layout/submitted_answer_item.xml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,8 @@
android:contentDescription="@{viewModel.submittedAnswerContentDescription}"
android:padding="12dp"
android:text="@{viewModel.submittedAnswer}"
android:textColor="@color/component_color_shared_submitted_answer_item_text_color"
android:textColor="@color/component_color_shared_primary_text_color"
android:textColorLink="@color/component_color_shared_link_text_color"
android:textSize="16sp"
android:visibility="gone"
app:layout_constrainedWidth="true"
Expand Down Expand Up @@ -88,11 +89,12 @@
android:layout_gravity="center_vertical"
android:layout_marginStart="@dimen/answer_tick_margin"
android:importantForAccessibility="no"
app:srcCompat="@drawable/ic_check_primary"
android:visibility="@{viewModel.isCorrectAnswer &amp;&amp; !viewModel.hasConversationView ? View.VISIBLE : View.GONE}"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toEndOf="@+id/submitted_answer_text_view"
app:layout_constraintTop_toTopOf="parent" />
app:layout_constraintTop_toTopOf="parent"
app:srcCompat="@drawable/ic_check_primary"
app:tint="@color/component_color_shared_check_icon_color" />

<androidx.constraintlayout.widget.Guideline
android:id="@+id/answer_tick_guideline"
Expand Down
5 changes: 3 additions & 2 deletions app/src/main/res/layout/submitted_html_answer_item.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,12 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:fontFamily="sans-serif"
android:paddingTop="8dp"
android:paddingStart="4dp"
android:paddingTop="8dp"
android:paddingEnd="4dp"
android:paddingBottom="8dp"
android:text="@{htmlContent}"
android:textColor="@color/component_color_shared_oppia_submitted_answer_text_color"
android:textColor="@color/component_color_shared_primary_text_color"
android:textColorLink="@color/component_color_shared_link_text_color"
android:textSize="16sp" />
</layout>
3 changes: 0 additions & 3 deletions app/src/main/res/values/component_colors.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
<color name="component_color_shared_revision_card_background_color">@color/color_palette_primary_background_color</color>
<color name="component_color_shared_topic_card_item_background_color">@color/color_palette_topic_card_item_background_color</color>
<color name="component_color_shared_content_item_text_view_color">@color/color_palette_highlighted_text_color</color>
<color name="component_color_shared_feedback_item_text_view_color">@color/color_palette_highlighted_text_color</color>
<color name="component_color_shared_topic_card_text_view_color">@color/color_palette_topic_card_text_color</color>
<color name="component_color_shared_story_card_topic_name_text_color">@color/color_palette_card_topic_name_text_color</color>
<color name="component_color_shared_story_card_background_color">@color/color_palette_primary_background_color</color>
Expand All @@ -27,15 +26,13 @@
<color name="component_color_shared_input_error_color">@color/color_palette_input_error_color</color>
<color name="component_color_shared_submitted_answer_item_solid_color">@color/color_palette_submitted_answer_item_solid_color</color>
<color name="component_color_shared_submitted_answer_item_stroke_color">@color/color_palette_submitted_answer_item_stroke_color</color>
<color name="component_color_shared_submitted_answer_item_text_color">@color/color_palette_highlighted_text_color</color>
<color name="component_color_shared_edit_text_hint_color">@color/color_palette_hint_text_input_interaction_color</color>
<color name="component_color_shared_input_interaction_edit_text_border_color">@color/color_palette_input_interaction_edit_text_border_color</color>
<color name="component_color_shared_input_interaction_edit_text_not_selected_border_color">@color/color_palette_input_interaction_edit_text_not_selected_border_color</color>
<color name="component_color_shared_arrow_down_grey_color">@color/color_palette_arrow_down_grey_color</color>
<color name="component_color_shared_arrow_right_grey_color">@color/color_palette_arrow_right_grey_color</color>
<color name="component_color_shared_rounded_rect_background_color">@color/color_palette_rounded_rect_background_color</color>
<color name="component_color_shared_drag_drop_background_color">@color/color_palette_drag_drop_background_color</color>
<color name="component_color_shared_oppia_submitted_answer_text_color">@color/color_palette_oppia_submitted_answer_text_color</color>
<color name="component_color_shared_drag_drop_single_item_stroke_color">@color/color_palette_drag_drop_single_item_stroke_color</color>
<color name="component_color_shared_drag_drop_single_item_gradient_start_color">@color/color_palette_drag_drop_single_item_gradient_start_color</color>
<color name="component_color_shared_drag_drop_single_item_gradient_center_color">@color/color_palette_drag_drop_single_item_gradient_center_color</color>
Expand Down

0 comments on commit c1d63dd

Please sign in to comment.