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
17fb8f22
Commit
17fb8f22
authored
Oct 22, 2019
by
Viktor De Pasquale
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Added new magisk install flow
parent
fbfc4e72
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
13 changed files
with
333 additions
and
10 deletions
+333
-10
InstallFragment.kt
...n/java/com/topjohnwu/magisk/ui/install/InstallFragment.kt
+8
-0
InstallViewModel.kt
.../java/com/topjohnwu/magisk/ui/install/InstallViewModel.kt
+11
-1
DataBindingAdapters.kt
...in/java/com/topjohnwu/magisk/utils/DataBindingAdapters.kt
+6
-0
avd_circle_check_from_filled.xml
app/src/main/res/drawable/avd_circle_check_from_filled.xml
+27
-0
avd_circle_check_to_filled.xml
app/src/main/res/drawable/avd_circle_check_to_filled.xml
+27
-0
ic_check_circle_checked_md2.xml
app/src/main/res/drawable/ic_check_circle_checked_md2.xml
+10
-0
ic_check_circle_md2.xml
app/src/main/res/drawable/ic_check_circle_md2.xml
+25
-0
ic_check_circle_unchecked_md2.xml
app/src/main/res/drawable/ic_check_circle_unchecked_md2.xml
+10
-0
fragment_install_md2.xml
app/src/main/res/layout/fragment_install_md2.xml
+192
-4
include_install_options.xml
app/src/main/res/layout/include_install_options.xml
+4
-5
attrs.xml
app/src/main/res/values/attrs.xml
+3
-0
styles_md2.xml
app/src/main/res/values/styles_md2.xml
+2
-0
styles_md2_impl.xml
app/src/main/res/values/styles_md2_impl.xml
+8
-0
No files found.
app/src/main/java/com/topjohnwu/magisk/ui/install/InstallFragment.kt
View file @
17fb8f22
package
com.topjohnwu.magisk.ui.install
import
android.graphics.Insets
import
com.topjohnwu.magisk.R
import
com.topjohnwu.magisk.databinding.FragmentInstallMd2Binding
import
com.topjohnwu.magisk.redesign.compat.CompatFragment
...
...
@@ -10,4 +11,11 @@ class InstallFragment : CompatFragment<InstallViewModel, FragmentInstallMd2Bindi
override
val
layoutRes
=
R
.
layout
.
fragment_install_md2
override
val
viewModel
by
viewModel
<
InstallViewModel
>()
override
fun
consumeSystemWindowInsets
(
insets
:
Insets
)
=
insets
override
fun
onStart
()
{
super
.
onStart
()
requireActivity
().
setTitle
(
R
.
string
.
install
)
}
}
\ No newline at end of file
app/src/main/java/com/topjohnwu/magisk/ui/install/InstallViewModel.kt
View file @
17fb8f22
package
com.topjohnwu.magisk.ui.install
import
com.topjohnwu.magisk.redesign.compat.CompatViewModel
import
com.topjohnwu.magisk.utils.KObservableField
class
InstallViewModel
:
CompatViewModel
()
\ No newline at end of file
class
InstallViewModel
:
CompatViewModel
()
{
val
step
=
KObservableField
(
0
)
val
method
=
KObservableField
(-
1
)
fun
step
(
nextStep
:
Int
)
{
step
.
value
=
nextStep
}
}
\ No newline at end of file
app/src/main/java/com/topjohnwu/magisk/utils/DataBindingAdapters.kt
View file @
17fb8f22
...
...
@@ -28,6 +28,7 @@ import androidx.recyclerview.widget.LinearLayoutManager
import
androidx.recyclerview.widget.RecyclerView
import
androidx.viewpager.widget.ViewPager
import
com.google.android.material.button.MaterialButton
import
com.google.android.material.card.MaterialCardView
import
com.google.android.material.floatingactionbutton.FloatingActionButton
import
com.google.android.material.navigation.NavigationView
import
com.topjohnwu.magisk.R
...
...
@@ -383,4 +384,9 @@ fun View.rotationTo(value: Int) {
@BindingAdapter
(
"app:icon"
)
fun
MaterialButton
.
setIconRes
(
res
:
Int
)
{
setIconResource
(
res
)
}
@BindingAdapter
(
"cardElevation"
)
fun
MaterialCardView
.
setCardElevationBound
(
elevation
:
Float
)
{
cardElevation
=
elevation
}
\ No newline at end of file
app/src/main/res/drawable/avd_circle_check_from_filled.xml
0 → 100644
View file @
17fb8f22
<animated-vector
xmlns:android=
"http://schemas.android.com/apk/res/android"
xmlns:aapt=
"http://schemas.android.com/aapt"
>
<aapt:attr
name=
"android:drawable"
>
<vector
android:name=
"vector"
android:width=
"24dp"
android:height=
"24dp"
android:viewportWidth=
"24"
android:viewportHeight=
"24"
>
<path
android:name=
"path"
android:fillColor=
"#000000"
android:pathData=
"M 12 2 C 6.5 2 2 6.5 2 12 C 2 17.5 6.5 22 12 22 C 17.5 22 22 17.5 22 12 C 22 6.5 17.5 2 12 2 M 12 20 C 7.59 20 4 16.41 4 12 C 4 7.59 7.59 4 12 4 C 16.41 4 20 7.59 20 12 C 20 16.41 16.41 20 12 20 M 16.59 7.58 L 10 14.17 L 7.41 11.59 L 6 13 L 10 17 L 18 9 L 16.59 7.58 Z"
/>
</vector>
</aapt:attr>
<target
android:name=
"path"
>
<aapt:attr
name=
"android:animation"
>
<objectAnimator
android:duration=
"500"
android:interpolator=
"@android:interpolator/fast_out_slow_in"
android:propertyName=
"pathData"
android:valueFrom=
"M 12 2 C 9.217 2 6.689 3.152 4.872 5.004 C 3.098 6.811 2 9.283 2 12 C 2 14.744 3.12 17.24 4.927 19.052 C 6.74 20.87 9.244 22 12 22 C 13.911 22 15.701 21.457 17.224 20.517 C 18.628 19.651 19.804 18.448 20.638 17.024 C 21.503 15.545 22 13.828 22 12 C 22 10.2 21.518 8.507 20.677 7.044 C 19.755 5.441 18.402 4.114 16.779 3.224 C 15.357 2.444 13.728 2 12 2 M 12 20 C 7.59 20 4 16.41 4 12 C 4 7.59 7.59 4 12 4 C 16.41 4 20 7.59 20 12 C 20 16.41 16.41 20 12 20 M 6 13 L 10 17 L 18 9 L 16.59 7.58 L 16.59 7.58 L 10 14.17 L 7.41 11.59 L 6 13"
android:valueTo=
"M 12 2 C 9.349 2 6.804 3.054 4.929 4.929 C 3.054 6.804 2 9.349 2 12 C 2 14.651 3.054 17.196 4.929 19.071 C 6.804 20.946 9.349 22 12 22 C 13.755 22 15.48 21.538 17 20.66 C 18.52 19.783 19.783 18.52 20.66 17 C 21.538 15.48 22 13.755 22 12 C 22 10.245 21.538 8.52 20.66 7 C 19.783 5.48 18.52 4.217 17 3.34 C 15.48 2.462 13.755 2 12 2 M 12 20 C 7.59 20 4 16.41 4 12 C 4 7.59 7.59 4 12 4 C 16.41 4 20 7.59 20 12 C 20 16.41 16.41 20 12 20 M 7 13 L 7 13 L 17 13 L 17 11 L 17 11 L 7 11 L 7 11 L 7 11"
android:valueType=
"pathType"
/>
</aapt:attr>
</target>
</animated-vector>
app/src/main/res/drawable/avd_circle_check_to_filled.xml
0 → 100644
View file @
17fb8f22
<animated-vector
xmlns:android=
"http://schemas.android.com/apk/res/android"
xmlns:aapt=
"http://schemas.android.com/aapt"
>
<aapt:attr
name=
"android:drawable"
>
<vector
android:name=
"vector"
android:width=
"24dp"
android:height=
"24dp"
android:viewportWidth=
"24"
android:viewportHeight=
"24"
>
<path
android:name=
"path_1"
android:fillColor=
"#000000"
android:pathData=
"M 12 20 C 7.59 20 4 16.41 4 12 C 4 7.59 7.59 4 12 4 C 16.41 4 20 7.59 20 12 C 20 16.41 16.41 20 12 20 M 12 2 C 9.349 2 6.804 3.054 4.929 4.929 C 3.054 6.804 2 9.349 2 12 C 2 14.651 3.054 17.196 4.929 19.071 C 6.804 20.946 9.349 22 12 22 C 13.755 22 15.48 21.538 17 20.66 C 18.52 19.783 19.783 18.52 20.66 17 C 21.538 15.48 22 13.755 22 12 C 22 10.245 21.538 8.52 20.66 7 C 19.783 5.48 18.52 4.217 17 3.34 C 15.48 2.462 13.755 2 12 2 M 7 13 L 17 13 L 17 11 L 7 11"
/>
</vector>
</aapt:attr>
<target
android:name=
"path_1"
>
<aapt:attr
name=
"android:animation"
>
<objectAnimator
android:duration=
"500"
android:interpolator=
"@android:interpolator/fast_out_slow_in"
android:propertyName=
"pathData"
android:valueFrom=
"M 12 2 C 9.349 2 6.804 3.054 4.929 4.929 C 3.054 6.804 2 9.349 2 12 C 2 14.651 3.054 17.196 4.929 19.071 C 6.804 20.946 9.349 22 12 22 C 13.755 22 15.48 21.538 17 20.66 C 18.52 19.783 19.783 18.52 20.66 17 C 21.538 15.48 22 13.755 22 12 C 22 10.245 21.538 8.52 20.66 7 C 19.783 5.48 18.52 4.217 17 3.34 C 15.48 2.462 13.755 2 12 2 M 12 20 C 7.59 20 4 16.41 4 12 C 4 7.59 7.59 4 12 4 C 16.41 4 20 7.59 20 12 C 20 16.41 16.41 20 12 20 M 7 13 L 7 13 L 17 13 L 17 11 L 17 11 L 7 11 L 7 11 L 7 11"
android:valueTo=
"M 12 2 C 9.217 2 6.689 3.152 4.872 5.004 C 3.098 6.811 2 9.283 2 12 C 2 14.856 3.213 17.442 5.149 19.268 C 6.942 20.96 9.356 22 12 22 C 14.061 22 15.982 21.368 17.578 20.288 C 19.114 19.249 20.349 17.796 21.119 16.092 C 21.685 14.841 22 13.456 22 12 C 22 10.122 21.475 8.361 20.566 6.856 C 19.691 5.408 18.46 4.197 16.997 3.347 C 15.524 2.491 13.817 2 12 2 M 12 20 C 7.59 20 4 16.41 4 12 C 4 7.59 7.59 4 12 4 C 16.41 4 20 7.59 20 12 C 20 16.41 16.41 20 12 20 M 6 13 L 10 17 L 18 9 L 16.59 7.58 L 16.59 7.58 L 10 14.17 L 7.41 11.59 L 6 13"
android:valueType=
"pathType"
/>
</aapt:attr>
</target>
</animated-vector>
app/src/main/res/drawable/ic_check_circle_checked_md2.xml
0 → 100644
View file @
17fb8f22
<?xml version="1.0" encoding="utf-8"?>
<vector
xmlns:android=
"http://schemas.android.com/apk/res/android"
android:width=
"24dp"
android:height=
"24dp"
android:viewportWidth=
"24"
android:viewportHeight=
"24"
>
<path
android:fillColor=
"?colorOnSurface"
android:pathData=
"M12 2C6.5 2 2 6.5 2 12S6.5 22 12 22 22 17.5 22 12 17.5 2 12 2M12 20C7.59 20 4 16.41 4 12S7.59 4 12 4 20 7.59 20 12 16.41 20 12 20M16.59 7.58L10 14.17L7.41 11.59L6 13L10 17L18 9L16.59 7.58Z"
/>
</vector>
\ No newline at end of file
app/src/main/res/drawable/ic_check_circle_md2.xml
0 → 100644
View file @
17fb8f22
<?xml version="1.0" encoding="utf-8"?>
<animated-selector
xmlns:android=
"http://schemas.android.com/apk/res/android"
xmlns:tools=
"http://schemas.android.com/tools"
tools:ignore=
"NewApi"
>
<item
android:id=
"@+id/checked"
android:drawable=
"@drawable/ic_check_circle_checked_md2"
android:state_selected=
"true"
/>
<item
android:id=
"@+id/unchecked"
android:drawable=
"@drawable/ic_check_circle_unchecked_md2"
/>
<transition
android:drawable=
"@drawable/avd_circle_check_from_filled"
android:fromId=
"@+id/checked"
android:toId=
"@+id/unchecked"
/>
<transition
android:drawable=
"@drawable/avd_circle_check_to_filled"
android:fromId=
"@+id/unchecked"
android:toId=
"@id/checked"
/>
</animated-selector>
\ No newline at end of file
app/src/main/res/drawable/ic_check_circle_unchecked_md2.xml
0 → 100644
View file @
17fb8f22
<?xml version="1.0" encoding="utf-8"?>
<vector
xmlns:android=
"http://schemas.android.com/apk/res/android"
android:width=
"24dp"
android:height=
"24dp"
android:viewportWidth=
"24"
android:viewportHeight=
"24"
>
<path
android:fillColor=
"?colorOnSurface"
android:pathData=
"M12,20C7.59,20 4,16.41 4,12C4,7.59 7.59,4 12,4C16.41,4 20,7.59 20,12C20,16.41 16.41,20 12,20M12,2A10,10 0 0,0 2,12A10,10 0 0,0 12,22A10,10 0 0,0 22,12A10,10 0 0,0 12,2M7,13H17V11H7"
/>
</vector>
\ No newline at end of file
app/src/main/res/layout/fragment_install_md2.xml
View file @
17fb8f22
This diff is collapsed.
Click to expand it.
app/src/main/res/layout/include_install_options.xml
View file @
17fb8f22
...
...
@@ -12,8 +12,7 @@
<ScrollView
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:clipToPadding=
"false"
android:paddingTop=
"@dimen/l1"
>
android:clipToPadding=
"false"
>
<LinearLayout
android:layout_width=
"match_parent"
...
...
@@ -25,7 +24,7 @@
style=
"?styleCheckboxNormal"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_gravity=
"
center
"
android:layout_gravity=
"
start|center_vertical
"
android:checked=
"@={Info.keepVerity}"
android:gravity=
"center"
android:text=
"@string/keep_dm_verity"
...
...
@@ -35,7 +34,7 @@
style=
"?styleCheckboxNormal"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_gravity=
"
center
"
android:layout_gravity=
"
start|center_vertical
"
android:checked=
"@={Info.keepEnc}"
android:gravity=
"center"
android:text=
"@string/keep_force_encryption"
...
...
@@ -45,7 +44,7 @@
style=
"?styleCheckboxNormal"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_gravity=
"
center
"
android:layout_gravity=
"
start|center_vertical
"
android:checked=
"@={Info.recovery}"
android:gravity=
"center"
android:text=
"@string/recovery_mode"
...
...
app/src/main/res/values/attrs.xml
View file @
17fb8f22
...
...
@@ -44,6 +44,9 @@
<!--Checkbox-->
<attr
name=
"styleCheckboxNormal"
format=
"reference"
/>
<!--RadioButton-->
<attr
name=
"styleRadioNormal"
format=
"reference"
/>
<!--Progress-->
<attr
name=
"styleProgressDeterminate"
format=
"reference"
/>
<attr
name=
"styleProgressIndeterminate"
format=
"reference"
/>
...
...
app/src/main/res/values/styles_md2.xml
View file @
17fb8f22
...
...
@@ -53,6 +53,8 @@
<item
name=
"styleCheckboxNormal"
>
@style/WidgetFoundation.Checkbox
</item>
<item
name=
"styleRadioNormal"
>
@style/WidgetFoundation.RadioButton
</item>
<item
name=
"styleProgressDeterminate"
>
@style/WidgetFoundation.ProgressBar
</item>
<item
name=
"styleProgressIndeterminate"
>
@style/WidgetFoundation.ProgressBar.Indeterminate
</item>
...
...
app/src/main/res/values/styles_md2_impl.xml
View file @
17fb8f22
...
...
@@ -138,6 +138,14 @@ variant. Make sure to use style referenced by attribute defined it attrs.xml.
<item
name=
"tint"
>
?colorPrimary
</item>
</style>
<style
name=
"WidgetFoundation.RadioButton"
parent=
"Widget.AppCompat.CompoundButton.RadioButton"
>
<item
name=
"android:textColor"
>
?attr/colorOnSurface
</item>
<item
name=
"android:textAppearance"
>
?appearanceTextBodyNormal
</item>
<item
name=
"android:paddingStart"
>
@dimen/l1
</item>
<item
name=
"android:paddingEnd"
>
@dimen/l1
</item>
<item
name=
"tint"
>
?colorPrimary
</item>
</style>
<style
name=
"WidgetFoundation.ProgressBar"
parent=
"Widget.AppCompat.ProgressBar.Horizontal"
>
<item
name=
"android:indeterminate"
>
false
</item>
<item
name=
"android:layout_height"
>
4dp
</item>
...
...
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