Commit 123b2379 authored by Fahim Salam Chowdhury's avatar Fahim Salam Chowdhury 👽
Browse files

2835-P,Q-Dark mode implementation

parent bbefe8c1
......@@ -29,7 +29,7 @@
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="@color/colorPrimary"
android:background="@color/colorNavigationBarBackground"
android:elevation="0dp"
android:theme="@style/ThemeOverlay.AppCompat.ActionBar"
app:layout_constraintTop_toTopOf="parent"
......@@ -94,7 +94,7 @@
android:layout_height="wrap_content"
android:ellipsize="end"
android:maxLines="2"
android:textColor="@android:color/black"
android:textColor="@color/colorTextPrimary"
android:textSize="@dimen/text_size_large"
tools:text="App title" />
......@@ -151,10 +151,10 @@
android:ellipsize="end"
android:foreground="?android:selectableItemBackground"
android:maxLines="1"
android:layout_gravity="right"
android:layout_gravity="end"
android:textSize="@dimen/text_size_medium"
android:textColor="@color/colorInstall"
android:layout_marginRight="@dimen/layout_margin_large"
android:layout_marginEnd="@dimen/layout_margin_large"
tools:text="App category" />
......@@ -242,7 +242,7 @@
android:ellipsize="end"
android:layout_centerVertical="true"
android:layout_marginStart="@dimen/layout_margin_medium2"
layout="@layout/install_button_layout" />
layout="@layout/simple_install_button_layout" />
......@@ -379,7 +379,7 @@
android:ellipsize="end"
android:maxLines="1"
android:text="@string/app_ratings_title"
android:textColor="@android:color/black"
android:textColor="@color/colorTextPrimary"
android:textSize="@dimen/text_size_large"
android:textStyle="bold" />
......@@ -411,7 +411,7 @@
android:layout_height="wrap_content"
android:maxLines="1"
android:layout_gravity="left"
android:textColor="@android:color/black"
android:textColor="@color/colorTextPrimary"
android:drawablePadding="5dp"
android:textSize="@dimen/text_size_extra_large"
android:drawableRight="@drawable/app_border_good"
......@@ -492,7 +492,7 @@
android:layout_height="wrap_content"
android:maxLines="1"
android:layout_gravity="start"
android:textColor="@android:color/black"
android:textColor="@color/colorTextPrimary"
android:textSize="@dimen/text_size_extra_large"
android:drawablePadding="5dp"
android:drawableRight="@drawable/app_border_neutral"
......@@ -562,7 +562,7 @@
android:ellipsize="end"
android:maxLines="1"
android:text="@string/app_privacy_title"
android:textColor="@android:color/black"
android:textColor="@color/colorTextPrimary"
android:textSize="@dimen/text_size_large"
android:textStyle="bold" />
......@@ -664,7 +664,7 @@
android:ellipsize="end"
android:maxLines="1"
android:text="@string/app_information_title"
android:textColor="@android:color/black"
android:textColor="@color/colorTextPrimary"
android:textSize="@dimen/text_size_large"
android:textStyle="bold" />
......@@ -694,7 +694,7 @@
android:ellipsize="end"
android:maxLines="1"
android:text="@string/app_version"
android:textColor="@android:color/black"
android:textColor="@color/colorTextPrimary"
android:textSize="@dimen/text_size_large" />
</LinearLayout>
......@@ -736,7 +736,7 @@
android:ellipsize="end"
android:maxLines="1"
android:text="@string/app_updated_on"
android:textColor="@android:color/black"
android:textColor="@color/colorTextPrimary"
android:textSize="@dimen/text_size_large" />
</LinearLayout>
......@@ -778,7 +778,7 @@
android:ellipsize="end"
android:maxLines="1"
android:text="@string/app_min_android"
android:textColor="@android:color/black"
android:textColor="@color/colorTextPrimary"
android:textSize="@dimen/text_size_large" />
</LinearLayout>
......@@ -820,7 +820,7 @@
android:ellipsize="end"
android:maxLines="1"
android:text="@string/app_licence"
android:textColor="@android:color/black"
android:textColor="@color/colorTextPrimary"
android:textSize="@dimen/text_size_large" />
</LinearLayout>
......@@ -862,7 +862,7 @@
android:ellipsize="end"
android:maxLines="1"
android:text="@string/app_package_name"
android:textColor="@android:color/black"
android:textColor="@color/colorTextPrimary"
android:textSize="@dimen/text_size_large" />
</LinearLayout>
......@@ -884,11 +884,5 @@
</foundation.e.apps.utils.CustomNestedScrollView>
<View
android:layout_width="match_parent"
android:layout_height="@dimen/default_divider_height"
android:background="@color/colorDivider"
app:layout_constraintBottom_toBottomOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>
......@@ -28,7 +28,7 @@
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="@color/colorPrimary"
android:background="@color/colorNavigationBarBackground"
android:elevation="@dimen/default_elevation"
android:theme="@style/ThemeOverlay.AppCompat.ActionBar"
app:layout_constraintTop_toTopOf="parent"
......@@ -46,16 +46,10 @@
android:layout_width="match_parent"
android:layout_height="0dp"
android:padding="@dimen/layout_margin_large"
android:textColor="@android:color/black"
android:textColor="@color/colorTextPrimary"
android:textIsSelectable="true"
android:textSize="@dimen/text_size_medium" />
</ScrollView>
<View
android:layout_width="match_parent"
android:layout_height="@dimen/default_divider_height"
android:background="@color/colorDivider"
app:layout_constraintBottom_toBottomOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
......@@ -29,7 +29,7 @@
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="@color/colorPrimary"
android:background="@color/colorNavigationBarBackground"
android:elevation="@dimen/default_elevation"
android:theme="@style/ThemeOverlay.AppCompat.ActionBar"
app:layout_constraintTop_toTopOf="parent"
......@@ -75,10 +75,4 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/toolbar" />
<View
android:layout_width="match_parent"
android:layout_height="@dimen/default_divider_height"
android:background="@color/colorDivider"
app:layout_constraintBottom_toBottomOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
......@@ -37,12 +37,11 @@
android:id="@+id/bottom_navigation_view"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/colorPrimary"
android:background="@color/colorNavigationBarBackground"
android:theme="@style/BottomNavigationViewTheme"
app:layout_constraintBottom_toBottomOf="parent"
app:itemIconTint="@drawable/tab_color"
app:itemTextColor="@drawable/tab_color"
app:menu="@menu/activity_main_menu"
/>
app:layout_constraintBottom_toBottomOf="parent"
app:menu="@menu/activity_main_menu" />
</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
......@@ -63,7 +63,7 @@
android:layout_height="wrap_content"
android:ellipsize="end"
android:maxLines="1"
android:textColor="@android:color/black"
android:textColor="@color/colorTextPrimary"
android:textSize="@dimen/text_size_medium"
tools:text="App title" />
......@@ -100,7 +100,7 @@
android:layout_marginStart="@dimen/layout_margin_small"
android:ellipsize="end"
android:maxLines="1"
android:textColor="@android:color/black"
android:textColor="@color/colorTextPrimary"
android:textSize="@dimen/text_size_small"
tools:text="4.3" />
......@@ -181,7 +181,7 @@
android:layout_marginStart="@dimen/layout_margin_small"
android:ellipsize="end"
android:maxLines="1"
android:textColor="@android:color/black"
android:textColor="@color/colorTextPrimary"
android:textSize="@dimen/text_size_small"
tools:text="91%" />
......
......@@ -36,7 +36,7 @@
android:layout_marginStart="@dimen/layout_margin_medium"
android:src="@drawable/ic_cat_default"
android:contentDescription="@string/menu_categories"
app:tint="@color/color_category_icon" />
app:tint="@color/colorAccent" />
<TextView
android:id="@+id/category_title"
......
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright (C) 2019 e Foundation
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <https://www.gnu.org/licenses/>.
-->
<TextView xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@android:id/text1"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceListItemSmall"
android:gravity="center_vertical"
android:background="@color/colorBackground"
android:textColor="@color/colorTextPrimary"
android:paddingStart="?android:attr/listPreferredItemPaddingStart"
android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
android:minHeight="?android:attr/listPreferredItemHeightSmall" />
......@@ -26,9 +26,9 @@
android:id="@+id/tab_layout"
android:layout_width="match_parent"
android:layout_height="?actionBarSize"
android:background="@color/colorPrimary"
android:background="@color/colorNavigationBarBackground"
app:tabSelectedTextColor="@color/colorInstall"
app:tabTextColor="@color/colorAccent"
app:tabTextColor="@color/colorTextPrimary"
app:tabIndicatorColor="@color/colorInstall"
android:elevation="@dimen/default_elevation"
app:layout_constraintTop_toTopOf="parent">
......
......@@ -19,6 +19,7 @@
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:background="@color/colorBackground"
android:layout_width="match_parent"
android:layout_height="match_parent">
......@@ -32,6 +33,7 @@
app:layout_constraintTop_toTopOf="parent">
<LinearLayout
android:background="@color/colorBackground"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
......@@ -41,7 +43,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/featured"
android:textColor="@android:color/black"
android:textColor="@color/colorTextPrimary"
android:textStyle="bold"
android:paddingStart="@dimen/layout_padding_large"
android:textSize="@dimen/text_size_large"
......
......@@ -26,7 +26,7 @@
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="?attr/colorPrimary"
android:background="@color/colorNavigationBarBackground"
android:elevation="@dimen/default_elevation"
app:theme="@style/ToolbarTheme"
app:collapseIcon="@drawable/app_border_neutral"
......
......@@ -27,7 +27,7 @@
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="?attr/colorPrimary"
android:background="@color/colorNavigationBarBackground"
android:elevation="@dimen/default_elevation"
android:padding="@dimen/layout_padding_medium"
android:theme="@style/ThemeOverlay.AppCompat.ActionBar"
......@@ -43,7 +43,7 @@
android:layout_height="wrap_content"
android:layout_alignParentEnd="true"
android:layout_gravity="center"
android:background="@color/colorPrimary"
android:background="@color/colorNavigationBarBackground"
android:ellipsize="end"
android:foreground="?android:selectableItemBackground"
android:maxWidth="@dimen/install_button_width"
......
......@@ -31,7 +31,7 @@
android:layout_marginTop="@dimen/layout_margin_large"
android:ellipsize="end"
android:maxLines="1"
android:textColor="@android:color/black"
android:textColor="@color/colorTextPrimary"
android:textSize="@dimen/text_size_large"
android:textStyle="bold"
tools:text="Top updated games" />
......
......@@ -20,7 +20,7 @@
<ImageView
xmlns:android="http://schemas.android.com/apk/res/android"
android:src="@color/color_category_icon"
android:src="@color/colorDivider"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:scaleType="fitXY"
......
......@@ -27,7 +27,7 @@
android:foreground="@drawable/app_category_border"
android:padding="@dimen/layout_padding_medium"
android:paddingBottom="@dimen/layout_padding_large"
android:background="#FFFFFF">
android:background="@color/colorBackground">
<androidx.cardview.widget.CardView
......@@ -68,7 +68,7 @@
android:gravity="center"
android:maxLines="2"
android:minLines="2"
android:textColor="@android:color/black"
android:textColor="@color/colorTextPrimary"
android:textSize="@dimen/text_size_small"
tools:text="App title" />
......
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright (C) 2019 e Foundation
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <https://www.gnu.org/licenses/>.
-->
<resources>
<!-- Base application theme. -->
<style name="AppTheme" parent="BaseTheme">
<item name="android:windowLightNavigationBar">false</item>
<item name="android:windowLightStatusBar">false</item>
</style>
</resources>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<resources>
<color name="colorDivider">#6d6d6d</color>
</resources>
\ No newline at end of file
......@@ -21,8 +21,6 @@
<!-- Base application theme. -->
<style name="AppTheme" parent="BaseTheme">
<item name="android:windowLightNavigationBar">true</item>
<item name="android:navigationBarColor">@color/colorPrimary</item>
<item name="android:windowLightStatusBar">true</item>
<item name="android:statusBarColor">@color/colorPrimaryDark</item>
</style>
</resources>
\ No newline at end of file
......@@ -18,19 +18,14 @@
-->
<resources>
<color name="colorPrimary">#FAFAFA</color>
<color name="colorPrimaryDark">#FAFAFA</color>
<!-- <color name="colorAccent">#000000</color>-->
<!-- <color name="colorPrimary">@lineageos.platform:color/color_default_primary</color>-->
<!-- <color name="colorPrimaryDark">@lineageos.platform:color/color_default_primary_dark</color>-->
<color name="colorPrimary">@lineageos.platform:color/color_default_primary</color>
<color name="colorPrimaryDark">@lineageos.platform:color/color_default_primary_dark</color>
<color name="colorAccent">@lineageos.platform:color/color_default_accent</color>
<color name="colorDivider">#CFD8DC</color>
<color name="color_category_icon">#78909C</color>
<color name="colorInstall">#0088ED</color>
<color name="colorBorder">#F4FAFF</color>
<color name="colorDarkGray">#C4CFD9</color>
<color name="colorDarkGray2">#A4AEB7</color>
<color name="colorDivider">@lineageos.platform:color/color_default_divider</color>
<color name="colorInstall">@color/colorAccent</color>
<color name="colorDarkGray">@lineageos.platform:color/color_default_gray1</color>
<color name="colorDarkGray2">@lineageos.platform:color/color_default_gray2</color>
......@@ -38,7 +33,9 @@
<color name="colorRatingNeutral">#FFEB3B</color>
<color name="colorRatingBad">#F44336</color>
<color name="colorNavigationBarBackground">@color/colorPrimaryDark</color>
<color name="colorForeground">@lineageos.platform:color/color_default_foreground</color>
<color name="colorBackground">@lineageos.platform:color/color_default_background</color>
<color name="colorTextPrimary">@lineageos.platform:color/color_default_primary_text</color>
<color name="colorTextSecondary">@lineageos.platform:color/color_default_secondary_text</color>
</resources>
......@@ -18,19 +18,21 @@
<resources>
<!-- Base application theme. -->
<style name="BaseTheme" parent="Theme.AppCompat.Light.NoActionBar">
<style name="BaseTheme" parent="Theme.AppCompat.DayNight.NoActionBar">
<item name="colorPrimary">@color/colorPrimary</item>
<item name="colorPrimaryDark">@color/colorPrimaryDark</item>
<item name="colorAccent">@color/colorAccent</item>
<item name="android:statusBarColor">@color/colorAccent</item>
<item name="android:textColorPrimary">@color/colorTextPrimary</item>
<item name="android:textColorSecondary">@color/colorTextSecondary</item>
<item name="preferenceTheme">@style/PreferenceThemeOverlay.v14.Material</item>
<item name="autoCompleteTextViewStyle">@style/SearchSuggestionTheme</item>
<item name="textAppearanceSearchResultTitle">@style/SearchSuggestionTextTheme</item>
<item name="colorControlNormal">@color/colorInstall</item>
<item name="colorControlActivated">@color/colorInstall</item>
<item name="android:navigationBarColor">@color/colorNavigationBarBackground</item>
<item name="android:statusBarColor">@color/colorNavigationBarBackground</item>
<item name="toolbarNavigationButtonStyle">@style/Toolbar.Button.Navigation.Tinted</item>
</style>
<style name="AppTheme1" parent="android:Theme">
......@@ -39,7 +41,7 @@
<style name="AppTheme" parent="BaseTheme"></style>
<style name="SearchSuggestionTheme" parent="Widget.AppCompat.Light.AutoCompleteTextView">
<item name="android:popupBackground">#FAFAFA</item>
<item name="android:popupBackground">@color/colorBackground</item>
</style>
<style name="SearchSuggestionTextTheme" parent="TextAppearance.AppCompat.SearchResult.Title">
......@@ -51,12 +53,16 @@
<item name="android:windowFullscreen">true</item>
</style>
<style name="BottomNavigationViewTheme" parent="Theme.AppCompat.Light">
<style name="BottomNavigationViewTheme" parent="Theme.AppCompat.DayNight">
<item name="colorPrimary">@color/colorAccent</item>
</style>
<style name="ToolbarTheme" parent="Widget.AppCompat.Toolbar">
<item name="colorControlNormal">@lineageos.platform:color/color_default_accent</item>
<item name="colorControlNormal">@color/colorAccent</item>
</style>
<style name="Toolbar.Button.Navigation.Tinted" parent="Widget.AppCompat.Toolbar.Button.Navigation">
<item name="tint">@color/colorAccent</item>
</style>
</resources>
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment