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
738f943a
Commit
738f943a
authored
May 26, 2017
by
topjohnwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Several UI tweaks
parent
47e62a56
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
22 additions
and
8 deletions
+22
-8
AboutActivity.java
app/src/main/java/com/topjohnwu/magisk/AboutActivity.java
+2
-4
SettingsActivity.java
app/src/main/java/com/topjohnwu/magisk/SettingsActivity.java
+2
-2
activity_settings.xml
app/src/main/res/layout/activity_settings.xml
+0
-0
fragment_magisk.xml
app/src/main/res/layout/fragment_magisk.xml
+2
-1
styles.xml
app/src/main/res/values-sw600dp/styles.xml
+8
-0
attrs.xml
app/src/main/res/values/attrs.xml
+1
-0
colors.xml
app/src/main/res/values/colors.xml
+1
-1
styles.xml
app/src/main/res/values/styles.xml
+6
-0
No files found.
app/src/main/java/com/topjohnwu/magisk/AboutActivity.java
View file @
738f943a
...
@@ -28,7 +28,7 @@ import butterknife.ButterKnife;
...
@@ -28,7 +28,7 @@ import butterknife.ButterKnife;
public
class
AboutActivity
extends
Activity
{
public
class
AboutActivity
extends
Activity
{
private
static
final
String
DONATION_URL
=
"http
://topjohnwu.github.io/donate
"
;
private
static
final
String
DONATION_URL
=
"http
s://www.paypal.me/topjohnwu
"
;
private
static
final
String
XDA_THREAD
=
"http://forum.xda-developers.com/showthread.php?t=3432382"
;
private
static
final
String
XDA_THREAD
=
"http://forum.xda-developers.com/showthread.php?t=3432382"
;
private
static
final
String
SOURCE_CODE_URL
=
"https://github.com/topjohnwu/MagiskManager"
;
private
static
final
String
SOURCE_CODE_URL
=
"https://github.com/topjohnwu/MagiskManager"
;
...
@@ -44,10 +44,8 @@ public class AboutActivity extends Activity {
...
@@ -44,10 +44,8 @@ public class AboutActivity extends Activity {
@Override
@Override
protected
void
onCreate
(
@Nullable
Bundle
savedInstanceState
)
{
protected
void
onCreate
(
@Nullable
Bundle
savedInstanceState
)
{
super
.
onCreate
(
savedInstanceState
);
super
.
onCreate
(
savedInstanceState
);
String
theme
=
PreferenceManager
.
getDefaultSharedPreferences
(
getApplicationContext
()).
getString
(
"theme"
,
""
);
Logger
.
dev
(
"AboutActivity: Theme is "
+
theme
);
if
(
getApplicationContext
().
isDarkTheme
)
{
if
(
getApplicationContext
().
isDarkTheme
)
{
setTheme
(
R
.
style
.
AppTheme_Dark
);
setTheme
(
R
.
style
.
AppTheme_
Transparent_
Dark
);
}
}
setContentView
(
R
.
layout
.
activity_about
);
setContentView
(
R
.
layout
.
activity_about
);
ButterKnife
.
bind
(
this
);
ButterKnife
.
bind
(
this
);
...
...
app/src/main/java/com/topjohnwu/magisk/SettingsActivity.java
View file @
738f943a
...
@@ -30,10 +30,10 @@ public class SettingsActivity extends Activity {
...
@@ -30,10 +30,10 @@ public class SettingsActivity extends Activity {
protected
void
onCreate
(
Bundle
savedInstanceState
)
{
protected
void
onCreate
(
Bundle
savedInstanceState
)
{
super
.
onCreate
(
savedInstanceState
);
super
.
onCreate
(
savedInstanceState
);
if
(
getApplicationContext
().
isDarkTheme
)
{
if
(
getApplicationContext
().
isDarkTheme
)
{
setTheme
(
R
.
style
.
AppTheme_Dark
);
setTheme
(
R
.
style
.
AppTheme_
Transparent_
Dark
);
}
}
setContentView
(
R
.
layout
.
activity_
container
);
setContentView
(
R
.
layout
.
activity_
settings
);
ButterKnife
.
bind
(
this
);
ButterKnife
.
bind
(
this
);
setSupportActionBar
(
toolbar
);
setSupportActionBar
(
toolbar
);
...
...
app/src/main/res/layout/activity_
container
.xml
→
app/src/main/res/layout/activity_
settings
.xml
View file @
738f943a
File moved
app/src/main/res/layout/fragment_magisk.xml
View file @
738f943a
...
@@ -178,7 +178,8 @@
...
@@ -178,7 +178,8 @@
android:layout_centerVertical=
"true"
android:layout_centerVertical=
"true"
android:layout_margin=
"15dp"
android:layout_margin=
"15dp"
android:layout_toStartOf=
"@+id/safetyNet_status"
android:layout_toStartOf=
"@+id/safetyNet_status"
android:src=
"@drawable/ic_refresh"
/>
android:src=
"@drawable/ic_refresh"
android:tint=
"?attr/imageColorTint"
/>
<ProgressBar
<ProgressBar
android:id=
"@+id/safetyNet_check_progress"
android:id=
"@+id/safetyNet_check_progress"
...
...
app/src/main/res/values-sw600dp/styles.xml
View file @
738f943a
...
@@ -9,4 +9,12 @@
...
@@ -9,4 +9,12 @@
<item
name=
"android:windowNoTitle"
>
true
</item>
<item
name=
"android:windowNoTitle"
>
true
</item>
</style>
</style>
<style
name=
"AppTheme.Transparent.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>
<item
name=
"android:windowIsTranslucent"
>
true
</item>
<item
name=
"android:windowNoTitle"
>
true
</item>
</style>
</resources>
</resources>
\ No newline at end of file
app/src/main/res/values/attrs.xml
View file @
738f943a
...
@@ -30,5 +30,6 @@
...
@@ -30,5 +30,6 @@
</declare-styleable>
</declare-styleable>
<attr
name=
"colorAccentFallback"
format=
"reference"
/>
<attr
name=
"colorAccentFallback"
format=
"reference"
/>
<attr
name=
"imageColorTint"
format=
"reference"
/>
</resources>
</resources>
\ No newline at end of file
app/src/main/res/values/colors.xml
View file @
738f943a
...
@@ -10,7 +10,7 @@
...
@@ -10,7 +10,7 @@
<color
name=
"red500"
>
#F44336
</color>
<color
name=
"red500"
>
#F44336
</color>
<color
name=
"green500"
>
#4CAF50
</color>
<color
name=
"green500"
>
#4CAF50
</color>
<color
name=
"grey500"
>
#9E9E9E
</color>
<color
name=
"grey500"
>
#9E9E9E
</color>
<color
name=
"blue500"
>
#2196
F
3
</color>
<color
name=
"blue500"
>
#2196
f
3
</color>
<color
name=
"yellow500"
>
#FFC107
</color>
<color
name=
"yellow500"
>
#FFC107
</color>
<color
name=
"dark_secondary_text"
>
#dedede
</color>
<color
name=
"dark_secondary_text"
>
#dedede
</color>
...
...
app/src/main/res/values/styles.xml
View file @
738f943a
...
@@ -12,6 +12,7 @@
...
@@ -12,6 +12,7 @@
<item
name=
"windowActionBar"
>
false
</item>
<item
name=
"windowActionBar"
>
false
</item>
<item
name=
"windowNoTitle"
>
true
</item>
<item
name=
"windowNoTitle"
>
true
</item>
<item
name=
"android:statusBarColor"
>
@android:color/transparent
</item>
<item
name=
"android:statusBarColor"
>
@android:color/transparent
</item>
<item
name=
"imageColorTint"
>
@android:color/background_dark
</item>
</style>
</style>
<style
name=
"AppTheme.Dark"
parent=
"Theme.AppCompat.NoActionBar"
>
<style
name=
"AppTheme.Dark"
parent=
"Theme.AppCompat.NoActionBar"
>
...
@@ -24,6 +25,7 @@
...
@@ -24,6 +25,7 @@
<item
name=
"windowNoTitle"
>
true
</item>
<item
name=
"windowNoTitle"
>
true
</item>
<item
name=
"android:statusBarColor"
>
@android:color/transparent
</item>
<item
name=
"android:statusBarColor"
>
@android:color/transparent
</item>
<item
name=
"android:textColorSecondary"
>
@color/dark_secondary_text
</item>
<item
name=
"android:textColorSecondary"
>
@color/dark_secondary_text
</item>
<item
name=
"imageColorTint"
>
@android:color/background_light
</item>
</style>
</style>
<style
name=
"CardViewStyle.Dark"
parent=
"CardView"
>
<style
name=
"CardViewStyle.Dark"
parent=
"CardView"
>
...
@@ -38,6 +40,10 @@
...
@@ -38,6 +40,10 @@
<item
name=
"android:statusBarColor"
>
?attr/colorPrimaryDark
</item>
<item
name=
"android:statusBarColor"
>
?attr/colorPrimaryDark
</item>
</style>
</style>
<style
name=
"AppTheme.Transparent.Dark"
parent=
"AppTheme.Dark"
>
<item
name=
"android:statusBarColor"
>
?attr/colorPrimaryDark
</item>
</style>
<style
name=
"SplashTheme"
parent=
"Theme.AppCompat.NoActionBar"
>
<style
name=
"SplashTheme"
parent=
"Theme.AppCompat.NoActionBar"
>
<item
name=
"android:windowBackground"
>
@drawable/ic_splash_activity
</item>
<item
name=
"android:windowBackground"
>
@drawable/ic_splash_activity
</item>
<item
name=
"android:windowTranslucentStatus"
>
true
</item>
<item
name=
"android:windowTranslucentStatus"
>
true
</item>
...
...
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