Skip to content

ui: more theming utilities (for Files)#7

Merged
AlvaroBrey merged 48 commits intomainfrom
feature/more-theming-files
Oct 14, 2022
Merged

ui: more theming utilities (for Files)#7
AlvaroBrey merged 48 commits intomainfrom
feature/more-theming-files

Conversation

@AlvaroBrey
Copy link
Member

@AlvaroBrey AlvaroBrey commented Sep 7, 2022 •
edited
Loading

Files PR: nextcloud/android#10717

  • deduplicate code

@AlvaroBrey AlvaroBrey changed the title feature/more theming files wip: more theming (for Files) Sep 7, 2022
@AlvaroBrey AlvaroBrey mentioned this pull request Sep 7, 2022
Merged
20 tasks
@AlvaroBrey AlvaroBrey force-pushed the feature/more-theming-files branch from f552591 to db33e5a Compare September 8, 2022 08:48
@AlvaroBrey AlvaroBrey added the 2. developing Work in progress label Sep 8, 2022
@AndyScherzinger AndyScherzinger force-pushed the feature/more-theming-files branch 2 times, most recently from cbe581a to b210371 Compare September 12, 2022 22:05
@AndyScherzinger AndyScherzinger force-pushed the feature/more-theming-files branch 2 times, most recently from 5105a26 to f3624c8 Compare September 26, 2022 10:22
@AlvaroBrey AlvaroBrey force-pushed the feature/more-theming-files branch 2 times, most recently from df34b53 to 08b5abe Compare October 10, 2022 19:01
@AlvaroBrey AlvaroBrey added 3. to review Waiting for reviews and removed 2. developing Work in progress labels Oct 11, 2022
@AlvaroBrey AlvaroBrey marked this pull request as ready for review October 11, 2022 12:30
@AlvaroBrey AlvaroBrey changed the title wip: more theming (for Files) ui: more theming utilities (for Files) Oct 11, 2022
AndyScherzinger
AndyScherzinger approved these changes Oct 11, 2022
View reviewed changes
Copy link
Member

@AndyScherzinger AndyScherzinger left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM 👍

@AlvaroBrey AlvaroBrey enabled auto-merge October 13, 2022 08:59
@AlvaroBrey AlvaroBrey disabled auto-merge October 13, 2022 09:10
@AlvaroBrey @AndyScherzinger
ColorUtil: treat empty color strings the same as null ones
7a02f09 
Otherwise parseColor crashes

Signed-off-by: Álvaro Brey <alvaro.brey@nextcloud.com>
@AlvaroBrey @AndyScherzinger
ui: AndroidViewThemeUtils: add primary coloring method for progressbar
c4d7e8f 
Previous method required passing the color in

Signed-off-by: Álvaro Brey <alvaro.brey@nextcloud.com>
@AlvaroBrey @AndyScherzinger
ui: AndroidViewThemeUtils: more methods regarding buttons
a421fca 
Signed-off-by: Álvaro Brey <alvaro.brey@nextcloud.com>
@AlvaroBrey @AndyScherzinger
AndroidViewThemeUtils: use gray for disabled checkboxes
7d83873 
Signed-off-by: Álvaro Brey <alvaro.brey@nextcloud.com>
@AlvaroBrey @AndyScherzinger
Add MaterialSchemes implementation from color
2bb8097 
Useful for fallback theming

Signed-off-by: Álvaro Brey <alvaro.brey@nextcloud.com>
@AlvaroBrey @AndyScherzinger
Fix detekt/ktlint
9dc69a6 
Signed-off-by: Álvaro Brey <alvaro.brey@nextcloud.com>
@AlvaroBrey @AndyScherzinger
AndroidViewThemeUtils: themeProgressBar: null-check both drawables
a6f7b9e 
Signed-off-by: Álvaro Brey <alvaro.brey@nextcloud.com>
@AlvaroBrey @AndyScherzinger
MaterialViewThemeUtils: themeTextInputLayout: also color editText hig…
d0d5347 
…hlight

Signed-off-by: Álvaro Brey <alvaro.brey@nextcloud.com>
@AlvaroBrey @AndyScherzinger
AndroidViewThemeUtils: alternate coloring for menu items
733db63 
Signed-off-by: Álvaro Brey <alvaro.brey@nextcloud.com>
@AlvaroBrey @AndyScherzinger
AndroidViewThemeUtils: better name for imageview method
5b1e562 
Deprecate old name

