Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
M
Magisk
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
Magisk
Commits
d35d1b88
Commit
d35d1b88
authored
Oct 06, 2019
by
Viktor De Pasquale
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Added more styles to be used on top of primary color
parent
88027f21
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
40 additions
and
0 deletions
+40
-0
color_on_primary_transient.xml
app/src/main/res/color/color_on_primary_transient.xml
+5
-0
styles_md2.xml
app/src/main/res/values-night/styles_md2.xml
+1
-0
attrs.xml
app/src/main/res/values/attrs.xml
+5
-0
styles_md2.xml
app/src/main/res/values/styles_md2.xml
+5
-0
styles_md2_impl.xml
app/src/main/res/values/styles_md2_impl.xml
+24
-0
No files found.
app/src/main/res/color/color_on_primary_transient.xml
0 → 100644
View file @
d35d1b88
<?xml version="1.0" encoding="utf-8"?>
<selector
xmlns:android=
"http://schemas.android.com/apk/res/android"
>
<item
android:color=
"?colorDisabled"
android:state_enabled=
"false"
/>
<item
android:color=
"?colorOnPrimary"
/>
</selector>
\ No newline at end of file
app/src/main/res/values-night/styles_md2.xml
View file @
d35d1b88
...
@@ -20,6 +20,7 @@
...
@@ -20,6 +20,7 @@
<item
name=
"colorTextTransient"
>
@color/color_text_transient
</item>
<item
name=
"colorTextTransient"
>
@color/color_text_transient
</item>
<item
name=
"colorPrimaryTransient"
>
@color/color_primary_transient
</item>
<item
name=
"colorPrimaryTransient"
>
@color/color_primary_transient
</item>
<item
name=
"colorErrorTransient"
>
@color/color_error_transient
</item>
<item
name=
"colorErrorTransient"
>
@color/color_error_transient
</item>
<item
name=
"colorOnPrimaryTransient"
>
@color/color_on_primary_transient
</item>
</style>
</style>
</resources>
</resources>
\ No newline at end of file
app/src/main/res/values/attrs.xml
View file @
d35d1b88
...
@@ -21,13 +21,17 @@
...
@@ -21,13 +21,17 @@
<!--Button-->
<!--Button-->
<attr
name=
"styleButtonDefault"
format=
"reference"
/>
<attr
name=
"styleButtonDefault"
format=
"reference"
/>
<attr
name=
"styleButtonDefaultOnPrimary"
format=
"reference"
/>
<attr
name=
"styleButtonFlat"
format=
"reference"
/>
<attr
name=
"styleButtonFlat"
format=
"reference"
/>
<attr
name=
"styleButtonFlatOnPrimary"
format=
"reference"
/>
<attr
name=
"styleButtonText"
format=
"reference"
/>
<attr
name=
"styleButtonText"
format=
"reference"
/>
<attr
name=
"styleButtonTextOnPrimary"
format=
"reference"
/>
<attr
name=
"styleButtonError"
format=
"reference"
/>
<attr
name=
"styleButtonError"
format=
"reference"
/>
<!--Icon-->
<!--Icon-->
<attr
name=
"styleIconNormal"
format=
"reference"
/>
<attr
name=
"styleIconNormal"
format=
"reference"
/>
<attr
name=
"styleIconPrimary"
format=
"reference"
/>
<attr
name=
"styleIconPrimary"
format=
"reference"
/>
<attr
name=
"styleIconOnPrimary"
format=
"reference"
/>
<attr
name=
"styleIconError"
format=
"reference"
/>
<attr
name=
"styleIconError"
format=
"reference"
/>
<!--Image-->
<!--Image-->
...
@@ -70,6 +74,7 @@
...
@@ -70,6 +74,7 @@
<!--Transient-->
<!--Transient-->
<attr
name=
"colorTextTransient"
format=
"reference"
/>
<attr
name=
"colorTextTransient"
format=
"reference"
/>
<attr
name=
"colorPrimaryTransient"
format=
"reference"
/>
<attr
name=
"colorPrimaryTransient"
format=
"reference"
/>
<attr
name=
"colorOnPrimaryTransient"
format=
"reference"
/>
<attr
name=
"colorErrorTransient"
format=
"reference"
/>
<attr
name=
"colorErrorTransient"
format=
"reference"
/>
<!--Static-->
<!--Static-->
...
...
app/src/main/res/values/styles_md2.xml
View file @
d35d1b88
...
@@ -33,12 +33,16 @@
...
@@ -33,12 +33,16 @@
<item
name=
"styleCardOnPrimary"
>
@style/WidgetFoundation.Card.OnPrimary
</item>
<item
name=
"styleCardOnPrimary"
>
@style/WidgetFoundation.Card.OnPrimary
</item>
<item
name=
"styleButtonDefault"
>
@style/WidgetFoundation.Button
</item>
<item
name=
"styleButtonDefault"
>
@style/WidgetFoundation.Button
</item>
<item
name=
"styleButtonDefaultOnPrimary"
>
@style/WidgetFoundation.Button.OnPrimary
</item>
<item
name=
"styleButtonFlat"
>
@style/WidgetFoundation.Button.Flat
</item>
<item
name=
"styleButtonFlat"
>
@style/WidgetFoundation.Button.Flat
</item>
<item
name=
"styleButtonFlatOnPrimary"
>
@style/WidgetFoundation.Button.Flat.OnPrimary
</item>
<item
name=
"styleButtonText"
>
@style/WidgetFoundation.Button.Text
</item>
<item
name=
"styleButtonText"
>
@style/WidgetFoundation.Button.Text
</item>
<item
name=
"styleButtonTextOnPrimary"
>
@style/WidgetFoundation.Button.Text.OnPrimary
</item>
<item
name=
"styleButtonError"
>
@style/WidgetFoundation.Button.Error
</item>
<item
name=
"styleButtonError"
>
@style/WidgetFoundation.Button.Error
</item>
<item
name=
"styleIconNormal"
>
@style/WidgetFoundation.Icon
</item>
<item
name=
"styleIconNormal"
>
@style/WidgetFoundation.Icon
</item>
<item
name=
"styleIconPrimary"
>
@style/WidgetFoundation.Icon.Primary
</item>
<item
name=
"styleIconPrimary"
>
@style/WidgetFoundation.Icon.Primary
</item>
<item
name=
"styleIconOnPrimary"
>
@style/WidgetFoundation.Icon.OnPrimary
</item>
<item
name=
"styleIconError"
>
@style/WidgetFoundation.Icon.Error
</item>
<item
name=
"styleIconError"
>
@style/WidgetFoundation.Icon.Error
</item>
<item
name=
"styleImageBig"
>
@style/WidgetFoundation.Image.Big
</item>
<item
name=
"styleImageBig"
>
@style/WidgetFoundation.Image.Big
</item>
...
@@ -97,6 +101,7 @@
...
@@ -97,6 +101,7 @@
<item
name=
"colorTextTransient"
>
@color/color_text_transient
</item>
<item
name=
"colorTextTransient"
>
@color/color_text_transient
</item>
<item
name=
"colorPrimaryTransient"
>
@color/color_primary_transient
</item>
<item
name=
"colorPrimaryTransient"
>
@color/color_primary_transient
</item>
<item
name=
"colorErrorTransient"
>
@color/color_error_transient
</item>
<item
name=
"colorErrorTransient"
>
@color/color_error_transient
</item>
<item
name=
"colorOnPrimaryTransient"
>
@color/color_on_primary_transient
</item>
</style>
</style>
</resources>
</resources>
\ No newline at end of file
app/src/main/res/values/styles_md2_impl.xml
View file @
d35d1b88
...
@@ -42,14 +42,34 @@ variant. Make sure to use style referenced by attribute defined it attrs.xml.
...
@@ -42,14 +42,34 @@ variant. Make sure to use style referenced by attribute defined it attrs.xml.
<item
name=
"android:textStyle"
>
bold
</item>
<item
name=
"android:textStyle"
>
bold
</item>
</style>
</style>
<style
name=
"WidgetFoundation.Button.OnPrimary"
>
<item
name=
"backgroundTint"
>
?colorOnPrimary
</item>
<item
name=
"rippleColor"
>
?colorPrimary
</item>
<item
name=
"android:textColor"
>
?colorPrimary
</item>
<item
name=
"iconTint"
>
?colorPrimary
</item>
</style>
<style
name=
"WidgetFoundation.Button.Flat"
parent=
"Widget.MaterialComponents.Button.UnelevatedButton"
>
<style
name=
"WidgetFoundation.Button.Flat"
parent=
"Widget.MaterialComponents.Button.UnelevatedButton"
>
<item
name=
"android:textStyle"
>
bold
</item>
<item
name=
"android:textStyle"
>
bold
</item>
</style>
</style>
<style
name=
"WidgetFoundation.Button.Flat.OnPrimary"
>
<item
name=
"backgroundTint"
>
?colorOnPrimary
</item>
<item
name=
"rippleColor"
>
?colorPrimary
</item>
<item
name=
"android:textColor"
>
?colorPrimary
</item>
<item
name=
"iconTint"
>
?colorPrimary
</item>
</style>
<style
name=
"WidgetFoundation.Button.Text"
parent=
"Widget.MaterialComponents.Button.TextButton"
>
<style
name=
"WidgetFoundation.Button.Text"
parent=
"Widget.MaterialComponents.Button.TextButton"
>
<item
name=
"android:textStyle"
>
bold
</item>
<item
name=
"android:textStyle"
>
bold
</item>
</style>
</style>
<style
name=
"WidgetFoundation.Button.Text.OnPrimary"
>
<item
name=
"rippleColor"
>
?colorOnPrimary
</item>
<item
name=
"android:textColor"
>
?colorOnPrimary
</item>
<item
name=
"iconTint"
>
?colorOnPrimary
</item>
</style>
<style
name=
"WidgetFoundation.Button.Error"
parent=
"WidgetFoundation.Button.Text"
>
<style
name=
"WidgetFoundation.Button.Error"
parent=
"WidgetFoundation.Button.Text"
>
<item
name=
"rippleColor"
>
?colorError
</item>
<item
name=
"rippleColor"
>
?colorError
</item>
<item
name=
"android:textColor"
>
?colorError
</item>
<item
name=
"android:textColor"
>
?colorError
</item>
...
@@ -83,6 +103,10 @@ variant. Make sure to use style referenced by attribute defined it attrs.xml.
...
@@ -83,6 +103,10 @@ variant. Make sure to use style referenced by attribute defined it attrs.xml.
<item
name=
"tint"
>
?colorPrimaryTransient
</item>
<item
name=
"tint"
>
?colorPrimaryTransient
</item>
</style>
</style>
<style
name=
"WidgetFoundation.Icon.OnPrimary"
>
<item
name=
"tint"
>
?colorOnPrimaryTransient
</item>
</style>
<style
name=
"WidgetFoundation.Icon.Error"
>
<style
name=
"WidgetFoundation.Icon.Error"
>
<item
name=
"tint"
>
?colorErrorTransient
</item>
<item
name=
"tint"
>
?colorErrorTransient
</item>
</style>
</style>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment