Skip to content
This repository was archived by the owner on May 4, 2023. It is now read-only.

Commit 241c508

Browse files
Fox2CodeFox2Code
committed
Switch to FoxCompat library.
1 parent d8b42f1 commit 241c508

17 files changed

+57
-1001
lines changed

‎app/build.gradle‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,9 +91,10 @@ dependencies {
9191
implementation 'com.google.android.material:material:1.6.1'
9292
implementation "com.mikepenz:aboutlibraries:${latestAboutLibsRelease}"
9393
implementation "dev.rikka.rikkax.layoutinflater:layoutinflater:1.2.0"
94-
implementation "dev.rikka.rikkax.insets:insets:1.2.0"
94+
implementation "dev.rikka.rikkax.insets:insets:1.3.0"
9595
implementation 'com.github.Dimezis:BlurView:version-1.6.6'
9696
implementation 'com.github.KieronQuinn:MonetCompat:0.4.1'
97+
implementation 'com.github.Fox2Code:FoxCompat:0.0.1'
9798

9899
// Utils
99100
implementation 'com.squareup.okhttp3:okhttp-dnsoverhttps:4.9.3'

‎app/src/main/java/com/fox2code/mmm/MainActivity.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
import androidx.recyclerview.widget.RecyclerView;
2222
import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
2323

24-
import com.fox2code.mmm.compat.CompatActivity;
25-
import com.fox2code.mmm.compat.CompatDisplay;
24+
import com.fox2code.foxcompat.FoxActivity;
25+
import com.fox2code.foxcompat.FoxDisplay;
2626
import com.fox2code.mmm.installer.InstallerInitializer;
2727
import com.fox2code.mmm.manager.LocalModuleInfo;
2828
import com.fox2code.mmm.manager.ModuleManager;
@@ -37,7 +37,7 @@
3737
import eightbitlab.com.blurview.BlurView;
3838
import eightbitlab.com.blurview.RenderScriptBlur;
3939

40-
public class MainActivity extends CompatActivity implements SwipeRefreshLayout.OnRefreshListener,
40+
public class MainActivity extends FoxActivity implements SwipeRefreshLayout.OnRefreshListener,
4141
SearchView.OnQueryTextListener, SearchView.OnCloseListener,
4242
OverScrollManager.OverScrollHelper {
4343
private static final String TAG = "MainActivity";
@@ -116,7 +116,7 @@ public void onScrollStateChanged(@NonNull RecyclerView recyclerView, int newStat
116116
}
117117
});
118118
this.searchCard.setRadius(this.searchCard.getHeight() / 2F);
119-
this.searchView.setMinimumHeight(CompatDisplay.dpToPixel(16));
119+
this.searchView.setMinimumHeight(FoxDisplay.dpToPixel(16));
120120
this.searchView.setImeOptions(EditorInfo.IME_ACTION_SEARCH |
121121
EditorInfo.IME_FLAG_NO_FULLSCREEN);
122122
this.searchView.setOnQueryTextListener(this);
@@ -249,8 +249,8 @@ private void updateScreenInsets(Configuration configuration) {
249249
swipeRefreshLayoutOrigStartOffset + combinedBarsHeight,
250250
swipeRefreshLayoutOrigEndOffset + combinedBarsHeight);
251251
this.moduleViewListBuilder.setHeaderPx(Math.max(statusBarHeight,
252-
combinedBarsHeight - CompatDisplay.dpToPixel(4)));
253-
this.moduleViewListBuilder.setFooterPx(CompatDisplay.dpToPixel(4) +
252+
combinedBarsHeight - FoxDisplay.dpToPixel(4)));
253+
this.moduleViewListBuilder.setFooterPx(FoxDisplay.dpToPixel(4) +
254254
bottomInset + this.searchCard.getHeight());
255255
this.searchCard.setRadius(this.searchCard.getHeight() / 2F);
256256
this.moduleViewListBuilder.updateInsets();

‎app/src/main/java/com/fox2code/mmm/MainApplication.java‎

Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,13 @@
1818
import androidx.emoji2.text.EmojiCompat;
1919
import androidx.emoji2.text.FontRequestEmojiCompatConfig;
2020