Signed-off-by: Álvaro Brey <alvaro.brey@nextcloud.com>
AndyScherzinger and others added 17 commits October 13, 2022 12:14
@AndyScherzinger
add primaryColor access
56e3af6 
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
@AndyScherzinger
extend outlined buttons primary coloring for all defined states
91842d0 
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
@AndyScherzinger
Add theming for CheckedTextView
e961162 
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
@AndyScherzinger
add color option for progress bar
f974f9b 
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
@AndyScherzinger
Add tonal button, cadview stroke coloring and onSecondaryContainer te…
226ef60 
…xt theming

Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
@AlvaroBrey @AndyScherzinger
Introduce ColorRole abstraction to deduplicate logic while allowing c…
e0f9bca 
…ustomization of colors when calling

Signed-off-by: Álvaro Brey <alvaro.brey@nextcloud.com>
@AlvaroBrey @AndyScherzinger
ui: Add function to theme notification builder
10a5159 
Signed-off-by: Álvaro Brey <alvaro.brey@nextcloud.com>
@AlvaroBrey @AndyScherzinger
ui: add utilities to tint platform Switch
87322df 
Shares most code with SwitchCompat but is not interface-compatible

Signed-off-by: Álvaro Brey <alvaro.brey@nextcloud.com>
@AlvaroBrey @AndyScherzinger
Rework status bar coloring
ae9ca8b 
Needed for special cases

Signed-off-by: Álvaro Brey <alvaro.brey@nextcloud.com>
@AlvaroBrey @AndyScherzinger
PlatformThemeUtil: make isDarkMode accessible from Java
071ec0b 
Signed-off-by: Álvaro Brey <alvaro.brey@nextcloud.com>
@AlvaroBrey @AndyScherzinger
Some more drawable coloring
6d96f4c 
Signed-off-by: Álvaro Brey <alvaro.brey@nextcloud.com>
@AlvaroBrey @AndyScherzinger
AndroidViewThemeUtils: fix navbar colors
40bf8e8 
Signed-off-by: Álvaro Brey <alvaro.brey@nextcloud.com>
@AlvaroBrey @AndyScherzinger
ui: mark SwitchColorUtils as internal
d677e4b 
Signed-off-by: Álvaro Brey <alvaro.brey@nextcloud.com>
@AlvaroBrey @AndyScherzinger
ColorUtil: add utility function to convert color to hex
83ffde8 
Signed-off-by: Álvaro Brey <alvaro.brey@nextcloud.com>
@AlvaroBrey @AndyScherzinger
Reduce a lot of boilerplate by creating a ColorStateList build function
ba07300 
Signed-off-by: Álvaro Brey <alvaro.brey@nextcloud.com>
@AlvaroBrey @AndyScherzinger
MaterialViewThemeUtils: deduplicate ripple color
1f49e6a 
Signed-off-by: Álvaro Brey <alvaro.brey@nextcloud.com>
@AlvaroBrey @AndyScherzinger
Remove unneeded TODO
17f5d6c 
Signed-off-by: Álvaro Brey <alvaro.brey@nextcloud.com>
@AndyScherzinger AndyScherzinger force-pushed the feature/more-theming-files branch from 0ee130c to 715c87e Compare October 13, 2022 10:14
@AndyScherzinger
Add disabled state to FAB
783c4b7 
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
@AndyScherzinger AndyScherzinger force-pushed the feature/more-theming-files branch from 715c87e to 783c4b7 Compare October 13, 2022 10:55
@AlvaroBrey AlvaroBrey enabled auto-merge (squash) October 14, 2022 09:10
@AlvaroBrey AlvaroBrey disabled auto-merge October 14, 2022 09:10
@AlvaroBrey AlvaroBrey enabled auto-merge (squash) October 14, 2022 09:11
@AlvaroBrey
MaterialViewThemeUtils: simplify colorstatelist
ed7019a 
Signed-off-by: Álvaro Brey <alvaro.brv@gmail.com>
Signed-off-by: Álvaro Brey <alvaro.brey@nextcloud.com>
@AlvaroBrey AlvaroBrey force-pushed the feature/more-theming-files branch from 57a51d4 to ed7019a Compare October 14, 2022 09:13
@AlvaroBrey AlvaroBrey merged commit 58400b0 into main Oct 14, 2022
@AlvaroBrey AlvaroBrey deleted the feature/more-theming-files branch October 14, 2022 09:32
@AndyScherzinger
Copy link
Member

AndyScherzinger commented Oct 14, 2022

Woohoo! 💙

@AlvaroBrey
Copy link
Member Author

AlvaroBrey commented Oct 14, 2022

Woohoo! blue_heart

Thanks for all your contributions!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@AndyScherzinger AndyScherzinger AndyScherzinger approved these changes

@tobiasKaminsky tobiasKaminsky Awaiting requested review from tobiasKaminsky

Assignees

No one assigned

Labels

3. to review Waiting for reviews

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@AlvaroBrey @AndyScherzinger

Comments