mirror of
https://github.com/2009scape/2009Scape-mobile.git
synced 2025-12-18 20:40:11 -07:00
A lot of changes
* Custom controls: - Rename classes - Add Dynamic position calculator for auto scale. TODO: document position variables * Source code - Abstracts MainActivity.java to prepare implement custom control.
This commit is contained in:
parent
67a0babb7a
commit
84f97f3ccd
24 changed files with 1682 additions and 1591 deletions
|
|
@ -98,7 +98,7 @@ public final class Tools
|
|||
|
||||
@Override
|
||||
public void onClick(DialogInterface p1, int p2){
|
||||
MainActivity.fullyExit();
|
||||
BaseMainActivity.fullyExit();
|
||||
}
|
||||
});
|
||||
dialog.show();
|
||||
|
|
@ -202,7 +202,7 @@ public final class Tools
|
|||
}
|
||||
}
|
||||
|
||||
String[] argsFromJson = insertVariableArgument(
|
||||
String[] argsFromJson = JSONUtils.insertJSONValueList(
|
||||
splitAndFilterEmpty(
|
||||
versionInfo.minecraftArguments == null ?
|
||||
fromStringArray(minecraftArgs.toArray(new String[0])):
|
||||
|
|
@ -241,22 +241,6 @@ public final class Tools
|
|||
return strList.toArray(new String[0]);
|
||||
}
|
||||
|
||||
private static String[] insertVariableArgument(String[] args, Map<String, String> keyValueMap) {
|
||||
for (int i = 0; i < args.length; i++) {
|
||||
String arg = args[i];
|
||||
String argVar = null;
|
||||
if (arg.startsWith("${") && arg.endsWith("}")) {
|
||||
argVar = arg.substring(2, arg.length() - 1);
|
||||
for (Map.Entry<String, String> keyValue : keyValueMap.entrySet()) {
|
||||
if (argVar.equals(keyValue.getKey())) {
|
||||
args[i] = keyValue.getValue();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
return args;
|
||||
}
|
||||
|
||||
public static String artifactToPath(String group, String artifact, String version) {
|
||||
return group.replaceAll("\\.", "/") + "/" + artifact + "/" + version + "/" + artifact + "-" + version + ".jar";
|
||||
}
|
||||
|
|
@ -432,8 +416,8 @@ public final class Tools
|
|||
public void onClick(DialogInterface p1, int p2)
|
||||
{
|
||||
if(exitIfOk) {
|
||||
if (ctx instanceof MainActivity) {
|
||||
MainActivity.fullyExit();
|
||||
if (ctx instanceof BaseMainActivity) {
|
||||
BaseMainActivity.fullyExit();
|
||||
} else if (ctx instanceof Activity) {
|
||||
((Activity) ctx).finish();
|
||||
}
|
||||
|
|
@ -456,8 +440,8 @@ public final class Tools
|
|||
android.content.ClipboardManager mgr = (android.content.ClipboardManager) ctx.getSystemService(Context.CLIPBOARD_SERVICE);
|
||||
mgr.setPrimaryClip(ClipData.newPlainText("error", Log.getStackTraceString(e)));
|
||||
if(exitIfOk) {
|
||||
if (ctx instanceof MainActivity) {
|
||||
MainActivity.fullyExit();
|
||||
if (ctx instanceof BaseMainActivity) {
|
||||
BaseMainActivity.fullyExit();
|
||||
} else {
|
||||
((Activity) ctx).finish();
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue