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
512f533a
Commit
512f533a
authored
Oct 18, 2019
by
Viktor De Pasquale
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Added hide fragment for future use
parent
96ef9cdb
Show whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
153 additions
and
9 deletions
+153
-9
RedesignModule.kt
app/src/main/java/com/topjohnwu/magisk/di/RedesignModule.kt
+2
-0
Navigation.kt
.../java/com/topjohnwu/magisk/model/navigation/Navigation.kt
+7
-1
MainActivity.kt
...c/main/java/com/topjohnwu/magisk/redesign/MainActivity.kt
+27
-3
CompatView.kt
...n/java/com/topjohnwu/magisk/redesign/compat/CompatView.kt
+1
-1
HideFragment.kt
...n/java/com/topjohnwu/magisk/redesign/hide/HideFragment.kt
+20
-0
HideViewModel.kt
.../java/com/topjohnwu/magisk/redesign/hide/HideViewModel.kt
+5
-0
SuperuserFragment.kt
.../topjohnwu/magisk/redesign/superuser/SuperuserFragment.kt
+3
-0
SuperuserViewModel.kt
...topjohnwu/magisk/redesign/superuser/SuperuserViewModel.kt
+6
-1
fragment_hide_md2.xml
app/src/main/res/layout/fragment_hide_md2.xml
+23
-0
fragment_superuser_md2.xml
app/src/main/res/layout/fragment_superuser_md2.xml
+59
-3
No files found.
app/src/main/java/com/topjohnwu/magisk/di/RedesignModule.kt
View file @
512f533a
...
...
@@ -2,6 +2,7 @@ package com.topjohnwu.magisk.di
import
com.topjohnwu.magisk.redesign.MainViewModel
import
com.topjohnwu.magisk.redesign.flash.FlashViewModel
import
com.topjohnwu.magisk.redesign.hide.HideViewModel
import
com.topjohnwu.magisk.redesign.home.HomeViewModel
import
com.topjohnwu.magisk.redesign.log.LogViewModel
import
com.topjohnwu.magisk.redesign.module.ModuleViewModel
...
...
@@ -15,6 +16,7 @@ import org.koin.dsl.module
val
redesignModule
=
module
{
viewModel
{
FlashViewModel
()
}
viewModel
{
HideViewModel
()
}
viewModel
{
HomeViewModel
(
get
())
}
viewModel
{
LogViewModel
()
}
viewModel
{
ModuleViewModel
()
}
...
...
app/src/main/java/com/topjohnwu/magisk/model/navigation/Navigation.kt
View file @
512f533a
...
...
@@ -15,6 +15,7 @@ import com.topjohnwu.magisk.ui.module.ReposFragment
import
com.topjohnwu.magisk.ui.settings.SettingsFragment
import
com.topjohnwu.magisk.ui.superuser.SuperuserFragment
import
com.topjohnwu.magisk.redesign.MainActivity
as
RedesignActivity
import
com.topjohnwu.magisk.redesign.hide.HideFragment
as
RedesignHideFragment
import
com.topjohnwu.magisk.redesign.home.HomeFragment
as
RedesignHomeFragment
import
com.topjohnwu.magisk.redesign.log.LogFragment
as
RedesignLogFragment
import
com.topjohnwu.magisk.redesign.module.ModuleFragment
as
RedesignModulesFragment
...
...
@@ -61,7 +62,12 @@ object Navigation {
}
fun
hide
()
=
MagiskNavigationEvent
{
navDirections
{
destination
=
MagiskHideFragment
::
class
}
navDirections
{
destination
=
when
{
Config
.
redesign
->
RedesignHideFragment
::
class
else
->
MagiskHideFragment
::
class
}
}
}
fun
log
()
=
MagiskNavigationEvent
{
...
...
app/src/main/java/com/topjohnwu/magisk/redesign/MainActivity.kt
View file @
512f533a
...
...
@@ -2,11 +2,15 @@ package com.topjohnwu.magisk.redesign
import
android.graphics.Insets
import
android.os.Bundle
import
android.view.MenuItem
import
android.view.ViewGroup
import
android.view.ViewTreeObserver
import
androidx.coordinatorlayout.widget.CoordinatorLayout
import
androidx.core.view.isVisible
import
androidx.core.view.setPadding
import
androidx.core.view.updateLayoutParams
import
androidx.fragment.app.Fragment
import
androidx.interpolator.view.animation.FastOutSlowInInterpolator
import
com.google.android.material.card.MaterialCardView
import
com.ncapdevi.fragnav.FragNavController
import
com.topjohnwu.magisk.Const
...
...
@@ -92,6 +96,14 @@ open class MainActivity : CompatActivity<MainViewModel, ActivityMainMd2Binding>(
super
.
onDestroy
()
}
override
fun
onOptionsItemSelected
(
item
:
MenuItem
):
Boolean
{
when
(
item
.
itemId
)
{
android
.
R
.
id
.
home
->
onBackPressed
()
else
->
return
super
.
onOptionsItemSelected
(
item
)
}
return
true
}
override
fun
onTabTransaction
(
fragment
:
Fragment
?,
index
:
Int
)
{
setDisplayHomeAsUpEnabled
(
false
)
}
...
...
@@ -99,9 +111,21 @@ open class MainActivity : CompatActivity<MainViewModel, ActivityMainMd2Binding>(
override
fun
onFragmentTransaction
(
fragment
:
Fragment
?,
transactionType
:
FragNavController
.
TransactionType
)
=
when
(
transactionType
)
{
FragNavController
.
TransactionType
.
PUSH
->
setDisplayHomeAsUpEnabled
(!
navigation
.
isRoot
)
else
->
Unit
//dunno might be useful
)
{
setDisplayHomeAsUpEnabled
(!
navigation
.
isRoot
)
val
lapam
=
binding
.
mainBottomBar
.
layoutParams
as
ViewGroup
.
MarginLayoutParams
val
height
=
binding
.
mainBottomBar
.
measuredHeight
val
verticalMargin
=
lapam
.
let
{
it
.
topMargin
+
it
.
bottomMargin
}
val
maxTranslation
=
height
+
verticalMargin
val
translation
=
if
(
navigation
.
isRoot
)
0
else
maxTranslation
binding
.
mainBottomBar
.
animate
()
.
translationY
(
translation
.
toFloat
())
.
setInterpolator
(
FastOutSlowInInterpolator
())
.
withStartAction
{
if
(
translation
==
0
)
binding
.
mainBottomBar
.
isVisible
=
true
}
.
withEndAction
{
if
(
translation
>
0
)
binding
.
mainBottomBar
.
isVisible
=
false
}
.
start
()
}
override
fun
peekSystemWindowInsets
(
insets
:
Insets
)
{
...
...
app/src/main/java/com/topjohnwu/magisk/redesign/compat/CompatView.kt
View file @
512f533a
...
...
@@ -10,6 +10,6 @@ internal interface CompatView<ViewModel : CompatViewModel> {
val
navigation
:
CompatNavigationDelegate
<*>?
fun
peekSystemWindowInsets
(
insets
:
Insets
)
=
Unit
fun
consumeSystemWindowInsets
(
insets
:
Insets
)
=
Insets
.
NONE
fun
consumeSystemWindowInsets
(
insets
:
Insets
)
:
Insets
?
=
null
}
\ No newline at end of file
app/src/main/java/com/topjohnwu/magisk/redesign/hide/HideFragment.kt
0 → 100644
View file @
512f533a
package
com.topjohnwu.magisk.redesign.hide
import
android.content.Context
import
com.topjohnwu.magisk.R
import
com.topjohnwu.magisk.databinding.FragmentHideMd2Binding
import
com.topjohnwu.magisk.redesign.compat.CompatFragment
import
org.koin.androidx.viewmodel.ext.android.viewModel
class
HideFragment
:
CompatFragment
<
HideViewModel
,
FragmentHideMd2Binding
>()
{
override
val
layoutRes
=
R
.
layout
.
fragment_hide_md2
override
val
viewModel
by
viewModel
<
HideViewModel
>()
override
fun
onAttach
(
context
:
Context
)
{
super
.
onAttach
(
context
)
activity
.
setTitle
(
R
.
string
.
magiskhide
)
}
}
\ No newline at end of file
app/src/main/java/com/topjohnwu/magisk/redesign/hide/HideViewModel.kt
0 → 100644
View file @
512f533a
package
com.topjohnwu.magisk.redesign.hide
import
com.topjohnwu.magisk.redesign.compat.CompatViewModel
class
HideViewModel
:
CompatViewModel
()
\ No newline at end of file
app/src/main/java/com/topjohnwu/magisk/redesign/superuser/SuperuserFragment.kt
View file @
512f533a
package
com.topjohnwu.magisk.redesign.superuser
import
android.graphics.Insets
import
com.topjohnwu.magisk.R
import
com.topjohnwu.magisk.databinding.FragmentSuperuserMd2Binding
import
com.topjohnwu.magisk.redesign.compat.CompatFragment
...
...
@@ -10,6 +11,8 @@ class SuperuserFragment : CompatFragment<SuperuserViewModel, FragmentSuperuserMd
override
val
layoutRes
=
R
.
layout
.
fragment_superuser_md2
override
val
viewModel
by
viewModel
<
SuperuserViewModel
>()
override
fun
consumeSystemWindowInsets
(
insets
:
Insets
)
=
insets
override
fun
onStart
()
{
super
.
onStart
()
...
...
app/src/main/java/com/topjohnwu/magisk/redesign/superuser/SuperuserViewModel.kt
View file @
512f533a
package
com.topjohnwu.magisk.redesign.superuser
import
com.topjohnwu.magisk.model.navigation.Navigation
import
com.topjohnwu.magisk.redesign.compat.CompatViewModel
class
SuperuserViewModel
:
CompatViewModel
()
\ No newline at end of file
class
SuperuserViewModel
:
CompatViewModel
()
{
fun
hidePressed
()
=
Navigation
.
hide
().
publish
()
}
\ No newline at end of file
app/src/main/res/layout/fragment_hide_md2.xml
0 → 100644
View file @
512f533a
<?xml version="1.0" encoding="utf-8"?>
<layout
xmlns:android=
"http://schemas.android.com/apk/res/android"
>
<data>
<variable
name=
"viewModel"
type=
"com.topjohnwu.magisk.redesign.hide.HideViewModel"
/>
</data>
<androidx.core.widget.NestedScrollView
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
android:fillViewport=
"true"
>
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
/>
</androidx.core.widget.NestedScrollView>
</layout>
\ No newline at end of file
app/src/main/res/layout/fragment_superuser_md2.xml
View file @
512f533a
<?xml version="1.0" encoding="utf-8"?>
<layout
xmlns:android=
"http://schemas.android.com/apk/res/android"
>
<layout
xmlns:android=
"http://schemas.android.com/apk/res/android"
xmlns:app=
"http://schemas.android.com/apk/res-auto"
xmlns:tools=
"http://schemas.android.com/tools"
>
<data>
...
...
@@ -12,11 +14,65 @@
<androidx.core.widget.NestedScrollView
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
android:fillViewport=
"true"
>
android:clipToPadding=
"false"
android:fillViewport=
"true"
android:paddingTop=
"@{viewModel.insets.top + (int) @dimen/internal_action_bar_size + (int) @dimen/l2}"
android:paddingBottom=
"@{viewModel.insets.bottom + (int) @dimen/l2}"
tools:layout_marginTop=
"24dp"
>
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
/>
android:layout_height=
"wrap_content"
>
<com.google.android.material.card.MaterialCardView
style=
"?styleCardNormal"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:layout_margin=
"@dimen/l1"
android:onClick=
"@{() -> viewModel.hidePressed()}"
app:layout_constraintTop_toTopOf=
"parent"
>
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
>
<androidx.appcompat.widget.AppCompatImageView
android:id=
"@+id/superuser_hide_icon"
style=
"?styleIconNormal"
android:background=
"@null"
app:layout_constraintBottom_toBottomOf=
"parent"
app:layout_constraintStart_toStartOf=
"parent"
app:layout_constraintTop_toTopOf=
"parent"
app:srcCompat=
"@drawable/ic_magiskhide"
/>
<androidx.appcompat.widget.AppCompatTextView
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
android:layout_marginStart=
"@dimen/l1"
android:layout_marginEnd=
"@dimen/l1"
android:text=
"@string/magiskhide"
android:textAppearance=
"?appearanceTextBodyNormal"
android:textStyle=
"bold"
app:layout_constraintBottom_toBottomOf=
"parent"
app:layout_constraintEnd_toStartOf=
"@+id/superuser_hide_icon_pointer"
app:layout_constraintStart_toEndOf=
"@+id/superuser_hide_icon"
app:layout_constraintTop_toTopOf=
"parent"
/>
<androidx.appcompat.widget.AppCompatImageView
android:id=
"@+id/superuser_hide_icon_pointer"
style=
"?styleIconNormal"
android:background=
"@null"
android:rotation=
"180"
app:layout_constraintBottom_toBottomOf=
"parent"
app:layout_constraintEnd_toEndOf=
"parent"
app:layout_constraintTop_toTopOf=
"parent"
app:srcCompat=
"@drawable/ic_back_md2"
/>
</androidx.constraintlayout.widget.ConstraintLayout>
</com.google.android.material.card.MaterialCardView>
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.core.widget.NestedScrollView>
...
...
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