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
5c483745
Commit
5c483745
authored
Aug 30, 2018
by
topjohnwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Move settings out of separate Activity
parent
0c247110
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
14 changed files
with
357 additions
and
419 deletions
+357
-419
AndroidManifest.xml
app/src/full/AndroidManifest.xml
+0
-3
MainActivity.java
app/src/full/java/com/topjohnwu/magisk/MainActivity.java
+1
-2
SettingsActivity.java
app/src/full/java/com/topjohnwu/magisk/SettingsActivity.java
+0
-401
SettingsFragment.java
app/src/full/java/com/topjohnwu/magisk/SettingsFragment.java
+351
-0
activity_main.xml
app/src/full/res/layout/activity_main.xml
+1
-0
fragment_log.xml
app/src/full/res/layout/fragment_log.xml
+0
-1
fragment_magisk.xml
app/src/full/res/layout/fragment_magisk.xml
+0
-2
fragment_magisk_hide.xml
app/src/full/res/layout/fragment_magisk_hide.xml
+0
-1
fragment_magisk_log.xml
app/src/full/res/layout/fragment_magisk_log.xml
+1
-2
fragment_modules.xml
app/src/full/res/layout/fragment_modules.xml
+2
-3
fragment_repos.xml
app/src/full/res/layout/fragment_repos.xml
+0
-1
fragment_superuser.xml
app/src/full/res/layout/fragment_superuser.xml
+0
-1
drawer.xml
app/src/full/res/menu/drawer.xml
+1
-1
app_settings.xml
app/src/full/res/xml/app_settings.xml
+0
-1
No files found.
app/src/full/AndroidManifest.xml
View file @
5c483745
...
...
@@ -28,9 +28,6 @@
<activity
android:name=
".AboutActivity"
android:theme=
"@style/AppTheme.StatusBar"
/>
<activity
android:name=
".SettingsActivity"
android:theme=
"@style/AppTheme.StatusBar"
/>
<activity
android:name=
".FlashActivity"
android:configChanges=
"keyboardHidden|orientation|screenSize"
...
...
app/src/full/java/com/topjohnwu/magisk/MainActivity.java
View file @
5c483745
...
...
@@ -185,8 +185,7 @@ public class MainActivity extends BaseActivity
displayFragment
(
new
LogFragment
(),
false
);
break
;
case
R
.
id
.
settings
:
startActivity
(
new
Intent
(
this
,
SettingsActivity
.
class
));
mDrawerItem
=
bak
;
displayFragment
(
new
SettingsFragment
(),
true
);
break
;
case
R
.
id
.
app_about
:
startActivity
(
new
Intent
(
this
,
AboutActivity
.
class
));
...
...
app/src/full/java/com/topjohnwu/magisk/SettingsActivity.java
deleted
100644 → 0
View file @
0c247110
This diff is collapsed.
Click to expand it.
app/src/full/java/com/topjohnwu/magisk/SettingsFragment.java
0 → 100644
View file @
5c483745
This diff is collapsed.
Click to expand it.
app/src/full/res/layout/activity_main.xml
View file @
5c483745
...
...
@@ -15,6 +15,7 @@
android:orientation=
"vertical"
>
<FrameLayout
android:layout_marginTop=
"?attr/actionBarSize"
android:id=
"@+id/content_frame"
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
/>
...
...
app/src/full/res/layout/fragment_log.xml
View file @
5c483745
...
...
@@ -5,7 +5,6 @@
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
android:orientation=
"vertical"
android:layout_marginTop=
"?attr/actionBarSize"
tools:context=
"com.topjohnwu.magisk.LogFragment"
>
<android.support.design.widget.TabLayout
...
...
app/src/full/res/layout/fragment_magisk.xml
View file @
5c483745
...
...
@@ -5,14 +5,12 @@
android:id=
"@+id/swipeRefreshLayout"
android:layout_width=
"match_parent"
android:layout_height=
"fill_parent"
android:layout_marginTop=
"?attr/actionBarSize"
android:orientation=
"vertical"
>
<ScrollView
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
android:layout_marginBottom=
"8dp"
android:layout_marginTop=
"?attr/actionBarSize"
android:orientation=
"vertical"
>
<LinearLayout
...
...
app/src/full/res/layout/fragment_magisk_hide.xml
View file @
5c483745
...
...
@@ -5,7 +5,6 @@ xmlns:app="http://schemas.android.com/apk/res-auto"
android:id=
"@+id/swipeRefreshLayout"
android:layout_width=
"match_parent"
android:layout_height=
"fill_parent"
android:layout_marginTop=
"?attr/actionBarSize"
android:orientation=
"vertical"
>
<LinearLayout
...
...
app/src/full/res/layout/fragment_magisk_log.xml
View file @
5c483745
...
...
@@ -3,8 +3,7 @@
xmlns:android=
"http://schemas.android.com/apk/res/android"
xmlns:tools=
"http://schemas.android.com/tools"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:layout_marginTop=
"?attr/actionBarSize"
>
android:layout_height=
"wrap_content"
>
<HorizontalScrollView
android:id=
"@+id/hsvLog"
...
...
app/src/full/res/layout/fragment_modules.xml
View file @
5c483745
<?xml version="1.0" encoding="utf-8"?>
<android.support.v4.widget.SwipeRefreshLayout
xmlns:android=
"http://schemas.android.com/apk/res/android"
<android.support.v4.widget.SwipeRefreshLayout
xmlns:android=
"http://schemas.android.com/apk/res/android"
xmlns:tools=
"http://schemas.android.com/tools"
xmlns:app=
"http://schemas.android.com/apk/res-auto"
android:id=
"@+id/swipeRefreshLayout"
android:layout_width=
"match_parent"
android:layout_height=
"fill_parent"
android:layout_marginTop=
"?attr/actionBarSize"
android:orientation=
"vertical"
>
...
...
@@ -13,7 +13,6 @@
android:id=
"@+id/coordinator"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:layout_marginTop=
"?attr/actionBarSize"
android:orientation=
"vertical"
>
<android.support.v7.widget.RecyclerView
...
...
app/src/full/res/layout/fragment_repos.xml
View file @
5c483745
...
...
@@ -3,7 +3,6 @@
android:layout_width=
"match_parent"
android:layout_height=
"fill_parent"
android:orientation=
"vertical"
android:layout_marginTop=
"?attr/actionBarSize"
xmlns:android=
"http://schemas.android.com/apk/res/android"
xmlns:app=
"http://schemas.android.com/apk/res-auto"
>
...
...
app/src/full/res/layout/fragment_superuser.xml
View file @
5c483745
...
...
@@ -2,7 +2,6 @@
xmlns:android=
"http://schemas.android.com/apk/res/android"
xmlns:app=
"http://schemas.android.com/apk/res-auto"
android:orientation=
"vertical"
android:layout_marginTop=
"?attr/actionBarSize"
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
>
...
...
app/src/full/res/menu/drawer.xml
View file @
5c483745
...
...
@@ -46,8 +46,8 @@
android:id=
"@+id/log"
android:icon=
"@drawable/ic_bug_report"
android:title=
"@string/log"
/>
<item
android:checkable=
"false"
android:id=
"@+id/settings"
android:icon=
"@drawable/ic_settings"
android:title=
"@string/settings"
/>
...
...
app/src/full/res/xml/app_settings.xml
View file @
5c483745
<PreferenceScreen
android:layout_marginTop=
"?attr/actionBarSize"
xmlns:android=
"http://schemas.android.com/apk/res/android"
>
<PreferenceCategory
android:key=
"general"
...
...
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