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
79c71509
Commit
79c71509
authored
Jun 10, 2018
by
topjohnwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add NoUIActivity
parent
5dab580c
Hide whitespace changes
Inline
Side-by-side
Showing
12 changed files
with
74 additions
and
41 deletions
+74
-41
AndroidManifest.xml
src/full/AndroidManifest.xml
+6
-3
AboutActivity.java
src/full/java/com/topjohnwu/magisk/AboutActivity.java
+1
-1
FlashActivity.java
src/full/java/com/topjohnwu/magisk/FlashActivity.java
+1
-1
NoUIActivity.java
src/full/java/com/topjohnwu/magisk/NoUIActivity.java
+26
-0
SettingsActivity.java
src/full/java/com/topjohnwu/magisk/SettingsActivity.java
+1
-1
activity_main.xml
src/full/res/layout/activity_main.xml
+5
-6
activity_settings.xml
src/full/res/layout/activity_settings.xml
+6
-6
styles.xml
src/full/res/values-sw600dp/styles.xml
+2
-2
styles.xml
src/full/res/values/styles.xml
+10
-2
Activity.java
src/main/java/com/topjohnwu/magisk/components/Activity.java
+6
-7
AndroidManifest.xml
src/stub/AndroidManifest.xml
+1
-1
NoUIActivity.java
src/stub/java/com/topjohnwu/magisk/NoUIActivity.java
+9
-11
No files found.
src/full/AndroidManifest.xml
View file @
79c71509
...
...
@@ -26,15 +26,18 @@
</activity>
<activity
android:name=
".AboutActivity"
android:theme=
"@style/AppTheme.
Transparent
"
/>
android:theme=
"@style/AppTheme.
StatusBar
"
/>
<activity
android:name=
".SettingsActivity"
android:theme=
"@style/AppTheme.
Transparent
"
/>
android:theme=
"@style/AppTheme.
StatusBar
"
/>
<activity
android:name=
".FlashActivity"
android:configChanges=
"keyboardHidden|orientation|screenSize"
android:screenOrientation=
"nosensor"
android:theme=
"@style/AppTheme.Transparent"
/>
android:theme=
"@style/AppTheme.StatusBar"
/>
<activity
android:name=
".NoUIActivity"
android:theme=
"@style/AppTheme.Translucent"
/>
<activity
android:name=
".superuser.RequestActivity"
android:excludeFromRecents=
"true"
...
...
src/full/java/com/topjohnwu/magisk/AboutActivity.java
View file @
79c71509
...
...
@@ -31,7 +31,7 @@ public class AboutActivity extends Activity {
@Override
public
int
getDarkTheme
()
{
return
R
.
style
.
AppTheme_
Transparent
_Dark
;
return
R
.
style
.
AppTheme_
StatusBar
_Dark
;
}
@Override
...
...
src/full/java/com/topjohnwu/magisk/FlashActivity.java
View file @
79c71509
...
...
@@ -77,7 +77,7 @@ public class FlashActivity extends Activity {
@Override
public
int
getDarkTheme
()
{
return
R
.
style
.
AppTheme_
Transparent
_Dark
;
return
R
.
style
.
AppTheme_
StatusBar
_Dark
;
}
@Override
...
...
src/full/java/com/topjohnwu/magisk/NoUIActivity.java
0 → 100644
View file @
79c71509
package
com
.
topjohnwu
.
magisk
;
import
android.os.Bundle
;
import
android.support.annotation.NonNull
;
import
android.support.annotation.Nullable
;
import
android.support.v4.app.ActivityCompat
;
import
com.topjohnwu.magisk.components.Activity
;
import
com.topjohnwu.magisk.utils.Const
;
public
class
NoUIActivity
extends
Activity
{
@Override
protected
void
onCreate
(
@Nullable
Bundle
savedInstanceState
)
{
super
.
onCreate
(
savedInstanceState
);
String
[]
perms
=
getIntent
().
getStringArrayExtra
(
Const
.
Key
.
INTENT_PERM
);
if
(
perms
!=
null
)
{
ActivityCompat
.
requestPermissions
(
this
,
perms
,
0
);
}
}
@Override
public
void
onRequestPermissionsResult
(
int
requestCode
,
@NonNull
String
[]
permissions
,
@NonNull
int
[]
grantResults
)
{
super
.
onRequestPermissionsResult
(
requestCode
,
permissions
,
grantResults
);
finish
();
}
}
src/full/java/com/topjohnwu/magisk/SettingsActivity.java
View file @
79c71509
...
...
@@ -42,7 +42,7 @@ public class SettingsActivity extends Activity implements Topic.Subscriber {
@Override
public
int
getDarkTheme
()
{
return
R
.
style
.
AppTheme_
Transparent
_Dark
;
return
R
.
style
.
AppTheme_
StatusBar
_Dark
;
}
@Override
...
...
src/full/res/layout/activity_main.xml
View file @
79c71509
<?xml version="1.0" encoding="utf-8"?>
<android.support.v4.widget.DrawerLayout
android:id=
"@+id/drawer_layout"
xmlns:android=
"http://schemas.android.com/apk/res/android"
<android.support.v4.widget.DrawerLayout
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"
android:id=
"@+id/drawer_layout"
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
android:fitsSystemWindows=
"true"
...
...
@@ -18,9 +17,9 @@
<FrameLayout
android:id=
"@+id/content_frame"
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
/>
android:layout_height=
"match_parent"
/>
<include
layout=
"@layout/toolbar"
/>
<include
layout=
"@layout/toolbar"
/>
</FrameLayout>
...
...
@@ -30,6 +29,6 @@
android:layout_height=
"match_parent"
android:layout_gravity=
"start"
android:fitsSystemWindows=
"true"
app:menu=
"@menu/drawer"
/>
app:menu=
"@menu/drawer"
/>
</android.support.v4.widget.DrawerLayout>
src/full/res/layout/activity_settings.xml
View file @
79c71509
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout
xmlns:android=
"http://schemas.android.com/apk/res/android"
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
android:background=
"?android:windowBackground"
android:orientation=
"vertical"
>
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
android:background=
"?android:windowBackground"
android:orientation=
"vertical"
>
<include
layout=
"@layout/toolbar"
/>
<include
layout=
"@layout/toolbar"
/>
<FrameLayout
android:id=
"@+id/container"
android:layout_width=
"match_parent"
android:layout_height=
"0dp"
android:layout_weight=
"1"
/>
android:layout_weight=
"1"
/>
</LinearLayout>
\ No newline at end of file
src/full/res/values-sw600dp/styles.xml
View file @
79c71509
<?xml version="1.0" encoding="utf-8"?>
<resources>
<style
name=
"AppTheme.
Transparent
"
parent=
"AppTheme"
>
<style
name=
"AppTheme.
StatusBar
"
parent=
"AppTheme"
>
<item
name=
"android:statusBarColor"
>
@android:color/transparent
</item>
<item
name=
"android:navigationBarColor"
>
@android:color/transparent
</item>
<item
name=
"android:colorBackgroundCacheHint"
>
@null
</item>
...
...
@@ -9,7 +9,7 @@
<item
name=
"android:windowNoTitle"
>
true
</item>
</style>
<style
name=
"AppTheme.
Transparent
.Dark"
parent=
"AppTheme.Dark"
>
<style
name=
"AppTheme.
StatusBar
.Dark"
parent=
"AppTheme.Dark"
>
<item
name=
"android:statusBarColor"
>
@android:color/transparent
</item>
<item
name=
"android:navigationBarColor"
>
@android:color/transparent
</item>
<item
name=
"android:colorBackgroundCacheHint"
>
@null
</item>
...
...
src/full/res/values/styles.xml
View file @
79c71509
...
...
@@ -30,6 +30,14 @@
<item
name=
"preferenceTheme"
>
@style/PreferenceThemeOverlay.v14.Material
</item>
</style>
<style
name=
"AppTheme.Translucent"
parent=
"Theme.AppCompat.NoActionBar"
>
<item
name=
"android:windowNoTitle"
>
true
</item>
<item
name=
"android:windowBackground"
>
@android:color/transparent
</item>
<item
name=
"android:colorBackgroundCacheHint"
>
@null
</item>
<item
name=
"android:windowIsTranslucent"
>
true
</item>
<item
name=
"android:windowAnimationStyle"
>
@android:style/Animation
</item>
</style>
<style
name=
"CardViewStyle.Dark"
parent=
"CardView"
>
<item
name=
"cardBackgroundColor"
>
@android:color/background_dark
</item>
</style>
...
...
@@ -38,11 +46,11 @@
<item
name=
"cardBackgroundColor"
>
@android:color/background_light
</item>
</style>
<style
name=
"AppTheme.
Transparent
"
parent=
"AppTheme"
>
<style
name=
"AppTheme.
StatusBar
"
parent=
"AppTheme"
>
<item
name=
"android:statusBarColor"
>
?attr/colorPrimaryDark
</item>
</style>
<style
name=
"AppTheme.
Transparent
.Dark"
parent=
"AppTheme.Dark"
>
<style
name=
"AppTheme.
StatusBar
.Dark"
parent=
"AppTheme.Dark"
>
<item
name=
"android:statusBarColor"
>
?attr/colorPrimaryDark
</item>
</style>
...
...
src/main/java/com/topjohnwu/magisk/components/Activity.java
View file @
79c71509
...
...
@@ -9,21 +9,20 @@ import android.support.v4.app.ActivityCompat;
import
android.support.v4.content.ContextCompat
;
import
android.widget.Toast
;
import
com.topjohnwu.magisk.
MagiskManager
;
import
com.topjohnwu.magisk.
NoUIActivity
;
import
com.topjohnwu.magisk.R
;
import
com.topjohnwu.magisk.SplashActivity
;
import
com.topjohnwu.magisk.utils.Const
;
public
abstract
class
Activity
extends
FlavorActivity
{
pr
ivate
static
Runnable
permissionGrantCallback
;
pr
otected
static
Runnable
permissionGrantCallback
;
private
ActivityResultListener
activityResultListener
;
public
Activity
()
{
super
();
Configuration
configuration
=
new
Configuration
();
configuration
.
setLocale
(
MagiskManager
.
locale
);
configuration
.
setLocale
(
Application
.
locale
);
applyOverrideConfiguration
(
configuration
);
}
...
...
@@ -40,12 +39,12 @@ public abstract class Activity extends FlavorActivity {
permissionGrantCallback
=
callback
;
if
(!(
context
instanceof
Activity
))
{
// Start activity to show dialog
Intent
intent
=
new
Intent
(
context
,
Splash
Activity
.
class
);
Intent
intent
=
new
Intent
(
context
,
NoUI
Activity
.
class
);
intent
.
addFlags
(
Intent
.
FLAG_ACTIVITY_NEW_TASK
);
intent
.
putExtra
(
Const
.
Key
.
INTENT_PERM
,
permissions
);
context
.
startActivity
(
intent
);
}
else
{
ActivityCompat
.
requestPermissions
((
android
.
app
.
Activity
)
context
,
permissions
,
0
);
ActivityCompat
.
requestPermissions
((
Activity
)
context
,
permissions
,
0
);
}
}
}
...
...
@@ -71,7 +70,7 @@ public abstract class Activity extends FlavorActivity {
permissionGrantCallback
.
run
();
}
}
else
{
MagiskManager
.
toast
(
R
.
string
.
no_rw_storage
,
Toast
.
LENGTH_LONG
);
Application
.
toast
(
R
.
string
.
no_rw_storage
,
Toast
.
LENGTH_LONG
);
}
permissionGrantCallback
=
null
;
}
...
...
src/stub/AndroidManifest.xml
View file @
79c71509
...
...
@@ -4,7 +4,7 @@
<application>
<activity
android:name=
".
Splash
Activity"
android:name=
".
NoUI
Activity"
android:theme=
"@android:style/Theme.Translucent.NoTitleBar"
>
<intent-filter>
<action
android:name=
"android.intent.action.MAIN"
/>
...
...
src/stub/java/com/topjohnwu/magisk/
Splash
Activity.java
→
src/stub/java/com/topjohnwu/magisk/
NoUI
Activity.java
View file @
79c71509
...
...
@@ -15,7 +15,7 @@ import com.topjohnwu.magisk.utils.WebService;
import
org.json.JSONException
;
import
org.json.JSONObject
;
public
class
Splash
Activity
extends
Activity
{
public
class
NoUI
Activity
extends
Activity
{
private
String
apkLink
;
private
String
version
;
...
...
@@ -44,16 +44,14 @@ public class SplashActivity extends Activity {
.
setCancelable
(
false
)
.
setTitle
(
R
.
string
.
app_name
)
.
setMessage
(
R
.
string
.
upgrade_msg
)
.
setPositiveButton
(
R
.
string
.
yes
,
(
d
,
w
)
->
{
runWithPermission
(
new
String
[]
{
Manifest
.
permission
.
WRITE_EXTERNAL_STORAGE
},
()
->
{
Intent
intent
=
new
Intent
(
this
,
ManagerUpdate
.
class
);
intent
.
putExtra
(
Const
.
Key
.
INTENT_SET_LINK
,
apkLink
);
intent
.
putExtra
(
Const
.
Key
.
INTENT_SET_FILENAME
,
filename
);
sendBroadcast
(
intent
);
finish
();
});
})
.
setPositiveButton
(
R
.
string
.
yes
,
(
d
,
w
)
->
runWithPermission
(
new
String
[]
{
Manifest
.
permission
.
WRITE_EXTERNAL_STORAGE
},
()
->
{
Intent
intent
=
new
Intent
(
this
,
ManagerUpdate
.
class
);
intent
.
putExtra
(
Const
.
Key
.
INTENT_SET_LINK
,
apkLink
);
intent
.
putExtra
(
Const
.
Key
.
INTENT_SET_FILENAME
,
filename
);
sendBroadcast
(
intent
);
finish
();
}))
.
setNegativeButton
(
R
.
string
.
no_thanks
,
(
d
,
w
)
->
finish
())
.
show
();
});
...
...
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