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
9a8a27db
Commit
9a8a27db
authored
Sep 12, 2020
by
topjohnwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Do not access color attributes in background
Workaround with ImageView tints
parent
2eb00187
Hide whitespace changes
Inline
Side-by-side
Showing
16 changed files
with
16 additions
and
166 deletions
+16
-166
bg_appbar.xml
app/src/main/res/drawable-v21/bg_appbar.xml
+0
-15
bg_divider_rounded_on_primary.xml
...c/main/res/drawable-v21/bg_divider_rounded_on_primary.xml
+0
-7
bg_shadow.xml
app/src/main/res/drawable-v21/bg_shadow.xml
+0
-8
fast_scroll_thumb.xml
app/src/main/res/drawable-v21/fast_scroll_thumb.xml
+0
-19
progress_determinate.xml
app/src/main/res/drawable-v21/progress_determinate.xml
+0
-26
bg_appbar.xml
app/src/main/res/drawable/bg_appbar.xml
+0
-15
bg_divider_rounded_on_primary.xml
app/src/main/res/drawable/bg_divider_rounded_on_primary.xml
+1
-1
bg_shadow.xml
app/src/main/res/drawable/bg_shadow.xml
+1
-1
fast_scroll_thumb.xml
app/src/main/res/drawable/fast_scroll_thumb.xml
+0
-19
fast_scroll_track.xml
app/src/main/res/drawable/fast_scroll_track.xml
+0
-15
progress_determinate.xml
app/src/main/res/drawable/progress_determinate.xml
+0
-26
activity_main_md2.xml
app/src/main/res/layout/activity_main_md2.xml
+6
-0
fragment_safetynet_md2.xml
app/src/main/res/layout/fragment_safetynet_md2.xml
+3
-2
include_module_filter.xml
app/src/main/res/layout/include_module_filter.xml
+3
-7
item_hide_md2.xml
app/src/main/res/layout/item_hide_md2.xml
+1
-0
styles_md2_impl.xml
app/src/main/res/values/styles_md2_impl.xml
+1
-5
No files found.
app/src/main/res/drawable-v21/bg_appbar.xml
deleted
100644 → 0
View file @
2eb00187
<?xml version="1.0" encoding="utf-8"?>
<layer-list
xmlns:android=
"http://schemas.android.com/apk/res/android"
>
<item>
<shape
android:shape=
"rectangle"
>
<solid
android:color=
"?colorSurfaceVariant"
/>
</shape>
</item>
<item
android:bottom=
"2dp"
>
<shape
android:shape=
"rectangle"
>
<solid
android:color=
"?colorSurface"
/>
</shape>
</item>
</layer-list>
app/src/main/res/drawable-v21/bg_divider_rounded_on_primary.xml
deleted
100644 → 0
View file @
2eb00187
<?xml version="1.0" encoding="utf-8"?>
<shape
xmlns:android=
"http://schemas.android.com/apk/res/android"
android:shape=
"rectangle"
>
<size
android:height=
"4dp"
/>
<corners
android:radius=
"2dp"
/>
<solid
android:color=
"?colorOnPrimary"
/>
</shape>
\ No newline at end of file
app/src/main/res/drawable-v21/bg_shadow.xml
deleted
100644 → 0
View file @
2eb00187
<?xml version="1.0" encoding="utf-8"?>
<shape
xmlns:android=
"http://schemas.android.com/apk/res/android"
android:shape=
"rectangle"
>
<gradient
android:angle=
"270"
android:endColor=
"?colorSurfaceVariant"
android:startColor=
"@android:color/transparent"
/>
</shape>
\ No newline at end of file
app/src/main/res/drawable-v21/fast_scroll_thumb.xml
deleted
100644 → 0
View file @
2eb00187
<?xml version="1.0" encoding="utf-8"?>
<selector
xmlns:android=
"http://schemas.android.com/apk/res/android"
>
<item
android:state_pressed=
"true"
>
<shape
android:shape=
"rectangle"
>
<corners
android:radius=
"@dimen/r1"
/>
<solid
android:color=
"?colorOnSurfaceVariant"
/>
<size
android:width=
"5dp"
android:height=
"5dp"
/>
</shape>
</item>
<item>
<shape
android:shape=
"rectangle"
>
<corners
android:radius=
"@dimen/r1"
/>
<solid
android:color=
"?colorOnSurfaceVariant"
/>
<size
android:width=
"5dp"
android:height=
"5dp"
/>
</shape>
</item>
</selector>
app/src/main/res/drawable-v21/progress_determinate.xml
deleted
100644 → 0
View file @
2eb00187
<?xml version="1.0" encoding="utf-8"?>
<layer-list
xmlns:android=
"http://schemas.android.com/apk/res/android"
>
<item
android:id=
"@android:id/background"
>
<shape>
<solid
android:color=
"@android:color/transparent"
/>
</shape>
</item>
<item
android:id=
"@android:id/secondaryProgress"
>
<clip>
<shape>
<solid
android:color=
"?colorSecondary"
/>
</shape>
</clip>
</item>
<item
android:id=
"@android:id/progress"
>
<clip>
<shape>
<solid
android:color=
"?colorPrimary"
/>
</shape>
</clip>
</item>
</layer-list>
\ No newline at end of file
app/src/main/res/drawable/bg_appbar.xml
deleted
100644 → 0
View file @
2eb00187
<?xml version="1.0" encoding="utf-8"?>
<layer-list
xmlns:android=
"http://schemas.android.com/apk/res/android"
>
<item>
<shape
android:shape=
"rectangle"
>
<solid
android:color=
"@color/defColorSurfaceVariant"
/>
</shape>
</item>
<item
android:bottom=
"2dp"
>
<shape
android:shape=
"rectangle"
>
<solid
android:color=
"@color/defColorSurface"
/>
</shape>
</item>
</layer-list>
app/src/main/res/drawable/bg_divider_rounded_on_primary.xml
View file @
9a8a27db
...
...
@@ -3,5 +3,5 @@
android:shape=
"rectangle"
>
<size
android:height=
"4dp"
/>
<corners
android:radius=
"2dp"
/>
<solid
android:color=
"@
color/defColorOnPrimary
"
/>
<solid
android:color=
"@
android:color/black
"
/>
</shape>
app/src/main/res/drawable/bg_shadow.xml
View file @
9a8a27db
...
...
@@ -3,6 +3,6 @@
android:shape=
"rectangle"
>
<gradient
android:angle=
"270"
android:endColor=
"@
color/defColorSurfaceVariant
"
android:endColor=
"@
android:color/black
"
android:startColor=
"@android:color/transparent"
/>
</shape>
app/src/main/res/drawable/fast_scroll_thumb.xml
deleted
100644 → 0
View file @
2eb00187
<?xml version="1.0" encoding="utf-8"?>
<selector
xmlns:android=
"http://schemas.android.com/apk/res/android"
>
<item
android:state_pressed=
"true"
>
<shape
android:shape=
"rectangle"
>
<corners
android:radius=
"@dimen/r1"
/>
<solid
android:color=
"@color/defColorOnSurfaceVariant"
/>
<size
android:width=
"5dp"
android:height=
"5dp"
/>
</shape>
</item>
<item>
<shape
android:shape=
"rectangle"
>
<corners
android:radius=
"@dimen/r1"
/>
<solid
android:color=
"@color/defColorOnSurfaceVariant"
/>
<size
android:width=
"5dp"
android:height=
"5dp"
/>
</shape>
</item>
</selector>
app/src/main/res/drawable/fast_scroll_track.xml
deleted
100644 → 0
View file @
2eb00187
<?xml version="1.0" encoding="utf-8"?>
<selector
xmlns:android=
"http://schemas.android.com/apk/res/android"
>
<item
android:state_pressed=
"true"
>
<shape
android:shape=
"rectangle"
>
<solid
android:color=
"@android:color/transparent"
/>
</shape>
</item>
<item>
<shape
android:shape=
"rectangle"
>
<solid
android:color=
"@android:color/transparent"
/>
</shape>
</item>
</selector>
\ No newline at end of file
app/src/main/res/drawable/progress_determinate.xml
deleted
100644 → 0
View file @
2eb00187
<?xml version="1.0" encoding="utf-8"?>
<layer-list
xmlns:android=
"http://schemas.android.com/apk/res/android"
>
<item
android:id=
"@android:id/background"
>
<shape>
<solid
android:color=
"@android:color/transparent"
/>
</shape>
</item>
<item
android:id=
"@android:id/secondaryProgress"
>
<clip>
<shape>
<solid
android:color=
"@color/defColorSecondary"
/>
</shape>
</clip>
</item>
<item
android:id=
"@android:id/progress"
>
<clip>
<shape>
<solid
android:color=
"@color/defColorPrimary"
/>
</shape>
</clip>
</item>
</layer-list>
app/src/main/res/layout/activity_main_md2.xml
View file @
9a8a27db
...
...
@@ -43,6 +43,12 @@
tools:layout_marginTop=
"24dp"
tools:title=
"Home"
/>
<View
gone=
"@{android.os.Build.VERSION.SDK_INT >= 21}"
android:layout_width=
"match_parent"
android:layout_height=
"2dp"
android:background=
"?colorSurfaceVariant"
/>
</com.google.android.material.appbar.AppBarLayout>
<!--
...
...
app/src/main/res/layout/fragment_safetynet_md2.xml
View file @
9a8a27db
...
...
@@ -87,12 +87,13 @@
app:layout_constraintTop_toTopOf=
"parent"
tools:text=
"@string/safetynet_attest_success"
/>
<View
<
Image
View
android:id=
"@+id/safetynet_divider"
android:layout_width=
"50dp"
android:layout_height=
"4dp"
android:layout_marginTop=
"@dimen/l2"
android:background=
"@drawable/bg_divider_rounded_on_primary"
app:srcCompat=
"@drawable/bg_divider_rounded_on_primary"
app:tint=
"?colorOnPrimary"
app:layout_constraintEnd_toEndOf=
"parent"
app:layout_constraintStart_toStartOf=
"parent"
app:layout_constraintTop_toBottomOf=
"@+id/safetynet_title"
/>
...
...
app/src/main/res/layout/include_module_filter.xml
View file @
9a8a27db
...
...
@@ -35,11 +35,6 @@
android:orientation=
"vertical"
android:paddingStart=
"@dimen/l1"
android:paddingTop=
"@{viewModel.insets.top + (int) @dimen/internal_action_bar_size + (int) @dimen/l1}"
app:fastScrollEnabled=
"true"
app:fastScrollHorizontalThumbDrawable=
"@drawable/fast_scroll_thumb"
app:fastScrollHorizontalTrackDrawable=
"@drawable/fast_scroll_track"
app:fastScrollVerticalThumbDrawable=
"@drawable/fast_scroll_thumb"
app:fastScrollVerticalTrackDrawable=
"@drawable/fast_scroll_track"
app:layoutManager=
"androidx.recyclerview.widget.LinearLayoutManager"
app:layout_constrainedHeight=
"true"
app:layout_constraintBottom_toTopOf=
"@+id/module_filter_title_search"
...
...
@@ -48,10 +43,11 @@
app:spanCount=
"2"
tools:listitem=
"@layout/item_repo_md2"
/>
<View
<
Image
View
android:layout_width=
"match_parent"
android:layout_height=
"@dimen/l_50"
android:background=
"@drawable/bg_shadow"
app:srcCompat=
"@drawable/bg_shadow"
app:tint=
"?colorSurfaceVariant"
app:layout_constraintBottom_toBottomOf=
"@+id/module_filter_list"
/>
<TextView
...
...
app/src/main/res/layout/item_hide_md2.xml
View file @
9a8a27db
...
...
@@ -107,6 +107,7 @@
style=
"@style/WidgetFoundation.ProgressBar"
android:layout_width=
"match_parent"
android:layout_gravity=
"top"
gone=
"@{item.checkedPercent == 0}"
android:progress=
"@{item.checkedPercent}"
/>
</com.google.android.material.card.MaterialCardView>
...
...
app/src/main/res/values/styles_md2_impl.xml
View file @
9a8a27db
<?xml version="1.0" encoding="utf-8"?>
<resources>
<style
name=
"WidgetFoundation.Appbar"
parent=
"Widget.MaterialComponents.AppBarLayout.Surface"
>
<item
name=
"elevation"
>
0dp
</item>
<item
name=
"android:background"
>
@drawable/bg_appbar
</item>
</style>
<style
name=
"WidgetFoundation.Appbar"
parent=
"Widget.MaterialComponents.AppBarLayout.Surface"
/>
<style
name=
"WidgetFoundation.Toolbar"
parent=
"Widget.MaterialComponents.Toolbar.Surface"
>
<item
name=
"titleTextAppearance"
>
@style/AppearanceFoundation.Title
</item>
...
...
@@ -169,7 +166,6 @@
<style
name=
"WidgetFoundation.ProgressBar"
parent=
"Widget.AppCompat.ProgressBar.Horizontal"
>
<item
name=
"android:indeterminate"
>
false
</item>
<item
name=
"android:layout_height"
>
4dp
</item>
<item
name=
"android:progressDrawable"
>
@drawable/progress_determinate
</item>
</style>
<style
name=
"WidgetFoundation.ProgressBar.Indeterminate"
parent=
"Widget.AppCompat.ProgressBar.Horizontal"
>
...
...
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