MarcoBuster/Magisk
1
1
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Make things run on API 17

Browse Source
This commit is contained in:
topjohnwu 2020-01-15 00:05:44 +08:00
parent de853a2651
commit 433ae89e53
18 changed files with 130 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/build.gradle
View File

@ -102,7 +102,9 @@ dependencies {
implementation "com.squareup.retrofit2:adapter-rxjava2:${vRetrofit}"
def vOkHttp = '3.12.7'
implementation "com.squareup.okhttp3:okhttp:${vOkHttp}"
implementation("com.squareup.okhttp3:okhttp:${vOkHttp}") {
force = true
}
implementation "com.squareup.okhttp3:logging-interceptor:${vOkHttp}"
def vMoshi = '1.9.2'

2
app/src/main/java/com/topjohnwu/magisk/ui/base/BaseUIActivity.kt
View File

@ -15,7 +15,7 @@ abstract class BaseUIActivity<ViewModel : BaseViewModel, Binding : ViewDataBindi
protected lateinit var binding: Binding
protected abstract val layoutRes: Int
protected abstract val viewModel: ViewModel
abstract val viewModel: ViewModel
protected open val themeRes: Int = R.style.MagiskTheme
open val snackbarView get() = binding.root

2
app/src/main/java/com/topjohnwu/magisk/ui/base/BaseUIFragment.kt
View File

@ -17,7 +17,7 @@ abstract class BaseUIFragment<ViewModel : BaseViewModel, Binding : ViewDataBindi
protected val activity get() = requireActivity() as BaseUIActivity<*, *>
protected lateinit var binding: Binding
protected abstract val layoutRes: Int
protected abstract val viewModel: ViewModel
abstract val viewModel: ViewModel
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)

15
app/src/main/res/drawable-v21/bg_appbar.xml Normal file
View File

@ -0,0 +1,15 @@
<?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>

8
app/src/main/res/drawable-v21/bg_card.xml Normal file
View File

@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<gradient
android:angle="45"
android:endColor="?colorSurface"
android:startColor="?colorSurfaceVariant" />
</shape>

7
app/src/main/res/drawable-v21/bg_divider_rounded_on_primary.xml Normal file
View File

@ -0,0 +1,7 @@
<?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>

8
app/src/main/res/drawable-v21/bg_shadow.xml Normal file
View File

@ -0,0 +1,8 @@
<?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>

19
app/src/main/res/drawable-v21/fast_scroll_thumb.xml Normal file
View File

@ -0,0 +1,19 @@
<?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>

26
app/src/main/res/drawable-v21/progress_determinate.xml Normal file
View File

@ -0,0 +1,26 @@
<?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>

4
app/src/main/res/drawable/bg_appbar.xml
View File

@ -2,13 +2,13 @@
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item>
<shape android:shape="rectangle">
<solid android:color="?colorSurfaceVariant" />
<solid android:color="@color/defColorSurfaceVariant" />
</shape>
</item>
<item android:bottom="2dp">
<shape android:shape="rectangle">
<solid android:color="?colorSurface" />
<solid android:color="@color/defColorSurface" />
</shape>
</item>

6
app/src/main/res/drawable/bg_card.xml
View File

@ -3,6 +3,6 @@
android:shape="rectangle">
<gradient
android:angle="45"
android:endColor="?colorSurface"
android:startColor="?colorSurfaceVariant" />
</shape>
android:endColor="@color/defColorSurface"
android:startColor="@color/defColorSurfaceVariant" />
</shape>

4
app/src/main/res/drawable/bg_divider_rounded_on_primary.xml
View File

@ -3,5 +3,5 @@
android:shape="rectangle">
<size android:height="4dp" />
<corners android:radius="2dp" />
<solid android:color="?colorOnPrimary" />
</shape>
<solid android:color="@color/defColorOnPrimary" />
</shape>

4
app/src/main/res/drawable/bg_selectable.xml
View File

@ -3,7 +3,7 @@
<item android:state_pressed="true">
<shape android:shape="rectangle">
<corners android:radius="@dimen/r1" />
<solid android:color="?colorPrimaryVariant" />
<solid android:color="@color/defColorPrimaryVariant" />
</shape>
</item>
<item>
@ -11,4 +11,4 @@
<solid android:color="@android:color/transparent" />
</shape>
</item>
</selector>
</selector>

4
app/src/main/res/drawable/bg_selectable_borderless.xml
View File

@ -3,7 +3,7 @@
<item android:state_pressed="true">
<shape android:shape="rectangle">
<corners android:radius="@dimen/r1" />
<solid android:color="?colorPrimaryVariant" />
<solid android:color="@color/defColorPrimaryVariant" />
</shape>
</item>
<item>
@ -11,4 +11,4 @@
<solid android:color="@android:color/transparent" />
</shape>
</item>
</selector>
</selector>

4
app/src/main/res/drawable/bg_shadow.xml
View File

@ -3,6 +3,6 @@
android:shape="rectangle">
<gradient
android:angle="270"
android:endColor="?colorSurfaceVariant"
android:endColor="@color/defColorSurfaceVariant"
android:startColor="@android:color/transparent" />
</shape>
</shape>

4
app/src/main/res/drawable/fast_scroll_thumb.xml
View File

@ -4,14 +4,14 @@
<item android:state_pressed="true">
<shape android:shape="rectangle">
<corners android:radius="@dimen/r1" />
<solid android:color="?colorOnSurfaceVariant" />
<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="?colorOnSurfaceVariant" />
<solid android:color="@color/defColorOnSurfaceVariant" />
<size android:width="5dp" android:height="5dp" />
</shape>
</item>

6
app/src/main/res/drawable/progress_determinate.xml
View File

@ -10,7 +10,7 @@
<item android:id="@android:id/secondaryProgress">
<clip>
<shape>
<solid android:color="?colorSecondary" />
<solid android:color="@color/defColorSecondary" />
</shape>
</clip>
</item>
@ -18,9 +18,9 @@
<item android:id="@android:id/progress">
<clip>
<shape>
<solid android:color="?colorPrimary" />
<solid android:color="@color/defColorPrimary" />
</shape>
</clip>
</item>
</layer-list>
</layer-list>

24
app/src/main/res/values/default_color.xml Normal file
View File

@ -0,0 +1,24 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Pre Android 5.0 does not support accessing colors from attributes in drawables
These values are from the default theme (Piplup light)
-->
<resources>
<color name="defColorPrimary">#4EAFF5</color>
<color name="defColorPrimaryVariant">#804EAFF5</color>
<color name="defColorSecondary">#3E78AF</color>
<color name="defColorSecondaryVariant">#803E78AF</color>
<color name="defColorSurface">#F9F9F9</color>
<color name="defColorSurfaceVariant">#E8E8E8</color>
<color name="defColorSurfaceSurfaceVariant">@color/defColorOnSurface</color>
<color name="defColorOnPrimary">#F9F9F9</color>
<color name="defColorOnPrimaryVariant">#D9E6E6E6</color>
<color name="defColorOnSecondary">#F9F9F9</color>
<color name="defColorOnBackground">@color/defColorOnSurface</color>
<color name="defColorError">#CC0047</color>
<color name="defColorOnError">#F9F9F9</color>
<color name="defColorOnSurface">#444444</color>
<color name="defColorOnSurfaceVariant">#80444444</color>
<color name="defColorDisabled">#808080</color>
<color name="defColorDisabledVariant">#66808080</color>
</resources>