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
5e01f785
Commit
5e01f785
authored
Oct 06, 2019
by
Viktor De Pasquale
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Added handling for state with no connection
parent
d35d1b88
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
39 additions
and
15 deletions
+39
-15
HomeViewModel.kt
.../java/com/topjohnwu/magisk/redesign/home/HomeViewModel.kt
+2
-1
activity_main_md2.xml
app/src/main/res/layout/activity_main_md2.xml
+30
-10
fragment_home_md2.xml
app/src/main/res/layout/fragment_home_md2.xml
+5
-4
strings_md2.xml
app/src/main/res/values/strings_md2.xml
+2
-0
No files found.
app/src/main/java/com/topjohnwu/magisk/redesign/home/HomeViewModel.kt
View file @
5e01f785
...
...
@@ -54,6 +54,7 @@ class HomeViewModel(
}
override
fun
refresh
()
=
repoMagisk
.
fetchUpdate
()
.
onErrorReturn
{
Info
.
remote
}
.
subscribeK
{
updateBy
(
it
)
}
private
fun
updateBy
(
info
:
UpdateInfo
)
{
...
...
@@ -64,7 +65,7 @@ class HomeViewModel(
}
stateManager
.
value
=
when
{
!
info
.
app
.
isUpdateChannelCorrect
->
MagiskState
.
NOT_INSTALLED
!
info
.
app
.
isUpdateChannelCorrect
&&
isConnected
.
value
->
MagiskState
.
NOT_INSTALLED
info
.
app
.
isObsolete
->
MagiskState
.
OBSOLETE
else
->
MagiskState
.
UP_TO_DATE
}
...
...
app/src/main/res/layout/activity_main_md2.xml
View file @
5e01f785
...
...
@@ -61,18 +61,38 @@
app:hideOnScroll=
"true"
tools:paddingBottom=
"48dp"
>
<com.google.android.material.bottomnavigation.BottomNavigationView
android:id=
"@+id/main_navigation"
<LinearLayout
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:background=
"@android:color/transparent"
app:elevation=
"0dp"
app:itemIconTint=
"@color/color_menu_tint"
app:itemTextAppearanceActive=
"@style/AppearanceFoundation.Tiny.Bold"
app:itemTextAppearanceInactive=
"@style/AppearanceFoundation.Tiny.Bold"
app:itemTextColor=
"@color/color_menu_tint"
app:labelVisibilityMode=
"unlabeled"
app:menu=
"@menu/menu_bottom_nav"
/>
android:animateLayoutChanges=
"true"
android:orientation=
"vertical"
>
<com.google.android.material.bottomnavigation.BottomNavigationView
android:id=
"@+id/main_navigation"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:background=
"@android:color/transparent"
app:elevation=
"0dp"
app:itemIconTint=
"@color/color_menu_tint"
app:itemTextAppearanceActive=
"@style/AppearanceFoundation.Tiny.Bold"
app:itemTextAppearanceInactive=
"@style/AppearanceFoundation.Tiny.Bold"
app:itemTextColor=
"@color/color_menu_tint"
app:labelVisibilityMode=
"unlabeled"
app:menu=
"@menu/menu_bottom_nav"
/>
<androidx.appcompat.widget.AppCompatTextView
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=
"?appearanceTextCaptionNormal"
android:textColor=
"?colorError"
android:visibility=
"gone"
tools:visibility=
"visible"
/>
</LinearLayout>
</com.google.android.material.bottomappbar.BottomAppBar>
...
...
app/src/main/res/layout/fragment_home_md2.xml
View file @
5e01f785
...
...
@@ -79,7 +79,7 @@
app:layout_constraintTop_toBottomOf=
"@+id/home_magisk_title"
/>
<FrameLayout
gone=
"@{viewModel.stateMagisk == MagiskState.LOADING}"
gone=
"@{viewModel.stateMagisk == MagiskState.LOADING
|| !viewModel.isConnected
}"
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
android:layout_marginTop=
"@dimen/l1"
...
...
@@ -154,11 +154,12 @@
android:layout_height=
"wrap_content"
android:layout_marginTop=
"@dimen/l1"
android:gravity=
"center"
android:text=
"@
string/manager
"
android:text=
"@
{viewModel.stateHideManagerName}
"
android:textAppearance=
"?appearanceTextTitleNormal"
app:layout_constraintEnd_toEndOf=
"parent"
app:layout_constraintStart_toStartOf=
"parent"
app:layout_constraintTop_toBottomOf=
"@+id/home_manager_icon"
/>
app:layout_constraintTop_toBottomOf=
"@+id/home_manager_icon"
tools:text=
"@string/manager"
/>
<TextSwitcher
android:id=
"@+id/home_manager_status"
...
...
@@ -170,7 +171,7 @@
app:layout_constraintTop_toBottomOf=
"@+id/home_manager_title"
/>
<FrameLayout
gone=
"@{viewModel.stateManager == MagiskState.LOADING}"
gone=
"@{viewModel.stateManager == MagiskState.LOADING
|| !viewModel.isConnected
}"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:layout_marginTop=
"@dimen/l1"
...
...
app/src/main/res/values/strings_md2.xml
View file @
5e01f785
...
...
@@ -4,6 +4,8 @@
<string
name=
"manager"
>
Manager
</string>
<string
name=
"magisk"
>
Magisk
</string>
<string
name=
"no_connection"
>
No connection available
</string>
<string
name=
"section_home"
>
Home
</string>
<string
name=
"section_modules"
>
@string/modules
</string>
<string
name=
"section_superuser"
>
@string/superuser
</string>
...
...
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