Skip to content

Create common-ui module for common theming across the apps #1277

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

Merged
merged 4 commits into from
Jun 14, 2021
Merged

Create common-ui module for common theming across the apps #1277

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5657c39
extracted theming, colors and dimensions to a common-ui module
malmstein Jun 10, 2021
00a95c7
cleaning up references to styles
malmstein Jun 10, 2021
71d95b5
fixed wrong theme inheritance
malmstein Jun 11, 2021
7c7dc6c
remove unnecessary test
malmstein Jun 14, 2021
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
1 change: 1 addition & 0 deletions app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,7 @@ android {
dependencies {
implementation project(path: ':statistics')
implementation project(path: ':common')
implementation project(path: ':common-ui')
implementation project(path: ':di')

implementation AndroidX.legacy.supportV4
Expand Down
31 changes: 31 additions & 0 deletions app/src/main/res/values-v27/styles.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
<?xml version="1.0" encoding="utf-8"?><!--
~ Copyright (c) 2021 DuckDuckGo
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->

<resources>
<style name="FireDialog" parent="@style/Theme.Design.BottomSheetDialog">
<item name="android:windowIsFloating">false</item>
<item name="android:navigationBarColor">?toolbarBgColor</item>
<item name="android:statusBarColor">@android:color/transparent</item>
<item name="bottomSheetStyle">@style/FireDialogStyle</item>
</style>

<style name="EmailTooltip" parent="@style/Theme.Design.BottomSheetDialog">
<item name="android:windowIsFloating">false</item>
<item name="android:navigationBarColor">?toolbarBgColor</item>
<item name="android:statusBarColor">@android:color/transparent</item>
<item name="bottomSheetStyle">@style/EmailTooltipStyle</item>
</style>
</resources>
12 changes: 0 additions & 12 deletions app/src/main/res/values/styles.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,6 @@

<resources xmlns:tools="http://schemas.android.com/tools">

<style name="BottomSheetDialog" parent="Theme.Design.BottomSheetDialog">
<item name="bottomSheetStyle">@style/BottomSheetStyle</item>
</style>

<style name="BottomSheetStyle" parent="Widget.Design.BottomSheet.Modal">
<item name="behavior_peekHeight">512dp</item>
</style>

<style name="DashboardHeader">
<item name="android:fontFamily">sans-serif</item>
<item name="android:letterSpacing">0.14</item>
Expand Down Expand Up @@ -313,10 +305,6 @@
<item name="android:textSize">13sp</item>
</style>

<style name="snackbarButtonStyle" parent="Widget.MaterialComponents.Button.TextButton.Snackbar">
<item name="android:textColor">?attr/colorAccent</item>
</style>

<style name="FireproofWebsiteSectionTitle">
<item name="android:layout_width">match_parent</item>
<item name="android:layout_height">wrap_content</item>
Expand Down
222 changes: 3 additions & 219 deletions app/src/main/res/values/themes.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<!--
~ Copyright (c) 2018 DuckDuckGo
<?xml version="1.0" encoding="utf-8"?><!--
~ Copyright (c) 2021 DuckDuckGo
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
Expand All @@ -16,223 +16,7 @@

<resources>

<style name="BaseAppTheme" parent="Theme.MaterialComponents.Light.Bridge"/>

<style name="AppTheme" parent="BaseAppTheme">

<!-- These neutral colors cover cases before dynamic theme can be applied
such as the app launch color -->
<item name="colorPrimary">@color/almostBlackDark</item>
<item name="colorPrimaryDark">@color/black</item>
<item name="colorAccent">@color/cornflowerBlue</item>
<item name="android:windowBackground">?attr/colorPrimaryDark</item>
<item name="windowActionBar">false</item>
<item name="windowNoTitle">true</item>
<item name="bottomSheetDialogTheme">@style/BottomSheetDialog</item>
<item name="android:windowActivityTransitions">true</item>
<item name="autoCompleteTextViewStyle">@style/AutoCompleteTextViewStyle</item>
<item name="android:statusBarColor">?toolbarBgColor</item>
<item name="snackbarButtonStyle">@style/snackbarButtonStyle</item>
<item name="android:colorEdgeEffect">@color/newBlack</item>
</style>

<style name="AppTheme.BaseDark">
<item name="colorPrimary">@color/darkThemePrimary</item>
<item name="colorPrimaryDark">@color/darkThemePrimaryDark</item>
<item name="daxLogoTextColor">@color/white</item>
<item name="normalTextColor">@color/white</item>
<item name="toolbarIconColor">@color/white</item>
<item name="toolbarTextColor">@color/white</item>
<item name="toolbarBgColor">@color/newBlack</item>
<item name="toolbarBgBorderColor">@color/toolbarBorderColorDark</item>
<item name="dialogBgColor">@color/almostBlackDark</item>
<item name="browserIconColorSelector">@color/browser_icon_color_selector_dark</item>
<item name="browserMenuTextColor">@color/white</item>
<item name="browserMenuTextColorDisabled">@color/warGreyTwo</item>
<item name="omnibarRoundedFieldBackgroundColor">@color/almostBlack</item>
<item name="omnibarTextColor">@color/white</item>
<item name="omnibarHintColor">@color/paleBrownishGray</item>
<item name="omnibarLogoLetterTextColor">@color/midGray</item>
<item name="autoCompleteTextColor">@color/white</item>
<item name="autoCompleteSubtitleTextColor">@color/grayish</item>
<item name="tabTitleTextColor">@color/white</item>
<item name="tabTitleTextColorLegacy">@color/midnight</item>
<item name="tabSubtitleTextColor">@color/coolGray</item>
<item name="tabSelectedBorderColor">@color/skyBlue</item>
<item name="tabsFireTextColor">@color/white</item>
<item name="tabCardBackgroundColor">@color/almostBlack</item>
<item name="whitelistTextColor">@color/white</item>
<item name="bookmarkIconColor">@color/white</item>
<item name="websiteListFaviconBackground">@color/almostBlack</item>
<item name="bookmarkTitleTextColor">@color/white</item>
<item name="savedSiteEmptyTextColor">@color/white</item>
<item name="fireproofWebsiteTitleTextColor">@color/white</item>
<item name="savedSiteSubtitleTextColor">@color/grayishTwo</item>
<item name="settingsItemTextColor">@color/white</item>
<item name="settingsItemTextColorDisabled">@color/warGreyTwo</item>
<item name="settingsMinorTextColor">@color/grayishTwo</item>
<item name="settingsSwitchBackgroundColor">@color/subtleGrayTwo</item>
<item name="settingsDividerColor">@color/almostBlack</item>
<item name="buttonOutlinedTextColor">@color/pinkishGrayThree</item>
<item name="buttonOutlinedBorderColor">@color/brownishGrayTwo</item>
<item name="callToActionTitleColor">@color/white</item>
<item name="callToActionSubtitleColor">@color/grayishThree</item>
<item name="daxDialogBackgroundColor">@color/charcoalGrey</item>
<item name="daxDialogSecondaryButtonTextColor">@color/white</item>
<item name="daxDialogSecondaryButtonRippleColor">@color/white</item>

<item name="brokenSiteSelectionTextColor">@color/white</item>
<item name="brokenSiteOutlinedColor">@color/grayish</item>
<item name="brokenSitesButtonDisabledBackgroundColor">@color/greyishBrownTwo</item>
<item name="brokenSitesButtonDisabledTextColor">@color/warGreyTwo</item>
<item name="brokenSitesButtonRippleColor">@color/white</item>

<item name="feedbackAnonymousFeedbackLabelColor">@color/grayish</item>
<item name="feedbackListItemBackgroundColor">@color/almostBlack</item>
<item name="feedbackListItemSeparatorColor">@color/charcoalGrey</item>
<item name="feedbackEditTextBackgroundColor">@color/almostBlack</item>
<item name="feedbackEditTextHintColor">@color/grayish</item>

<item name="privacyDashboardLogoLetterTextColor">@color/subtleGray</item>
</style>

<style name="AppTheme.Dark" parent="AppTheme.BaseDark" />

<style name="AppTheme.Dark.AppBarOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar" />

<style name="AppTheme.Dark.PopupOverlay" parent="ThemeOverlay.AppCompat.Light" />

<style name="AppTheme.Dark.Transparent">
<item name="android:statusBarColor">@android:color/transparent</item>
<item name="android:windowDrawsSystemBarBackgrounds">true</item>
</style>

<!-- To create a new color theme, copy this light one and update the suffix as appropriate.
Include:
* AppTheme.BaseLight
* AppTheme.Light
* AppTheme.Light in values-v23/themes.xml
* SplashTheme.Light
-->
<style name="AppTheme.BaseLight">
<item name="colorPrimary">@color/lightThemePrimary</item>
<item name="colorPrimaryDark">@color/lightThemePrimaryDark</item>
<item name="daxLogoTextColor">@color/almostBlackDark</item>
<item name="normalTextColor">@color/almostBlackDark</item>
<item name="toolbarIconColor">@color/almostBlackDark</item>
<item name="toolbarTextColor">@color/almostBlackDark</item>
<item name="toolbarBgColor">@color/white</item>
<item name="toolbarBgBorderColor">@color/toolbarBorderColorLight</item>
<item name="dialogBgColor">@color/white</item>
<item name="browserIconColorSelector">@color/browser_icon_color_selector_light</item>
<item name="browserMenuTextColor">@color/almostBlackDark</item>
<item name="browserMenuTextColorDisabled">@color/pinkish_grey_two</item>
<item name="omnibarRoundedFieldBackgroundColor">@color/whiteFour</item>
<item name="omnibarTextColor">@color/almostBlackDark</item>
<item name="omnibarHintColor">@color/brownishGrayTwo</item>
<item name="omnibarLogoLetterTextColor">@color/whiteFour</item>
<item name="autoCompleteTextColor">@color/almostBlackDark</item>
<item name="autoCompleteSubtitleTextColor">@color/warmerGray</item>
<item name="tabTitleTextColor">@color/almostBlackDark</item>
<item name="tabTitleTextColorLegacy">@color/almostBlackDark</item>
<item name="tabSubtitleTextColor">@color/warmerGray</item>
<item name="tabSelectedBorderColor">@color/cornflowerBlue</item>
<item name="tabsFireTextColor">@color/warmerGray</item>
<item name="tabCardBackgroundColor">@color/white</item>
<item name="bookmarkIconColor">@color/almostBlackDark</item>
<item name="bookmarkTitleTextColor">@color/almostBlackDark</item>
<item name="savedSiteEmptyTextColor">@color/almostBlackDark</item>
<item name="whitelistTextColor">@color/almostBlack</item>
<item name="websiteListFaviconBackground">@color/whiteSix</item>
<item name="fireproofWebsiteTitleTextColor">@color/almostBlack</item>
<item name="savedSiteSubtitleTextColor">@color/warmerGray</item>
<item name="settingsItemTextColor">@color/almostBlackDark</item>
<item name="settingsItemTextColorDisabled">@color/pinkish_grey_two</item>
<item name="settingsMinorTextColor">@color/warmerGray</item>
<item name="settingsSwitchBackgroundColor">@color/brownishGrayTwo</item>
<item name="settingsDividerColor">@color/whiteSix</item>
<item name="buttonOutlinedTextColor">@color/cornflowerBlue</item>
<item name="buttonOutlinedBorderColor">@color/grayishThree</item>
<item name="callToActionTitleColor">@color/almostBlackDark</item>
<item name="callToActionSubtitleColor">@color/brownishGrayTwo</item>
<item name="daxDialogBackgroundColor">@color/white</item>
<item name="daxDialogSecondaryButtonTextColor">@color/almostBlackDark</item>
<item name="daxDialogSecondaryButtonRippleColor">@color/subtleGrayTwo</item>

<item name="brokenSiteSelectionTextColor">@color/almostBlackDark</item>
<item name="brokenSiteOutlinedColor">@color/grayishTwo</item>
<item name="brokenSitesButtonDisabledBackgroundColor">@color/subtleGrayTwo</item>
<item name="brokenSitesButtonDisabledTextColor">@color/white</item>
<item name="brokenSitesButtonRippleColor">@color/subtleGrayTwo</item>

<item name="feedbackAnonymousFeedbackLabelColor">@color/warmerGray</item>
<item name="feedbackListItemBackgroundColor">@color/whiteFive</item>
<item name="feedbackListItemSeparatorColor">@color/whiteSix</item>
<item name="feedbackEditTextBackgroundColor">@color/whiteFive</item>
<item name="feedbackEditTextHintColor">@color/warmerGray</item>

<item name="privacyDashboardLogoLetterTextColor">@color/whiteFour</item>
</style>

<style name="AppTheme.Light" parent="AppTheme.BaseLight">
<!-- The status bar must always be dark prior to API 23 as the light text cannot be changed -->
<item name="android:statusBarColor">@color/almostBlack</item>
</style>

<style name="ModalCardTheme" parent="Theme.AppCompat.Light.NoActionBar">
<item name="colorPrimary">@color/darkThemePrimary</item>
<item name="colorPrimaryDark">@color/darkThemePrimaryDark</item>
<item name="colorAccent">@color/cornflowerBlue</item>
<item name="android:windowBackground">@color/translucentDark</item>
<item name="android:windowNoTitle">true</item>
<item name="android:colorBackgroundCacheHint">@null</item>
<item name="android:windowIsTranslucent">true</item>
<item name="android:windowAnimationStyle">@android:style/Animation</item>
<item name="toolbarIconColor">@color/white</item>
</style>

<style name="ToolbarTheme" parent="ThemeOverlay.AppCompat.Dark.ActionBar">
<item name="colorControlNormal">?attr/toolbarIconColor</item>
<item name="android:textColorPrimary">?attr/toolbarTextColor</item>
<item name="colorControlHighlight">@color/subtleGrayTwo</item>
</style>

<style name="OmnibarToolbarTheme">
<item name="colorControlHighlight">@color/subtleGrayTwo</item>
</style>

<style name="SwitchTheme" parent="Widget.AppCompat.CompoundButton.Switch">
<item name="colorControlActivated">@android:color/white</item>
</style>

<style name="SettingsSwitchTheme">
<item name="colorControlActivated">@color/cornflowerBlue</item>
<item name="colorSwitchThumbNormal">@color/white</item>
<item name="android:colorForeground">?attr/settingsSwitchBackgroundColor</item>
</style>

<style name="TextInputLayoutTheme" parent="Widget.Design.TextInputLayout">
<item name="colorControlActivated">?colorAccent</item>
<item name="colorControlNormal">?colorAccent</item>
<item name="colorControlHighlight">?colorAccent</item>
<item name="android:textColor">?normalTextColor</item>
<item name="android:textColorSecondary">?normalTextColor</item>
<item name="android:textColorHint">?normalTextColor</item>
</style>

<style name="AutoCompleteTextViewStyle" parent="Widget.AppCompat.AutoCompleteTextView">
<item name="android:textCursorDrawable">@drawable/text_cursor</item>
<item name="android:textColorHint">?attr/omnibarHintColor</item>
<item name="android:fontFamily">sans-serif-medium</item>
</style>

<style name="DaxDialogFragment" parent="android:Theme.DeviceDefault.Light.NoActionBar">
<item name="android:windowTranslucentStatus">true</item>
</style>

<style name="PopUpMenuSwitchTheme">
<item name="colorAccent">@color/cornflowerBlue</item>
<item name="android:textColorSecondary">?attr/toolbarIconColor</item>
</style>

</resources>
</resources>
1 change: 1 addition & 0 deletions common-ui/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/build
30 changes: 30 additions & 0 deletions common-ui/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
/*
* Copyright (c) 2021 DuckDuckGo
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

plugins {
id 'com.android.library'
id 'kotlin-android'
id 'kotlin-kapt'
}

apply from: "$rootProject.projectDir/gradle/android-library.gradle"

dependencies {

implementation AndroidX.appCompat
implementation Google.android.material
implementation AndroidX.constraintLayout
}
21 changes: 21 additions & 0 deletions common-ui/proguard-rules.pro
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
# Add project specific ProGuard rules here.
# You can control the set of applied configuration files using the
# proguardFiles setting in build.gradle.
#
# For more details, see
# http://developer.android.com/guide/developing/tools/proguard.html

# If your project uses WebView with JS, uncomment the following
# and specify the fully qualified class name to the JavaScript interface
# class:
#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
# public *;
#}

# Uncomment this to preserve the line number information for
# debugging stack traces.
#-keepattributes SourceFile,LineNumberTable

# If you keep the line number information, uncomment this to
# hide the original source file name.
#-renamesourcefileattribute SourceFile
21 changes: 21 additions & 0 deletions common-ui/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Copyright (c) 2021 DuckDuckGo
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->

<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.duckduckgo.mobile.android">

</manifest>
0 .../color/broken_sites_button_background.xml → .../color/broken_sites_button_background.xml
View file
Open in desktop
File renamed without changes.
0 ...in/res/color/broken_sites_button_text.xml → ...in/res/color/broken_sites_button_text.xml
View file
Open in desktop
File renamed without changes.
0 .../color/broken_sites_dropdown_selector.xml → .../color/broken_sites_dropdown_selector.xml
View file
Open in desktop
File renamed without changes.
0 ...olor/browser_icon_color_selector_dark.xml → ...olor/browser_icon_color_selector_dark.xml
View file
Open in desktop
File renamed without changes.
0 ...lor/browser_icon_color_selector_light.xml → ...lor/browser_icon_color_selector_light.xml
View file
Open in desktop
File renamed without changes.
0 app/src/main/res/color/browser_menu_text.xml → .../src/main/res/color/browser_menu_text.xml
View file
Open in desktop
File renamed without changes.
0 ...res/color/button_contained_background.xml → ...res/color/button_contained_background.xml
View file
Open in desktop
File renamed without changes.
0 ...olor/settings_subtitle_color_selector.xml → ...olor/settings_subtitle_color_selector.xml
View file
Open in desktop
File renamed without changes.
0 ...s/color/settings_title_color_selector.xml → ...s/color/settings_title_color_selector.xml
View file
Open in desktop
File renamed without changes.
0 app/src/main/res/drawable/text_cursor.xml → ...-ui/src/main/res/drawable/text_cursor.xml
View file
Open in desktop
File renamed without changes.
0 app/src/main/res/values-land/dimens.xml → ...on-ui/src/main/res/values-land/dimens.xml
View file
Open in desktop
File renamed without changes.
0 ...c/main/res/values-sw600dp-land/dimens.xml → ...c/main/res/values-sw600dp-land/dimens.xml
View file
Open in desktop
File renamed without changes.
0 app/src/main/res/values-sw600dp/dimens.xml → ...ui/src/main/res/values-sw600dp/dimens.xml
View file
Open in desktop
File renamed without changes.
0 app/src/main/res/values-v23/themes.xml → common-ui/src/main/res/values-v23/themes.xml
View file
Open in desktop
File renamed without changes.
Loading