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
9a16ab1b
Commit
9a16ab1b
authored
Sep 17, 2020
by
topjohnwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Always show install button
Fix #3172
parent
9e5cb6cb
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
83 additions
and
94 deletions
+83
-94
HomeFragment.kt
...rc/main/java/com/topjohnwu/magisk/ui/home/HomeFragment.kt
+2
-2
HomeViewModel.kt
...c/main/java/com/topjohnwu/magisk/ui/home/HomeViewModel.kt
+7
-2
ModuleViewModel.kt
...in/java/com/topjohnwu/magisk/ui/module/ModuleViewModel.kt
+15
-3
activity_main_md2.xml
app/src/main/res/layout/activity_main_md2.xml
+13
-33
include_home_magisk.xml
app/src/main/res/layout/include_home_magisk.xml
+23
-27
include_home_manager.xml
app/src/main/res/layout/include_home_manager.xml
+23
-27
No files found.
app/src/main/java/com/topjohnwu/magisk/ui/home/HomeFragment.kt
View file @
9a16ab1b
...
...
@@ -31,11 +31,11 @@ class HomeFragment : BaseUIFragment<HomeViewModel, FragmentHomeMd2Binding>() {
// Set barrier reference IDs in code, since resource IDs will be stripped in release mode
binding
.
homeMagiskWrapper
.
homeMagiskTitleBarrier
.
referencedIds
=
intArrayOf
(
R
.
id
.
home_magisk_
acti
on
,
R
.
id
.
home_magisk_title
,
R
.
id
.
home_magisk_icon
)
intArrayOf
(
R
.
id
.
home_magisk_
butt
on
,
R
.
id
.
home_magisk_title
,
R
.
id
.
home_magisk_icon
)
binding
.
homeMagiskWrapper
.
homeMagiskBarrier
.
referencedIds
=
intArrayOf
(
R
.
id
.
home_magisk_latest_version
,
R
.
id
.
home_magisk_installed_version
)
binding
.
homeManagerWrapper
.
homeManagerTitleBarrier
.
referencedIds
=
intArrayOf
(
R
.
id
.
home_manager_
acti
on
,
R
.
id
.
home_manager_title
,
R
.
id
.
home_manager_icon
)
intArrayOf
(
R
.
id
.
home_manager_
butt
on
,
R
.
id
.
home_manager_title
,
R
.
id
.
home_manager_icon
)
return
binding
.
root
}
...
...
app/src/main/java/com/topjohnwu/magisk/ui/home/HomeViewModel.kt
View file @
9a16ab1b
...
...
@@ -14,6 +14,7 @@ import com.topjohnwu.magisk.core.model.MagiskJson
import
com.topjohnwu.magisk.core.model.ManagerJson
import
com.topjohnwu.magisk.data.repository.MagiskRepository
import
com.topjohnwu.magisk.events.OpenInappLinkEvent
import
com.topjohnwu.magisk.events.SnackbarEvent
import
com.topjohnwu.magisk.events.dialog.EnvFixDialog
import
com.topjohnwu.magisk.events.dialog.ManagerInstallDialog
import
com.topjohnwu.magisk.events.dialog.UninstallDialog
...
...
@@ -126,10 +127,14 @@ class HomeViewModel(
fun
onDeletePressed
()
=
UninstallDialog
().
publish
()
fun
onManagerPressed
()
=
ManagerInstallDialog
().
publish
()
fun
onManagerPressed
()
=
if
(
isConnected
.
get
())
ManagerInstallDialog
().
publish
()
else
SnackbarEvent
(
R
.
string
.
no_connection
).
publish
()
fun
onMagiskPressed
()
=
withExternalRW
{
fun
onMagiskPressed
()
=
if
(
isConnected
.
get
())
withExternalRW
{
HomeFragmentDirections
.
actionHomeFragmentToInstallFragment
().
publish
()
}
else
{
SnackbarEvent
(
R
.
string
.
no_connection
).
publish
()
}
fun
onSafetyNetPressed
()
=
...
...
app/src/main/java/com/topjohnwu/magisk/ui/module/ModuleViewModel.kt
View file @
9a16ab1b
...
...
@@ -15,6 +15,7 @@ import com.topjohnwu.magisk.data.database.RepoByUpdatedDao
import
com.topjohnwu.magisk.databinding.RvItem
import
com.topjohnwu.magisk.events.InstallExternalModuleEvent
import
com.topjohnwu.magisk.events.OpenChangelogEvent
import
com.topjohnwu.magisk.events.SnackbarEvent
import
com.topjohnwu.magisk.events.dialog.ModuleInstallDialog
import
com.topjohnwu.magisk.ktx.addOnListChangedCallback
import
com.topjohnwu.magisk.ktx.reboot
...
...
@@ -300,16 +301,27 @@ class ModuleViewModel(
else
->
Unit
}
fun
downloadPressed
(
item
:
RepoItem
)
=
withExternalRW
{
fun
downloadPressed
(
item
:
RepoItem
)
=
if
(
isConnected
.
get
())
withExternalRW
{
ModuleInstallDialog
(
item
.
item
).
publish
()
}
else
{
SnackbarEvent
(
R
.
string
.
no_connection
).
publish
()
}
fun
installPressed
()
=
withExternalRW
{
InstallExternalModuleEvent
().
publish
()
}
fun
infoPressed
(
item
:
RepoItem
)
=
OpenChangelogEvent
(
item
.
item
).
publish
()
fun
infoPressed
(
item
:
RepoItem
)
=
if
(
isConnected
.
get
())
OpenChangelogEvent
(
item
.
item
).
publish
()
else
SnackbarEvent
(
R
.
string
.
no_connection
).
publish
()
fun
infoPressed
(
item
:
ModuleItem
)
{
OpenChangelogEvent
(
item
.
repo
?:
return
).
publish
()
item
.
repo
?.
also
{
if
(
isConnected
.
get
())
OpenChangelogEvent
(
it
).
publish
()
else
SnackbarEvent
(
R
.
string
.
no_connection
).
publish
()
}
?:
return
}
}
app/src/main/res/layout/activity_main_md2.xml
View file @
9a16ab1b
...
...
@@ -73,12 +73,6 @@
android:layout_marginBottom=
"@{(int) @dimen/l1 + viewModel.insets.bottom}"
tools:layout_marginBottom=
"64dp"
>
<LinearLayout
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:animateLayoutChanges=
"true"
android:orientation=
"vertical"
>
<com.google.android.material.bottomnavigation.BottomNavigationView
android:id=
"@+id/main_navigation"
android:layout_width=
"match_parent"
...
...
@@ -95,20 +89,6 @@
app:labelVisibilityMode=
"unlabeled"
app:menu=
"@menu/menu_bottom_nav"
/>
<TextView
gone=
"@{viewModel.isConnected}"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:gravity=
"center"
android:paddingBottom=
"@dimen/l_50"
android:text=
"@string/no_connection"
android:textAppearance=
"@style/AppearanceFoundation.Caption"
android:textColor=
"?colorError"
android:visibility=
"gone"
tools:visibility=
"visible"
/>
</LinearLayout>
</com.google.android.material.card.MaterialCardView>
</androidx.coordinatorlayout.widget.CoordinatorLayout>
...
...
app/src/main/res/layout/include_home_magisk.xml
View file @
9a16ab1b
...
...
@@ -46,47 +46,43 @@
android:textAppearance=
"@style/AppearanceFoundation.Title"
android:textColor=
"?colorPrimary"
app:layout_constraintBottom_toBottomOf=
"@+id/home_magisk_icon"
app:layout_constraintEnd_toStartOf=
"@+id/home_magisk_
acti
on"
app:layout_constraintEnd_toStartOf=
"@+id/home_magisk_
butt
on"
app:layout_constraintStart_toEndOf=
"@+id/home_magisk_icon"
app:layout_constraintTop_toTopOf=
"@+id/home_magisk_icon"
/>
<FrameLayout
android:id=
"@+id/home_magisk_action"
invisible=
"@{viewModel.stateMagisk == MagiskState.LOADING || !viewModel.isConnected}"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
app:layout_constraintBottom_toBottomOf=
"@+id/home_magisk_title"
app:layout_constraintEnd_toEndOf=
"parent"
app:layout_constraintTop_toTopOf=
"@+id/home_magisk_title"
>
<Button
android:id=
"@+id/home_magisk_button"
style=
"@style/WidgetFoundation.Button"
gon
e=
"@{viewModel.stateMagisk != MagiskState.OBSOLETE}"
invisibl
e=
"@{viewModel.stateMagisk != MagiskState.OBSOLETE}"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:onClick=
"@{() -> viewModel.onMagiskPressed()}"
android:text=
"@string/update"
android:textAllCaps=
"false"
app:icon=
"@drawable/ic_update_md2"
/>
app:icon=
"@drawable/ic_update_md2"
app:layout_constraintBottom_toBottomOf=
"@+id/home_magisk_title"
app:layout_constraintEnd_toEndOf=
"parent"
app:layout_constraintTop_toTopOf=
"@+id/home_magisk_title"
/>
<Button
style=
"@style/WidgetFoundation.Button.Text"
gon
e=
"@{viewModel.stateMagisk == MagiskState.OBSOLETE}"
invisibl
e=
"@{viewModel.stateMagisk == MagiskState.OBSOLETE}"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:onClick=
"@{() -> viewModel.onMagiskPressed()}"
android:text=
"@string/install"
android:textAllCaps=
"false"
app:icon=
"@drawable/ic_install"
/>
</FrameLayout>
app:icon=
"@drawable/ic_install"
app:layout_constraintBottom_toBottomOf=
"@+id/home_magisk_title"
app:layout_constraintEnd_toEndOf=
"parent"
app:layout_constraintTop_toTopOf=
"@+id/home_magisk_title"
/>
<androidx.constraintlayout.widget.Barrier
android:id=
"@+id/home_magisk_title_barrier"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
app:barrierDirection=
"bottom"
tools:constraint_referenced_ids=
"home_magisk_
acti
on,home_magisk_title,home_magisk_icon"
/>
tools:constraint_referenced_ids=
"home_magisk_
butt
on,home_magisk_title,home_magisk_icon"
/>
<HorizontalScrollView
android:layout_width=
"match_parent"
...
...
app/src/main/res/layout/include_home_manager.xml
View file @
9a16ab1b
...
...
@@ -46,48 +46,44 @@
android:textAppearance=
"@style/AppearanceFoundation.Title"
android:textColor=
"?colorPrimary"
app:layout_constraintBottom_toBottomOf=
"@+id/home_manager_icon"
app:layout_constraintEnd_toStartOf=
"@+id/home_manager_
acti
on"
app:layout_constraintEnd_toStartOf=
"@+id/home_manager_
butt
on"
app:layout_constraintStart_toEndOf=
"@+id/home_manager_icon"
app:layout_constraintTop_toTopOf=
"parent"
tools:text=
"@string/manager"
/>
<FrameLayout
android:id=
"@+id/home_manager_action"
invisible=
"@{viewModel.stateMagisk == MagiskState.LOADING || !viewModel.isConnected}"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
app:layout_constraintBottom_toBottomOf=
"@+id/home_manager_title"
app:layout_constraintEnd_toEndOf=
"parent"
app:layout_constraintTop_toTopOf=
"@+id/home_manager_title"
>
<Button
android:id=
"@+id/home_manager_button"
style=
"@style/WidgetFoundation.Button"
gon
e=
"@{viewModel.stateManager != MagiskState.OBSOLETE}"
invisibl
e=
"@{viewModel.stateManager != MagiskState.OBSOLETE}"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:onClick=
"@{() -> viewModel.onManagerPressed()}"
android:text=
"@string/update"
android:textAllCaps=
"false"
app:icon=
"@drawable/ic_update_md2"
/>
app:icon=
"@drawable/ic_update_md2"
app:layout_constraintBottom_toBottomOf=
"@+id/home_manager_title"
app:layout_constraintEnd_toEndOf=
"parent"
app:layout_constraintTop_toTopOf=
"@+id/home_manager_title"
/>
<Button
style=
"@style/WidgetFoundation.Button.Text"
gon
e=
"@{viewModel.stateManager == MagiskState.OBSOLETE}"
invisibl
e=
"@{viewModel.stateManager == MagiskState.OBSOLETE}"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:onClick=
"@{() -> viewModel.onManagerPressed()}"
android:text=
"@string/install"
android:textAllCaps=
"false"
app:icon=
"@drawable/ic_install"
/>
</FrameLayout>
app:icon=
"@drawable/ic_install"
app:layout_constraintBottom_toBottomOf=
"@+id/home_manager_title"
app:layout_constraintEnd_toEndOf=
"parent"
app:layout_constraintTop_toTopOf=
"@+id/home_manager_title"
/>
<androidx.constraintlayout.widget.Barrier
android:id=
"@+id/home_manager_title_barrier"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
app:barrierDirection=
"bottom"
tools:constraint_referenced_ids=
"home_manager_
acti
on,home_manager_title,home_manager_icon"
/>
tools:constraint_referenced_ids=
"home_manager_
butt
on,home_manager_title,home_manager_icon"
/>
<HorizontalScrollView
android:layout_width=
"match_parent"
...
...
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