21-
import com.fox2code.mmm.compat.CompatActivity;
22-
import com.fox2code.mmm.compat.CompatApplication;
23-
import com.fox2code.mmm.compat.CompatThemeWrapper;
21+
import com.fox2code.foxcompat.FoxActivity;
22+
import com.fox2code.foxcompat.FoxApplication;
23+
import com.fox2code.foxcompat.FoxThemeWrapper;
2424
import com.fox2code.mmm.installer.InstallerInitializer;
2525
import com.fox2code.mmm.utils.GMSProviderInstaller;
2626
import com.fox2code.mmm.utils.Http;
2727
import com.fox2code.rosettax.LanguageSwitcher;
28-
import com.google.android.material.color.DynamicColors;
29-
import com.google.android.material.color.DynamicColorsOptions;
3028
import com.topjohnwu.superuser.Shell;
3129

3230
import java.text.SimpleDateFormat;
@@ -49,7 +47,7 @@
4947
includeAll = true,
5048
grammarLocatorClassName = ".Prism4jGrammarLocator"
5149
)
52-
public class MainApplication extends CompatApplication {
50+
public class MainApplication extends FoxApplication {
5351
private static final String timeFormatString = "dd MMM yyyy"; // Example: 13 july 2001
5452
private static Locale timeFormatLocale =
5553
Resources.getSystem().getConfiguration().locale;
@@ -175,16 +173,16 @@ public static String formatTime(long timeStamp) {
175173

176174
@StyleRes
177175
private int managerThemeResId = R.style.Theme_MagiskModuleManager;
178-
private CompatThemeWrapper markwonThemeContext;
176+
private FoxThemeWrapper markwonThemeContext;
179177
private Markwon markwon;
180178

181179
public Markwon getMarkwon() {
182180
if (this.markwon != null)
183181
return this.markwon;
184-
CompatThemeWrapper contextThemeWrapper = this.markwonThemeContext;
182+
FoxThemeWrapper contextThemeWrapper = this.markwonThemeContext;
185183
if (contextThemeWrapper == null) {
186184
contextThemeWrapper = this.markwonThemeContext =
187-
new CompatThemeWrapper(this, this.managerThemeResId);
185+
new FoxThemeWrapper(this, this.managerThemeResId);
188186
}
189187
Markwon markwon = Markwon.builder(contextThemeWrapper).usePlugin(HtmlPlugin.create())
190188
.usePlugin(SyntaxHighlightPlugin.create(
@@ -194,8 +192,8 @@ public Markwon getMarkwon() {
194192
return this.markwon = markwon;
195193
}
196194

197-
public CompatThemeWrapper getMarkwonThemeContext() {
198-
return markwonThemeContext;
195+
public FoxThemeWrapper getMarkwonThemeContext() {
196+
return this.markwonThemeContext;
199197
}
200198

201199
private class Prism4jSwitchTheme implements Prism4jTheme {
@@ -278,7 +276,7 @@ public boolean isLightTheme() {
278276
case R.style.Theme_MagiskModuleManager_Dark:
279277
return false;
280278
default:
281-
throw new IllegalStateException("Non manager theme!");
279+
return super.isLightTheme();
282280
}
283281
}
284282

@@ -330,13 +328,13 @@ public void onCreate() {
330328
}
331329

332330
@Override
333-
public void onCreateCompatActivity(CompatActivity compatActivity) {
334-
super.onCreateCompatActivity(compatActivity);
331+
public void onCreateFoxActivity(FoxActivity compatActivity) {
332+
super.onCreateFoxActivity(compatActivity);
335333
compatActivity.setTheme(this.managerThemeResId);
336334
}
337335

338336
@Override
339-
public void onRefreshUI(CompatActivity compatActivity) {
337+
public void onRefreshUI(FoxActivity compatActivity) {
340338
super.onRefreshUI(compatActivity);
341339
compatActivity.setThemeRecreate(this.managerThemeResId);
342340
}

‎app/src/main/java/com/fox2code/mmm/NotificationType.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
import androidx.annotation.DrawableRes;
99
import androidx.annotation.StringRes;
1010

11-
import com.fox2code.mmm.compat.CompatActivity;
11+
import com.fox2code.foxcompat.FoxActivity;
1212
import com.fox2code.mmm.installer.InstallerInitializer;
1313
import com.fox2code.mmm.repo.RepoManager;
1414
import com.fox2code.mmm.utils.Files;
@@ -75,7 +75,7 @@ public boolean shouldRemove() {
7575
},
7676
INSTALL_FROM_STORAGE(R.string.install_from_storage, R.drawable.ic_baseline_storage_24,
7777
R.attr.colorBackgroundFloating, R.attr.colorOnBackground, v -> {
78-
CompatActivity compatActivity = CompatActivity.getCompatActivity(v);
78+
FoxActivity compatActivity = FoxActivity.getFoxActivity(v);
7979
final File module = new File(compatActivity.getCacheDir(),
8080
"installer" + File.separator + "module.zip");
8181
IntentHelper.openFileTo(compatActivity, module, (d, u, s) -> {

‎app/src/main/java/com/fox2code/mmm/androidacy/AndroidacyActivity.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,12 @@
2222
import androidx.webkit.WebViewClientCompat;
2323
import androidx.webkit.WebViewFeature;
2424

25+
import com.fox2code.foxcompat.FoxActivity;
2526
import com.fox2code.mmm.BuildConfig;
2627
import com.fox2code.mmm.Constants;
2728
import com.fox2code.mmm.MainApplication;
2829
import com.fox2code.mmm.R;
2930
import com.fox2code.mmm.XHooks;
30-
import com.fox2code.mmm.compat.CompatActivity;
3131
import com.fox2code.mmm.utils.Http;
3232
import com.fox2code.mmm.utils.IntentHelper;
3333

@@ -36,7 +36,7 @@
3636
/**
3737
* Per Androidacy repo implementation agreement, no request of this WebView shall be modified.
3838
*/
39-
public class AndroidacyActivity extends CompatActivity {
39+
public class AndroidacyActivity extends FoxActivity {
4040
private static final String TAG = "AndroidacyActivity";
4141

4242
static {
@@ -166,7 +166,7 @@ public void onReceivedError(@NonNull WebView view, @NonNull WebResourceRequest r
166166
@Override
167167
public boolean onShowFileChooser(WebView webView, ValueCallback<Uri[]> filePathCallback,
168168
FileChooserParams fileChooserParams) {
169-
CompatActivity.getCompatActivity(webView).startActivityForResult(
169+
FoxActivity.getFoxActivity(webView).startActivityForResult(
170170
fileChooserParams.createIntent(), (code, data) ->
171171
filePathCallback.onReceiveValue(
172172
FileChooserParams.parseResult(code, data)));

‎app/src/main/java/com/fox2code/mmm/androidacy/AndroidacyWebAPI.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@
1616
import androidx.core.content.ContextCompat;
1717
import androidx.core.graphics.ColorUtils;
1818

19+
import com.fox2code.foxcompat.FoxDisplay;
1920
import com.fox2code.mmm.BuildConfig;
2021
import com.fox2code.mmm.MainApplication;
2122
import com.fox2code.mmm.R;
22-
import com.fox2code.mmm.compat.CompatDisplay;
2323
import com.fox2code.mmm.installer.InstallerInitializer;
2424
import com.fox2code.mmm.manager.LocalModuleInfo;
2525
import com.fox2code.mmm.manager.ModuleInfo;
@@ -111,7 +111,7 @@ void openNativeModuleDialogRaw(String moduleUrl, String installTitle,
111111
if (!this.activity.backOnResume)
112112
this.consumedAction = false;
113113
});
114-
final int dim5dp = CompatDisplay.dpToPixel(5);
114+
final int dim5dp = FoxDisplay.dpToPixel(5);
115115
builder.setBackgroundInsetStart(dim5dp).setBackgroundInsetEnd(dim5dp);
116116
this.activity.runOnUiThread(() -> {
117117
AlertDialog alertDialog = builder.show();

0 commit comments

Comments
 (0)