diff --git a/app/src/main/res/color/drawer_item.xml b/app/src/main/res/color/drawer_item.xml index c34de39b494..647f48d5613 100644 --- a/app/src/main/res/color/drawer_item.xml +++ b/app/src/main/res/color/drawer_item.xml @@ -1,5 +1,5 @@ - - + + diff --git a/app/src/main/res/drawable/audio_background.xml b/app/src/main/res/drawable/audio_background.xml index b809bfd7fa6..d20e2216dba 100644 --- a/app/src/main/res/drawable/audio_background.xml +++ b/app/src/main/res/drawable/audio_background.xml @@ -4,5 +4,5 @@ - + diff --git a/app/src/main/res/drawable/seekbar_thumb.xml b/app/src/main/res/drawable/seekbar_thumb.xml index a301153cb07..0b3b1481547 100644 --- a/app/src/main/res/drawable/seekbar_thumb.xml +++ b/app/src/main/res/drawable/seekbar_thumb.xml @@ -17,7 +17,7 @@ android:left="8dp" android:top="4dp"> - + diff --git a/app/src/main/res/layout/audio_fragment.xml b/app/src/main/res/layout/audio_fragment.xml index 46b12f933cb..63c5bbe3562 100755 --- a/app/src/main/res/layout/audio_fragment.xml +++ b/app/src/main/res/layout/audio_fragment.xml @@ -36,7 +36,6 @@ android:onClick="@{(v) -> viewModel.togglePlayPause(viewModel.playStatusLiveData)}" android:padding="12dp" app:srcCompat="@{viewModel.playStatusLiveData == UiAudioPlayStatus.PLAYING ? @drawable/ic_pause_circle_filled_white_24dp : @drawable/ic_play_circle_filled_white_24dp}" - app:tint="@color/component_color_audio_fragment_icon_color" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> @@ -71,7 +70,6 @@ android:onClick="@{(v) -> audioFragment.languageSelectionClicked()}" android:padding="12dp" app:srcCompat="@drawable/ic_audio_lang_24px" - app:tint="@color/component_color_audio_fragment_icon_color" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="parent" /> diff --git a/app/src/main/res/layout/concept_card_fragment.xml b/app/src/main/res/layout/concept_card_fragment.xml index c931144e3d5..e533c61a40e 100644 --- a/app/src/main/res/layout/concept_card_fragment.xml +++ b/app/src/main/res/layout/concept_card_fragment.xml @@ -13,13 +13,13 @@ + android:background="@color/concept_card_background"> + android:layout_marginEnd="@dimen/concept_card_explanation_text_margin_end" /> diff --git a/app/src/main/res/layout/drawer_fragment.xml b/app/src/main/res/layout/drawer_fragment.xml index 1f1833559dd..1d65dc90376 100644 --- a/app/src/main/res/layout/drawer_fragment.xml +++ b/app/src/main/res/layout/drawer_fragment.xml @@ -25,7 +25,6 @@ + android:tint="@{footerViewModel.isDeveloperOptionsSelected ? @color/highlighted_developer_options_nav_menu_item : @color/oppia_primary_text_dark}"/> @@ -99,7 +97,7 @@ android:layout_height="24dp" android:layout_gravity="center_vertical" app:srcCompat="@drawable/ic_admin_settings_icon_brown_24dp" - android:tint="@{footerViewModel.isAdministratorControlsSelected ? @color/component_color_drawer_fragment_admin_controls_selected_image_color : @color/component_color_drawer_fragment_admin_controls_image_color}" /> + android:tint="@{footerViewModel.isAdministratorControlsSelected ? @color/highlighted_nav_menu_item : @color/oppia_primary_text_dark}" /> diff --git a/app/src/main/res/values-night/color_palette.xml b/app/src/main/res/values-night/color_palette.xml index 3100622c3f5..f69ded60fd5 100644 --- a/app/src/main/res/values-night/color_palette.xml +++ b/app/src/main/res/values-night/color_palette.xml @@ -45,18 +45,6 @@ @color/color_def_oppia_pink @color/color_def_forest_green @color/color_def_forest_green - @color/color_def_oppia_turquoise - @color/color_def_oppia_dark_grey - @color/color_def_maastricht_blue - @color/color_def_forest_green - @color/color_def_oppia_light_black - @color/color_def_dark_pink - @color/color_def_oppia_pink - @color/color_def_persian_blue - @color/color_def_bright_green - @color/color_def_white - @color/color_def_oppia_metallic_blue - @color/color_def_dark_purple @color/color_def_black_grey @color/color_def_oppia_turquoise @color/color_def_dark_pink diff --git a/app/src/main/res/values-v21/styles.xml b/app/src/main/res/values-v21/styles.xml index 23808bdf102..62408235dfb 100644 --- a/app/src/main/res/values-v21/styles.xml +++ b/app/src/main/res/values-v21/styles.xml @@ -9,9 +9,9 @@