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
149d35c6
Commit
149d35c6
authored
Oct 05, 2019
by
Viktor De Pasquale
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Updated strings
parent
3a18e687
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
37 additions
and
16 deletions
+37
-16
HomeFragment.kt
...n/java/com/topjohnwu/magisk/redesign/home/HomeFragment.kt
+1
-1
HomeViewModel.kt
.../java/com/topjohnwu/magisk/redesign/home/HomeViewModel.kt
+8
-8
fragment_home_md2.xml
app/src/main/res/layout/fragment_home_md2.xml
+4
-2
menu_bottom_nav.xml
app/src/main/res/menu/menu_bottom_nav.xml
+4
-4
strings_md2.xml
app/src/main/res/values/strings_md2.xml
+19
-0
mincrypt
native/jni/external/mincrypt
+1
-1
No files found.
app/src/main/java/com/topjohnwu/magisk/redesign/home/HomeFragment.kt
View file @
149d35c6
...
...
@@ -16,7 +16,7 @@ class HomeFragment : CompatFragment<HomeViewModel, FragmentHomeMd2Binding>() {
override
fun
onStart
()
{
super
.
onStart
()
activity
.
title
=
"Home"
activity
.
title
=
resources
.
getString
(
R
.
string
.
section_home
)
}
}
\ No newline at end of file
app/src/main/java/com/topjohnwu/magisk/redesign/home/HomeViewModel.kt
View file @
149d35c6
...
...
@@ -22,18 +22,18 @@ class HomeViewModel(
val
stateManager
=
KObservableField
(
MagiskState
.
LOADING
)
val
stateTextMagisk
=
Observer
(
stateMagisk
)
{
when
(
stateMagisk
.
value
)
{
MagiskState
.
NOT_INSTALLED
->
R
.
string
.
magisk_version_error
.
res
()
MagiskState
.
UP_TO_DATE
->
R
.
string
.
magisk_up_to_date
.
res
()
MagiskState
.
LOADING
->
R
.
string
.
checking_for_updates
.
res
()
MagiskState
.
OBSOLETE
->
R
.
string
.
magisk_update_title
.
res
()
MagiskState
.
NOT_INSTALLED
->
R
.
string
.
installed_error_md2
.
res
()
MagiskState
.
UP_TO_DATE
->
R
.
string
.
up_to_date_md2
.
res
()
MagiskState
.
LOADING
->
R
.
string
.
loading_md2
.
res
()
MagiskState
.
OBSOLETE
->
R
.
string
.
obsolete_md2
.
res
()
}
}
val
stateTextManager
=
Observer
(
stateManager
)
{
when
(
stateManager
.
value
)
{
MagiskState
.
NOT_INSTALLED
->
R
.
string
.
invalid_update_channel
.
res
()
MagiskState
.
UP_TO_DATE
->
R
.
string
.
manager_up_to_date
.
res
()
MagiskState
.
LOADING
->
R
.
string
.
checking_for_updates
.
res
()
MagiskState
.
OBSOLETE
->
R
.
string
.
manager_update_title
.
res
()
MagiskState
.
NOT_INSTALLED
->
R
.
string
.
channel_error_md2
.
res
()
MagiskState
.
UP_TO_DATE
->
R
.
string
.
up_to_date_md2
.
res
()
MagiskState
.
LOADING
->
R
.
string
.
loading_md2
.
res
()
MagiskState
.
OBSOLETE
->
R
.
string
.
obsolete_md2
.
res
()
}
}
...
...
app/src/main/res/layout/fragment_home_md2.xml
View file @
149d35c6
...
...
@@ -60,7 +60,7 @@
android:layout_height=
"wrap_content"
android:layout_marginTop=
"@dimen/l1"
android:gravity=
"center"
android:text=
"
M
agisk"
android:text=
"
@string/m
agisk"
android:textAppearance=
"?appearanceTextTitleNormal"
app:layout_constraintEnd_toEndOf=
"parent"
app:layout_constraintStart_toStartOf=
"parent"
...
...
@@ -151,7 +151,7 @@
android:layout_height=
"wrap_content"
android:layout_marginTop=
"@dimen/l1"
android:gravity=
"center"
android:text=
"
M
anager"
android:text=
"
@string/m
anager"
android:textAppearance=
"?appearanceTextTitleNormal"
app:layout_constraintEnd_toEndOf=
"parent"
app:layout_constraintStart_toStartOf=
"parent"
...
...
@@ -207,6 +207,8 @@
<View
android:layout_width=
"match_parent"
android:layout_height=
"1dp"
android:layout_marginStart=
"@dimen/l1"
android:layout_marginEnd=
"@dimen/l1"
android:layout_marginTop=
"@dimen/l2"
android:layout_marginBottom=
"@dimen/l2"
android:background=
"?colorSurfaceVariant"
/>
...
...
app/src/main/res/menu/menu_bottom_nav.xml
View file @
149d35c6
...
...
@@ -5,13 +5,13 @@
<item
android:id=
"@+id/homeFragment"
android:icon=
"@drawable/ic_home_md2"
android:title=
"
H
ome"
android:title=
"
@string/section_h
ome"
tools:showAsAction=
"always"
/>
<item
android:id=
"@+id/modulesFragment"
android:icon=
"@drawable/ic_module_md2"
android:title=
"@string/modules"
android:title=
"@string/
section_
modules"
tools:showAsAction=
"always"
/>
<item
...
...
@@ -23,13 +23,13 @@
<item
android:id=
"@+id/logFragment"
android:icon=
"@drawable/ic_bug_md2"
android:title=
"@string/log"
android:title=
"@string/
section_
log"
tools:showAsAction=
"always"
/>
<item
android:id=
"@+id/settingsFragment"
android:icon=
"@drawable/ic_settings_md2"
android:title=
"@string/settings"
android:title=
"@string/se
ction_se
ttings"
tools:showAsAction=
"always"
/>
</menu>
\ No newline at end of file
app/src/main/res/values/strings_md2.xml
0 → 100644
View file @
149d35c6
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string
name=
"manager"
>
Manager
</string>
<string
name=
"magisk"
>
Magisk
</string>
<string
name=
"section_home"
>
Home
</string>
<string
name=
"section_modules"
>
@string/modules
</string>
<string
name=
"section_superuser"
>
@string/superuser
</string>
<string
name=
"section_log"
>
@string/log
</string>
<string
name=
"section_settings"
>
@string/settings
</string>
<string
name=
"installed_error_md2"
>
is not installed
</string>
<string
name=
"channel_error_md2"
>
has invalid update channel!
</string>
<string
name=
"up_to_date_md2"
>
is up to date
</string>
<string
name=
"obsolete_md2"
>
can be updated!
</string>
<string
name=
"loading_md2"
>
is loading…
</string>
</resources>
\ No newline at end of file
mincrypt
@
ac33afa7
Subproject commit
d443357d300f263179e04ef0893e6b8f040c9451
Subproject commit
ac33afa79e57e198b9eeec231140d64816a0bb1e
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