MarcoBuster/Magisk
1
1
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Removed old Base[Activity/Fragment]

Browse Source
This commit is contained in:
Viktor De Pasquale 2019-04-27 11:49:25 +02:00
parent e426090a18
commit f3cd9a096a
6 changed files with 11 additions and 235 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/src/main/java/com/topjohnwu/magisk/ui/base/ActivityResultListener.kt Normal file
View File

@ -0,0 +1,7 @@
package com.topjohnwu.magisk.ui.base
import android.content.Intent
interface ActivityResultListener {
fun onActivityResult(resultCode: Int, data: Intent?)
}

166
app/src/main/java/com/topjohnwu/magisk/ui/base/BaseActivity.java
View File

@ -1,166 +0,0 @@
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);
}
}

61
app/src/main/java/com/topjohnwu/magisk/ui/base/BaseFragment.java
View File

@ -1,61 +0,0 @@
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) {}
}

2
app/src/main/java/com/topjohnwu/magisk/ui/base/BasePreferenceFragment.java
View File

@ -42,7 +42,7 @@ public abstract class BasePreferenceFragment extends PreferenceFragmentCompat
@Override
public int[] getListeningEvents() {
return BaseActivity.EMPTY_INT_ARRAY;
return new int[0];
}
@Override

6
app/src/main/java/com/topjohnwu/magisk/ui/base/IBaseLeanback.kt
View File

@ -6,10 +6,6 @@ interface IBaseLeanback {
fun runWithExternalRW(callback: Runnable)
fun runWithPermissions(vararg permissions: String, callback: Runnable)
fun startActivityForResult(
intent: Intent,
requestCode: Int,
listener: BaseActivity.ActivityResultListener
)
fun startActivityForResult(intent: Intent, requestCode: Int, listener: ActivityResultListener)
}

4
app/src/main/java/com/topjohnwu/magisk/ui/base/MagiskLeanbackActivity.kt
View File

@ -15,7 +15,7 @@ import com.topjohnwu.magisk.Const
abstract class MagiskLeanbackActivity<ViewModel : MagiskViewModel, Binding : ViewDataBinding> :
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")
fun runWithExternalRW(callback: () -> Unit) = runWithExternalRW(Runnable { callback() })
@ -56,7 +56,7 @@ abstract class MagiskLeanbackActivity<ViewModel : MagiskViewModel, Binding : Vie
override fun startActivityForResult(
intent: Intent,
requestCode: Int,
listener: BaseActivity.ActivityResultListener
listener: ActivityResultListener
) {
resultListeners.put(requestCode, listener)
startActivityForResult(intent, requestCode)