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
0118f2ef
Commit
0118f2ef
authored
Sep 09, 2019
by
topjohnwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Merge styles
parent
15312e47
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
52 additions
and
55 deletions
+52
-55
styles.xml
app/src/main/res/values-night/styles.xml
+0
-0
styles.xml
app/src/main/res/values/styles.xml
+52
-0
styles_new.xml
app/src/main/res/values/styles_new.xml
+0
-55
No files found.
app/src/main/res/values-night/styles
_new
.xml
→
app/src/main/res/values-night/styles.xml
View file @
0118f2ef
File moved
app/src/main/res/values/styles.xml
View file @
0118f2ef
<resources>
<resources>
<style
name=
"ThemeFoundation"
parent=
"Theme.MaterialComponents.Light.NoActionBar"
/>
<style
name=
"ThemeFoundation.Colored"
>
<item
name=
"colorPrimary"
>
@color/colorPrimary
</item>
<item
name=
"colorPrimaryDark"
>
@color/colorPrimaryDark
</item>
<item
name=
"colorPrimaryVariant"
>
@color/colorPrimaryDark
</item>
<item
name=
"colorAccent"
>
@color/colorSecondary
</item>
<item
name=
"colorSecondary"
>
@color/colorSecondary
</item>
<item
name=
"colorSecondaryVariant"
>
@color/colorSecondaryDark
</item>
<item
name=
"android:windowBackground"
>
@android:color/white
</item>
</style>
<style
name=
"ThemeFoundation.Colored.ExtraProps"
/>
<style
name=
"MagiskTheme"
parent=
"ThemeFoundation.Colored.ExtraProps"
>
<!--All of these attributes are deprecated and will be removed-->
<item
name=
"cardStyle"
>
@style/CardViewStyle.Light
</item>
<item
name=
"imageColorTint"
>
@color/icon_grey
</item>
<item
name=
"colorControl"
>
?android:attr/textColorSecondary
</item>
<item
name=
"colorAccentFallback"
>
@color/accentFallback
</item>
</style>
<style
name=
"MagiskTheme.Flashing"
parent=
"Theme.MaterialComponents.NoActionBar"
>
<item
name=
"colorPrimary"
>
@android:color/black
</item>
<item
name=
"colorPrimaryDark"
>
@android:color/black
</item>
<item
name=
"colorAccent"
>
@color/colorSecondary
</item>
<item
name=
"colorSecondary"
>
@color/colorSecondary
</item>
<item
name=
"colorSecondaryVariant"
>
@color/colorSecondaryDark
</item>
<item
name=
"android:windowBackground"
>
@android:color/black
</item>
</style>
<style
name=
"MagiskTheme.SUFoundation"
parent=
"Theme.MaterialComponents.Light.Dialog"
/>
<style
name=
"MagiskTheme.SU"
parent=
"MagiskTheme.SUFoundation"
>
<item
name=
"android:windowIsFloating"
>
true
</item>
<item
name=
"android:windowIsTranslucent"
>
true
</item>
<item
name=
"windowActionBar"
>
false
</item>
<item
name=
"windowNoTitle"
>
true
</item>
</style>
<!--Overlays-->
<style
name=
"AppBarLayoutTheme"
parent=
"ThemeOverlay.AppCompat.Dark"
/>
<style
name=
"AppBarLayoutTheme.Flashing"
parent=
"ThemeOverlay.AppCompat.Dark"
/>
<style
name=
"ToolbarPopupTheme"
parent=
"ThemeOverlay.AppCompat.Light"
/>
<style
name=
"ToolbarPopupTheme.Flashing"
parent=
"ThemeOverlay.AppCompat.Dark"
/>
<!--CardView-->
<style
name=
"CardViewStyle.Dark"
parent=
"CardView"
>
<style
name=
"CardViewStyle.Dark"
parent=
"CardView"
>
<item
name=
"cardBackgroundColor"
>
@color/card_background_color_dark
</item>
<item
name=
"cardBackgroundColor"
>
@color/card_background_color_dark
</item>
</style>
</style>
...
...
app/src/main/res/values/styles_new.xml
deleted
100644 → 0
View file @
15312e47
<?xml version="1.0" encoding="utf-8"?>
<resources>
<style
name=
"ThemeFoundation"
parent=
"Theme.MaterialComponents.Light.NoActionBar"
/>
<style
name=
"ThemeFoundation.Colored"
>
<item
name=
"colorPrimary"
>
@color/colorPrimary
</item>
<item
name=
"colorPrimaryDark"
>
@color/colorPrimaryDark
</item>
<item
name=
"colorPrimaryVariant"
>
@color/colorPrimaryDark
</item>
<item
name=
"colorAccent"
>
@color/colorSecondary
</item>
<item
name=
"colorSecondary"
>
@color/colorSecondary
</item>
<item
name=
"colorSecondaryVariant"
>
@color/colorSecondaryDark
</item>
<item
name=
"android:windowBackground"
>
@android:color/white
</item>
</style>
<style
name=
"ThemeFoundation.Colored.ExtraProps"
/>
<style
name=
"MagiskTheme"
parent=
"ThemeFoundation.Colored.ExtraProps"
>
<!--All of these attributes are deprecated and will be removed-->
<item
name=
"cardStyle"
>
@style/CardViewStyle.Light
</item>
<item
name=
"imageColorTint"
>
@color/icon_grey
</item>
<item
name=
"colorControl"
>
?android:attr/textColorSecondary
</item>
<item
name=
"colorAccentFallback"
>
@color/accentFallback
</item>
</style>
<style
name=
"MagiskTheme.Flashing"
parent=
"Theme.MaterialComponents.NoActionBar"
>
<item
name=
"colorPrimary"
>
@android:color/black
</item>
<item
name=
"colorPrimaryDark"
>
@android:color/black
</item>
<item
name=
"colorAccent"
>
@color/colorSecondary
</item>
<item
name=
"colorSecondary"
>
@color/colorSecondary
</item>
<item
name=
"colorSecondaryVariant"
>
@color/colorSecondaryDark
</item>
<item
name=
"android:windowBackground"
>
@android:color/black
</item>
</style>
<style
name=
"MagiskTheme.SUFoundation"
parent=
"Theme.MaterialComponents.Light.Dialog"
/>
<style
name=
"MagiskTheme.SU"
parent=
"MagiskTheme.SUFoundation"
>
<item
name=
"android:windowIsFloating"
>
true
</item>
<item
name=
"android:windowIsTranslucent"
>
true
</item>
<item
name=
"windowActionBar"
>
false
</item>
<item
name=
"windowNoTitle"
>
true
</item>
</style>
<!--Overlays-->
<style
name=
"AppBarLayoutTheme"
parent=
"ThemeOverlay.AppCompat.Dark"
/>
<style
name=
"AppBarLayoutTheme.Flashing"
parent=
"ThemeOverlay.AppCompat.Dark"
/>
<style
name=
"ToolbarPopupTheme"
parent=
"ThemeOverlay.AppCompat.Light"
/>
<style
name=
"ToolbarPopupTheme.Flashing"
parent=
"ThemeOverlay.AppCompat.Dark"
/>
</resources>
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