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#4184: Add dark mode support to ThirdPartyDependencyListActivity, LicenseListActivity and LicenseTextViewerActivity #4289

Merged
merged 19 commits into from
May 27, 2022
Merged

Fixes#4184: Add dark mode support to ThirdPartyDependencyListActivity, LicenseListActivity and LicenseTextViewerActivity #4289

Show file tree
Hide file tree
Changes from 16 commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
a1da97c
removed Extra line
aayushimathur6 Apr 9, 2022
66587f4
Added dark mode support to ThirdPartyDependencyListActivity, LicenseL…
aayushimathur6 Apr 16, 2022
b3f6681
Added dark mode support to ThirdPartyDependencyListActivity, LicenseL…
aayushimathur6 Apr 24, 2022
3fdecb0
Merge branch 'develop' of https://github.com/oppia/oppia-android into…
aayushimathur6 Apr 27, 2022
03863f5
updated the error in license text viewer activity
aayushimathur6 Apr 30, 2022
53d0aff
updated the error in license text viewer activity
aayushimathur6 May 4, 2022
d4fb938
Merge branch 'develop' of https://github.com/oppia/oppia-android into…
aayushimathur6 May 4, 2022
cda1586
removed the spaces in components file
aayushimathur6 May 10, 2022
a72ff93
initial commit
aayushimathur6 May 10, 2022
1f54aa5
again added all components colors as misplaced due to merged conflicts
aayushimathur6 May 14, 2022
ecfedeb
updating
aayushimathur6 May 14, 2022
866b5a0
Merge branch 'develop' of https://github.com/oppia/oppia-android into…
aayushimathur6 May 14, 2022
f0f02d7
added the divider lines
aayushimathur6 May 14, 2022
6499257
added the divider lines in license item
aayushimathur6 May 15, 2022
46dfa2c
Merge branch 'develop' of https://github.com/oppia/oppia-android into…
aayushimathur6 May 15, 2022
47cbacb
Updated with recent changes
aayushimathur6 May 17, 2022
d18bc8b
Correctly added the names for all the activity files dark mode colors
aayushimathur6 May 25, 2022
72d2568
added the space line
aayushimathur6 May 27, 2022
78c86f7
merged with develop
aayushimathur6 May 27, 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
8 changes: 8 additions & 0 deletions app/src/main/res/drawable/general_item_background_border_black.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="@color/component_color_general_item_background_solid_color" />
<stroke
android:width="1dp"
android:color="@color/component_color_general_item_background_stroke_color" />
</shape>
5 changes: 3 additions & 2 deletions app/src/main/res/layout/license_item.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,19 +14,20 @@
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/color_def_white">
android:background="@drawable/general_item_background_border_black">

<TextView
android:id="@+id/license_name_text_view"
style="@style/Subtitle2ViewStart"
android:layout_width="match_parent"
android:background="@drawable/general_item_background_border"
android:background="@drawable/general_item_background_border_black"
android:fontFamily="sans-serif-smallcaps"
android:onClick="@{() -> viewModel.clickOnLicenseItem()}"
android:paddingStart="16dp"
android:paddingTop="20dp"
android:paddingEnd="16dp"
android:paddingBottom="20dp"
android:textColor="@color/component_color_license_list_text_viewer_items_activity_background_color"
rt4914 marked this conversation as resolved.
Show resolved Hide resolved
android:text="@{viewModel.licenseName}"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/res/layout/license_list_fragment.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<androidx.core.widget.NestedScrollView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/general_navigation_background"
android:background="@color/component_color_license_list_activity_background_color"
android:clipToPadding="false"
android:overScrollMode="never"
android:paddingBottom="@dimen/faq_list_scroll_padding_bottom"
Expand All @@ -25,7 +25,7 @@
android:id="@+id/license_list_fragment_recycler_view"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/color_def_white"
android:background="@color/component_color_license_list_activity_items_background_color"
android:clipToPadding="false"
android:nestedScrollingEnabled="false"
app:list="@{viewModel.licenseItemList}" />
Expand Down
4 changes: 3 additions & 1 deletion app/src/main/res/layout/license_text_viewer_fragment.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,17 @@
<ScrollView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/color_def_white">
android:background="@color/component_color_license_list_text_viewer_activity_background_color">
rt4914 marked this conversation as resolved.
Show resolved Hide resolved

<TextView
android:id="@+id/copyright_license_text_view"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/general_item_background_border_black"
android:layout_gravity="center_horizontal"
android:autoLink="web"
android:padding="32dp"
android:textColor="@color/component_color_license_list_text_viewer_activity_text_color"
rt4914 marked this conversation as resolved.
Show resolved Hide resolved
android:text="@{viewModel.licenseText}" />
</ScrollView>
</layout>
10 changes: 5 additions & 5 deletions app/src/main/res/layout/third_party_dependency_item.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,11 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/general_item_background_border"
android:background="@drawable/general_item_background_border_black"
android:onClick="@{(v) -> viewModel.clickOnThirdPartyDependencyItem()}"
android:orientation="vertical"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">

