From 160ca02ccac368f7cd8f2e538e979a4fa97b2aa1 Mon Sep 17 00:00:00 2001 From: Vishwajith-Shettigar Date: Fri, 13 Oct 2023 19:04:24 +0530 Subject: [PATCH 1/3] fixed contrast ratio issue in locked lesson textview --- .../java/org/oppia/android/app/story/StoryFragmentPresenter.kt | 1 + .../android/app/topic/lessons/TopicLessonsFragmentPresenter.kt | 1 + app/src/main/res/values-night/color_palette.xml | 2 +- app/src/main/res/values/color_palette.xml | 2 +- 4 files changed, 4 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/org/oppia/android/app/story/StoryFragmentPresenter.kt b/app/src/main/java/org/oppia/android/app/story/StoryFragmentPresenter.kt index 2433999b826..d5fbe148831 100644 --- a/app/src/main/java/org/oppia/android/app/story/StoryFragmentPresenter.kt +++ b/app/src/main/java/org/oppia/android/app/story/StoryFragmentPresenter.kt @@ -8,6 +8,7 @@ import android.text.method.LinkMovementMethod import android.text.style.ClickableSpan import android.text.style.TypefaceSpan import android.util.DisplayMetrics +import android.util.Log import android.util.TypedValue import android.view.LayoutInflater import android.view.View diff --git a/app/src/main/java/org/oppia/android/app/topic/lessons/TopicLessonsFragmentPresenter.kt b/app/src/main/java/org/oppia/android/app/topic/lessons/TopicLessonsFragmentPresenter.kt index bdb858ff1bd..90bd90781b4 100644 --- a/app/src/main/java/org/oppia/android/app/topic/lessons/TopicLessonsFragmentPresenter.kt +++ b/app/src/main/java/org/oppia/android/app/topic/lessons/TopicLessonsFragmentPresenter.kt @@ -1,5 +1,6 @@ package org.oppia.android.app.topic.lessons +import android.util.Log import android.view.LayoutInflater import android.view.View import android.view.ViewGroup diff --git a/app/src/main/res/values-night/color_palette.xml b/app/src/main/res/values-night/color_palette.xml index 610b29c2ac1..46d7a8d79ae 100644 --- a/app/src/main/res/values-night/color_palette.xml +++ b/app/src/main/res/values-night/color_palette.xml @@ -173,7 +173,7 @@ @color/color_def_accessible_grey @color/color_def_accessible_light_grey_2 @color/color_def_white_80 - @color/color_def_accessible_light_grey_2 + @color/color_def_accessible_light_grey @color/color_def_dark_silver @color/color_def_white @color/color_def_oppia_green diff --git a/app/src/main/res/values/color_palette.xml b/app/src/main/res/values/color_palette.xml index a542be65211..f5202bb9365 100644 --- a/app/src/main/res/values/color_palette.xml +++ b/app/src/main/res/values/color_palette.xml @@ -178,7 +178,7 @@ @color/color_def_light_green @color/color_def_accessible_light_grey_2 @color/color_def_accessible_light_grey_2 - @color/color_def_grey + @color/color_def_oppia_grey_background @color/color_def_transparent @color/color_def_bright_green @color/color_def_white From 7faa7e76a8dfc626007ce61c3ce3e293ee8cde94 Mon Sep 17 00:00:00 2001 From: Vishwajith-Shettigar Date: Fri, 13 Oct 2023 19:05:19 +0530 Subject: [PATCH 2/3] fixed contrast ratio issue in locked lesson textview --- .../java/org/oppia/android/app/story/StoryFragmentPresenter.kt | 1 - .../android/app/topic/lessons/TopicLessonsFragmentPresenter.kt | 1 - 2 files changed, 2 deletions(-) diff --git a/app/src/main/java/org/oppia/android/app/story/StoryFragmentPresenter.kt b/app/src/main/java/org/oppia/android/app/story/StoryFragmentPresenter.kt index d5fbe148831..2433999b826 100644 --- a/app/src/main/java/org/oppia/android/app/story/StoryFragmentPresenter.kt +++ b/app/src/main/java/org/oppia/android/app/story/StoryFragmentPresenter.kt @@ -8,7 +8,6 @@ import android.text.method.LinkMovementMethod import android.text.style.ClickableSpan import android.text.style.TypefaceSpan import android.util.DisplayMetrics -import android.util.Log import android.util.TypedValue import android.view.LayoutInflater import android.view.View diff --git a/app/src/main/java/org/oppia/android/app/topic/lessons/TopicLessonsFragmentPresenter.kt b/app/src/main/java/org/oppia/android/app/topic/lessons/TopicLessonsFragmentPresenter.kt index 90bd90781b4..bdb858ff1bd 100644 --- a/app/src/main/java/org/oppia/android/app/topic/lessons/TopicLessonsFragmentPresenter.kt +++ b/app/src/main/java/org/oppia/android/app/topic/lessons/TopicLessonsFragmentPresenter.kt @@ -1,6 +1,5 @@ package org.oppia.android.app.topic.lessons -import android.util.Log import android.view.LayoutInflater import android.view.View import android.view.ViewGroup From a6696cabb96d0e74fa7a4b8fc4c3894d2b8b495d Mon Sep 17 00:00:00 2001 From: Vishwajith-Shettigar Date: Tue, 17 Oct 2023 20:17:04 +0530 Subject: [PATCH 3/3] fixed lock baground inconsistency --- app/src/main/res/values-night/color_palette.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/res/values-night/color_palette.xml b/app/src/main/res/values-night/color_palette.xml index 46d7a8d79ae..36917970d4f 100644 --- a/app/src/main/res/values-night/color_palette.xml +++ b/app/src/main/res/values-night/color_palette.xml @@ -171,7 +171,7 @@ @color/color_def_accessible_light_grey_2 @color/color_def_oppia_green @color/color_def_accessible_grey - @color/color_def_accessible_light_grey_2 + @color/color_def_accessible_light_grey @color/color_def_white_80 @color/color_def_accessible_light_grey @color/color_def_dark_silver