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
f3cd9a09
Commit
f3cd9a09
authored
Apr 27, 2019
by
Viktor De Pasquale
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Removed old Base[Activity/Fragment]
parent
e426090a
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
11 additions
and
235 deletions
+11
-235
ActivityResultListener.kt
...va/com/topjohnwu/magisk/ui/base/ActivityResultListener.kt
+7
-0
BaseActivity.java
.../main/java/com/topjohnwu/magisk/ui/base/BaseActivity.java
+0
-166
BaseFragment.java
.../main/java/com/topjohnwu/magisk/ui/base/BaseFragment.java
+0
-61
BasePreferenceFragment.java
.../com/topjohnwu/magisk/ui/base/BasePreferenceFragment.java
+1
-1
IBaseLeanback.kt
...c/main/java/com/topjohnwu/magisk/ui/base/IBaseLeanback.kt
+1
-5
MagiskLeanbackActivity.kt
...va/com/topjohnwu/magisk/ui/base/MagiskLeanbackActivity.kt
+2
-2
No files found.
app/src/main/java/com/topjohnwu/magisk/ui/base/ActivityResultListener.kt
0 → 100644
View file @
f3cd9a09
package
com.topjohnwu.magisk.ui.base
import
android.content.Intent
interface
ActivityResultListener
{
fun
onActivityResult
(
resultCode
:
Int
,
data
:
Intent
?)
}
\ No newline at end of file
app/src/main/java/com/topjohnwu/magisk/ui/base/BaseActivity.java
deleted
100644 → 0
View file @
e426090a
package
com
.
topjohnwu
.
magisk
.
ui
.
base
;
import
android.Manifest
;
import
android.content.Context
;
import
android.content.Intent
;
import
android.content.SharedPreferences
;
import
android.content.pm.ActivityInfo
;
import
android.content.pm.PackageManager
;
import
android.os.Build
;
import
android.os.Bundle
;
import
android.text.TextUtils
;
import
android.view.WindowManager
;
import
com.topjohnwu.magisk.App
;
import
com.topjohnwu.magisk.Config
;
import
com.topjohnwu.magisk.Const
;
import
com.topjohnwu.magisk.R
;
import
com.topjohnwu.magisk.utils.Event
;
import
com.topjohnwu.magisk.utils.LocaleManager
;
import
androidx.annotation.NonNull
;
import
androidx.annotation.Nullable
;
import
androidx.annotation.StyleRes
;
import
androidx.appcompat.app.AppCompatActivity
;
import
androidx.collection.SparseArrayCompat
;
import
androidx.core.app.ActivityCompat
;
import
androidx.core.content.ContextCompat
;
/**
* @deprecated This class is not to be used. It is marked for deletion.
*/
@Deprecated
public
abstract
class
BaseActivity
extends
AppCompatActivity
implements
Event
.
AutoListener
,
IBaseLeanback
{
static
int
[]
EMPTY_INT_ARRAY
=
new
int
[
0
];
private
final
SparseArrayCompat
<
ActivityResultListener
>
resultListeners
=
new
SparseArrayCompat
<>();
public
App
app
=
App
.
self
;
@Override
public
int
[]
getListeningEvents
()
{
return
EMPTY_INT_ARRAY
;
}
@Override
public
void
onEvent
(
int
event
)
{}
@StyleRes
public
int
getDarkTheme
()
{
return
-
1
;
}
@Override
protected
void
attachBaseContext
(
Context
base
)
{
super
.
attachBaseContext
(
LocaleManager
.
getLocaleContext
(
base
,
LocaleManager
.
locale
));
}
@Override
protected
void
onCreate
(
@Nullable
Bundle
savedInstanceState
)
{
Event
.
register
(
this
);
if
(
getDarkTheme
()
!=
-
1
&&
(
boolean
)
Config
.
get
(
Config
.
Key
.
DARK_THEME
))
{
setTheme
(
getDarkTheme
());
}
super
.
onCreate
(
savedInstanceState
);
}
@Override
protected
void
onDestroy
()
{
Event
.
unregister
(
this
);
super
.
onDestroy
();
}
protected
void
setFloating
()
{
boolean
isTablet
=
getResources
().
getBoolean
(
R
.
bool
.
isTablet
);
if
(
isTablet
)
{
WindowManager
.
LayoutParams
params
=
getWindow
().
getAttributes
();
params
.
height
=
getResources
().
getDimensionPixelSize
(
R
.
dimen
.
floating_height
);
params
.
width
=
getResources
().
getDimensionPixelSize
(
R
.
dimen
.
floating_width
);
params
.
alpha
=
1.0f
;
params
.
dimAmount
=
0.6f
;
params
.
flags
|=
2
;
getWindow
().
setAttributes
(
params
);
setFinishOnTouchOutside
(
true
);
}
}
protected
void
lockOrientation
()
{
if
(
Build
.
VERSION
.
SDK_INT
<
18
)
setRequestedOrientation
(
getResources
().
getConfiguration
().
orientation
);
else
setRequestedOrientation
(
ActivityInfo
.
SCREEN_ORIENTATION_LOCKED
);
}
public
static
void
runWithPermissions
(
Context
context
,
String
[]
permissions
,
Runnable
callback
)
{
boolean
granted
=
true
;
for
(
String
perm
:
permissions
)
{
if
(
ContextCompat
.
checkSelfPermission
(
context
,
perm
)
!=
PackageManager
.
PERMISSION_GRANTED
)
granted
=
false
;
}
if
(
granted
)
{
Const
.
EXTERNAL_PATH
.
mkdirs
();
callback
.
run
();
}
else
{
// Passed in context should be an activity if not granted, need to show dialog!
if
(
context
instanceof
BaseActivity
)
{
BaseActivity
activity
=
(
BaseActivity
)
context
;
int
code
=
callback
.
hashCode
()
&
0xFFFF
;
activity
.
resultListeners
.
put
(
code
,
(
i
,
d
)
->
callback
.
run
());
ActivityCompat
.
requestPermissions
(
activity
,
permissions
,
code
);
}
}
}
@Override
public
final
void
runWithExternalRW
(
Runnable
callback
)
{
runWithPermissions
(
new
String
[]{
Manifest
.
permission
.
WRITE_EXTERNAL_STORAGE
},
callback
);
}
@Override
public
final
void
runWithPermissions
(
String
[]
permissions
,
Runnable
callback
)
{
runWithPermissions
(
this
,
permissions
,
callback
);
}
@Override
protected
void
onActivityResult
(
int
requestCode
,
int
resultCode
,
Intent
data
)
{
onActivityResultListener
(
requestCode
,
resultCode
,
data
);
}
private
void
onActivityResultListener
(
int
requestCode
,
int
resultCode
,
Intent
data
)
{
ActivityResultListener
listener
=
resultListeners
.
get
(
requestCode
);
if
(
listener
!=
null
)
{
resultListeners
.
remove
(
requestCode
);
listener
.
onActivityResult
(
resultCode
,
data
);
}
}
@Override
public
final
void
startActivityForResult
(
Intent
intent
,
int
requestCode
,
ActivityResultListener
listener
)
{
resultListeners
.
put
(
requestCode
,
listener
);
startActivityForResult
(
intent
,
requestCode
);
}
@Override
public
void
onRequestPermissionsResult
(
int
requestCode
,
@NonNull
String
[]
permissions
,
@NonNull
int
[]
grantResults
)
{
boolean
grant
=
true
;
for
(
int
result
:
grantResults
)
{
if
(
result
!=
PackageManager
.
PERMISSION_GRANTED
)
grant
=
false
;
}
if
(
grant
)
onActivityResultListener
(
requestCode
,
0
,
null
);
else
resultListeners
.
remove
(
requestCode
);
}
public
interface
ActivityResultListener
{
void
onActivityResult
(
int
resultCode
,
Intent
data
);
}
@Override
public
SharedPreferences
getSharedPreferences
(
String
name
,
int
mode
)
{
if
(
TextUtils
.
equals
(
name
,
getPackageName
()
+
"_preferences"
))
return
app
.
getPrefs
();
return
super
.
getSharedPreferences
(
name
,
mode
);
}
}
app/src/main/java/com/topjohnwu/magisk/ui/base/BaseFragment.java
deleted
100644 → 0
View file @
e426090a
package
com
.
topjohnwu
.
magisk
.
ui
.
base
;
import
android.content.Intent
;
import
com.topjohnwu.magisk.App
;
import
com.topjohnwu.magisk.utils.Event
;
import
androidx.fragment.app.Fragment
;
import
butterknife.Unbinder
;
/**
* @deprecated This class is not to be used. It is marked for deletion.
*/
@Deprecated
public
abstract
class
BaseFragment
extends
Fragment
implements
Event
.
AutoListener
{
public
App
app
=
App
.
self
;
protected
Unbinder
unbinder
=
null
;
@Override
public
void
onResume
()
{
super
.
onResume
();
Event
.
register
(
this
);
}
@Override
public
void
onPause
()
{
Event
.
unregister
(
this
);
super
.
onPause
();
}
@Override
public
void
onDestroyView
()
{
super
.
onDestroyView
();
if
(
unbinder
!=
null
)
unbinder
.
unbind
();
}
@Override
public
void
startActivityForResult
(
Intent
intent
,
int
requestCode
)
{
startActivityForResult
(
intent
,
requestCode
,
(
resultCode
,
data
)
->
onActivityResult
(
requestCode
,
resultCode
,
data
));
}
public
void
startActivityForResult
(
Intent
intent
,
int
requestCode
,
BaseActivity
.
ActivityResultListener
listener
)
{
((
IBaseLeanback
)
requireActivity
()).
startActivityForResult
(
intent
,
requestCode
,
listener
);
}
protected
void
runWithExternalRW
(
Runnable
callback
)
{
((
IBaseLeanback
)
requireActivity
()).
runWithExternalRW
(
callback
);
}
@Override
public
int
[]
getListeningEvents
()
{
return
BaseActivity
.
EMPTY_INT_ARRAY
;
}
@Override
public
void
onEvent
(
int
event
)
{}
}
app/src/main/java/com/topjohnwu/magisk/ui/base/BasePreferenceFragment.java
View file @
f3cd9a09
...
@@ -42,7 +42,7 @@ public abstract class BasePreferenceFragment extends PreferenceFragmentCompat
...
@@ -42,7 +42,7 @@ public abstract class BasePreferenceFragment extends PreferenceFragmentCompat
@Override
@Override
public
int
[]
getListeningEvents
()
{
public
int
[]
getListeningEvents
()
{
return
BaseActivity
.
EMPTY_INT_ARRAY
;
return
new
int
[
0
]
;
}
}
@Override
@Override
...
...
app/src/main/java/com/topjohnwu/magisk/ui/base/IBaseLeanback.kt
View file @
f3cd9a09
...
@@ -6,10 +6,6 @@ interface IBaseLeanback {
...
@@ -6,10 +6,6 @@ interface IBaseLeanback {
fun
runWithExternalRW
(
callback
:
Runnable
)
fun
runWithExternalRW
(
callback
:
Runnable
)
fun
runWithPermissions
(
vararg
permissions
:
String
,
callback
:
Runnable
)
fun
runWithPermissions
(
vararg
permissions
:
String
,
callback
:
Runnable
)
fun
startActivityForResult
(
fun
startActivityForResult
(
intent
:
Intent
,
requestCode
:
Int
,
listener
:
ActivityResultListener
)
intent
:
Intent
,
requestCode
:
Int
,
listener
:
BaseActivity
.
ActivityResultListener
)
}
}
\ No newline at end of file
app/src/main/java/com/topjohnwu/magisk/ui/base/MagiskLeanbackActivity.kt
View file @
f3cd9a09
...
@@ -15,7 +15,7 @@ import com.topjohnwu.magisk.Const
...
@@ -15,7 +15,7 @@ import com.topjohnwu.magisk.Const
abstract
class
MagiskLeanbackActivity
<
ViewModel
:
MagiskViewModel
,
Binding
:
ViewDataBinding
>
:
abstract
class
MagiskLeanbackActivity
<
ViewModel
:
MagiskViewModel
,
Binding
:
ViewDataBinding
>
:
TeanityActivity
<
ViewModel
,
Binding
>(),
IBaseLeanback
{
TeanityActivity
<
ViewModel
,
Binding
>(),
IBaseLeanback
{
private
val
resultListeners
=
SparseArrayCompat
<
BaseActivity
.
ActivityResultListener
>()
private
val
resultListeners
=
SparseArrayCompat
<
ActivityResultListener
>()
@Deprecated
(
"Permissions will be checked in a different streamlined way"
)
@Deprecated
(
"Permissions will be checked in a different streamlined way"
)
fun
runWithExternalRW
(
callback
:
()
->
Unit
)
=
runWithExternalRW
(
Runnable
{
callback
()
})
fun
runWithExternalRW
(
callback
:
()
->
Unit
)
=
runWithExternalRW
(
Runnable
{
callback
()
})
...
@@ -56,7 +56,7 @@ abstract class MagiskLeanbackActivity<ViewModel : MagiskViewModel, Binding : Vie
...
@@ -56,7 +56,7 @@ abstract class MagiskLeanbackActivity<ViewModel : MagiskViewModel, Binding : Vie
override
fun
startActivityForResult
(
override
fun
startActivityForResult
(
intent
:
Intent
,
intent
:
Intent
,
requestCode
:
Int
,
requestCode
:
Int
,
listener
:
BaseActivity
.
ActivityResultListener
listener
:
ActivityResultListener
)
{
)
{
resultListeners
.
put
(
requestCode
,
listener
)
resultListeners
.
put
(
requestCode
,
listener
)
startActivityForResult
(
intent
,
requestCode
)
startActivityForResult
(
intent
,
requestCode
)
...
...
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