rt4914 marked this conversation as resolved.
Show resolved Hide resolved
<TextView
android:id="@+id/third_party_dependency_name_text_view"
style="@style/Subtitle1ViewStart"
Expand All @@ -34,7 +33,8 @@
android:paddingTop="16dp"
android:paddingEnd="16dp"
android:paddingBottom="4dp"
android:text="@{viewModel.dependencyName}" />
android:textColor="@color/component_color_third_party_dependency_list_activity_items_background_color"
rt4914 marked this conversation as resolved.
Show resolved Hide resolved
android:text="@{viewModel.dependencyName}"/>
rt4914 marked this conversation as resolved.
Show resolved Hide resolved

<TextView
android:id="@+id/third_party_dependency_version_text_view"
Expand All @@ -45,9 +45,9 @@
android:paddingTop="4dp"
android:paddingEnd="16dp"
android:paddingBottom="16dp"
android:textColor="@color/color_def_accessible_grey"
android:text="@{viewModel.dependencyVersion}"
android:textSize="12sp" />
android:textColor="@color/component_color_third_party_dependency_list_activity_version_text_color"
rt4914 marked this conversation as resolved.
Show resolved Hide resolved
android:textSize="12sp"/>
rt4914 marked this conversation as resolved.
Show resolved Hide resolved
</LinearLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
</layout>
4 changes: 2 additions & 2 deletions app/src/main/res/layout/third_party_dependency_list_fragment.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<androidx.core.widget.NestedScrollView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/general_navigation_background"
android:background="@color/component_color_third_party_dependency_list_activity_background_color"
android:clipToPadding="false"
android:overScrollMode="never"
android:paddingBottom="@dimen/faq_list_scroll_padding_bottom"
Expand All @@ -25,7 +25,7 @@
android:id="@+id/third_party_dependency_list_fragment_recycler_view"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/color_def_white"
android:background="@color/component_color_third_party_dependency_list_activity_background_color"
android:clipToPadding="false"
android:nestedScrollingEnabled="false"
app:list="@{viewModel.thirdPartyDependencyItemList}" />
Expand Down
15 changes: 15 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 @@ -14,6 +14,8 @@
<color name="component_color_shared_input_interaction_edit_text_text_color">@color/color_palette_primary_text_color</color>
<color name="component_color_shared_text_input_layout_background_color">@color/color_palette_text_input_background_color</color>
<color name="component_color_shared_text_input_layout_error_color">@color/color_palette_error_color</color>
<color name="component_color_general_item_background_solid_color">@color/color_palette_container_background_color</color>
<color name="component_color_general_item_background_stroke_color">@color/color_palette_dark_background_color</color>
<!-- Admin Auth Activity -->
<color name="component_color_admin_auth_secondary_text_color">@color/color_palette_description_text_color</color>
<color name="component_color_admin_auth_layout_background_color">@color/color_palette_background_color</color>
Expand All @@ -36,6 +38,19 @@
<color name="component_color_admin_pin_activity_layout_background_color">@color/color_palette_background_color</color>
<!-- Pin Password Activity -->
<color name="component_color_pin_password_activity_layout_background_color">@color/color_palette_background_color</color>
<!-- Third Party Dependency List Activity -->
<color name="component_color_third_party_dependency_list_activity_background_color">@color/color_palette_dark_background_color</color>
<color name="component_color_third_party_dependency_list_activity_options_background_color">@color/color_palette_container_background_color</color>
<color name="component_color_third_party_dependency_list_activity_items_background_color">@color/color_palette_dark_text_color</color>
<color name="component_color_third_party_dependency_list_activity_version_text_color">@color/color_palette_primary_text_color</color>
<!-- License List Activity -->
<color name="component_color_license_list_activity_background_color">@color/color_palette_dark_background_color</color>
<color name="component_color_license_list_activity_items_background_color">@color/color_palette_container_background_color</color>
<!-- License List Text Viewer Activity -->
<color name="component_color_license_list_text_viewer_activity_background_color">@color/color_palette_dark_background_color</color>
rt4914 marked this conversation as resolved.
Show resolved Hide resolved
<color name="component_color_license_list_text_viewer_items_activity_background_color">@color/color_palette_dark_text_color</color>
<color name="component_color_license_list_text_viewer_activity_options_background_color">@color/color_palette_container_background_color</color>
<color name="component_color_license_list_text_viewer_activity_text_color">@color/color_palette_description_text_color</color>
<!-- Profile and Device ID Activity -->
<color name="component_color_profile_and_device_id_activity_primary_text_color">@color/color_palette_primary_text_color</color>
<color name="component_color_profile_and_device_id_activity_enabled_icon_button_color">@color/color_palette_primary_text_color</color>
Expand Down