mirrors/Panda3DS
1
0
Fork 0
mirror of https://github.com/wheremyfoodat/Panda3DS.git synced 2025-04-21 20:15:04 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

bonk

Browse source
This commit is contained in:
wheremyfoodat 2024-01-16 20:58:35 +02:00
parent ebf02257cf
commit 150ca43cf0
13 changed files with 64 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/PandroidApplication.java
View file

@ -35,6 +35,7 @@ public class PandroidApplication extends Application {
case GlobalConfig.THEME_BLACK:
return R.style.Theme_Pandroid_Black;
}
return R.style.Theme_Pandroid;
}
@ -46,6 +47,7 @@ public class PandroidApplication extends Application {
case GlobalConfig.THEME_LIGHT:
return false;
}
Resources res = Resources.getSystem();
int nightFlags = res.getConfiguration().uiMode & Configuration.UI_MODE_NIGHT_MASK;
return nightFlags == Configuration.UI_MODE_NIGHT_YES;

1
src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/base/BottomDialogFragment.java
View file

@ -22,6 +22,7 @@ public class BottomDialogFragment extends DialogFragment {
Dialog dialog = super.onCreateDialog(savedInstanceState);
dialog.getWindow().setGravity(Gravity.CENTER | Gravity.BOTTOM);
dialog.getWindow().getAttributes().y = Math.round(getContext().getResources().getDisplayMetrics().density * 15);
return dialog;
}
}

16
src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/editor/CodeEditorActivity.java
View file

@ -26,7 +26,7 @@ import com.panda3ds.pandroid.view.code.syntax.CodeSyntax;
import java.io.Serializable;
public class CodeEditorActivity extends BaseActivity {
private static final String TAB_CONTENT = " ";
private static final String TAB = " ";
private String path;
private String fileName;
private CodeEditor editor;
@ -34,7 +34,6 @@ public class CodeEditorActivity extends BaseActivity {
private View saveButton;
private boolean changed = false;
@Override
protected void onCreate(@Nullable Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
@ -56,9 +55,10 @@ public class CodeEditorActivity extends BaseActivity {
new Task(() -> {
String content = FileUtils.readTextFile(path + "/" + fileName);
editor.post(() -> {
editor.setText(content);
editor.setSyntax(CodeSyntax.obtainByFileName(fileName));
editor.setSyntax(CodeSyntax.getFromFilename(fileName));
editor.setOnContentChangedListener(this::onDocumentContentChanged);
});
}).start();
@ -78,7 +78,7 @@ public class CodeEditorActivity extends BaseActivity {
((InputMethodManager) getSystemService(INPUT_METHOD_SERVICE)).hideSoftInputFromWindow(v.getWindowToken(), 0);
});
findViewById(R.id.key_tab).setOnClickListener(v -> {
editor.insert(TAB_CONTENT);
editor.insert(TAB);
});
}
@ -115,14 +115,16 @@ public class CodeEditorActivity extends BaseActivity {
@SuppressLint("SetTextI18n")
private void onDocumentContentChanged() {
title.setText("*" + fileName);
changed = true;
title.setText("*" + fileName);
saveButton.setVisibility(View.VISIBLE);
}
public void save() {
title.setText(fileName);
saveButton.setVisibility(View.GONE);
changed = false;
new Task(() -> FileUtils.writeTextFile(path, fileName, String.valueOf(editor.getText()))).runSync();
}
@ -131,10 +133,12 @@ public class CodeEditorActivity extends BaseActivity {
public boolean dispatchKeyEvent(KeyEvent event) {
if (event.getKeyCode() == KeyEvent.KEYCODE_TAB) {
if (event.getAction() == KeyEvent.ACTION_UP) {
editor.insert(TAB_CONTENT);
editor.insert(TAB);
}
return true;
}
return super.dispatchKeyEvent(event);
}

3
src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/game/DrawerFragment.java
View file

@ -55,6 +55,7 @@ public class DrawerFragment extends Fragment implements DrawerLayout.DrawerListe
if (drawerContainer != null) {
drawerContainer.removeDrawerListener(this);
}
super.onDetach();
}
@ -104,7 +105,7 @@ public class DrawerFragment extends Fragment implements DrawerLayout.DrawerListe
} else if (id == R.id.exit) {
requireActivity().finish();
} else if (id == R.id.lua_script){
new LuaDialogFragment().show(getParentFragmentManager(),null);
new LuaDialogFragment().show(getParentFragmentManager(), null);
}
return false;

7
src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/game/LuaDialogFragment.java
View file

@ -27,7 +27,6 @@ import java.util.ArrayList;
import java.util.UUID;
public class LuaDialogFragment extends BottomDialogFragment {
private final SimpleListAdapter<LuaFile> adapter = new SimpleListAdapter<>(R.layout.holder_lua_script, this::onCreateListItem);
private ActivityResultLauncher<CodeEditorActivity.Arguments> codeEditorLauncher;
private LuaFile currentEditorFile;
@ -47,6 +46,7 @@ public class LuaDialogFragment extends BottomDialogFragment {
openDocumentLauncher = registerForActivityResult(new ActivityResultContracts.OpenDocument(), result -> {
if (result != null) {
String fileName = FileUtils.getName(result.toString());
if (fileName.toLowerCase().endsWith(".lua")) {
new Task(() -> {
String content = FileUtils.readTextFile(result.toString());
@ -66,6 +66,7 @@ public class LuaDialogFragment extends BottomDialogFragment {
break;
}
}
orderByModified();
});
}
@ -90,6 +91,7 @@ public class LuaDialogFragment extends BottomDialogFragment {
}).setTitle(R.string.create_new)
.show();
});
((RecyclerView) view.findViewById(R.id.recycler)).setAdapter(adapter);
((RecyclerView) view.findViewById(R.id.recycler)).setLayoutManager(new AutoFitGridLayout(getContext(), 140));
FileUtils.createDir(FileUtils.getResourcesPath(), "Lua Scripts");
@ -117,6 +119,7 @@ public class LuaDialogFragment extends BottomDialogFragment {
adapter.addAll(file);
orderByModified();
});
return file;
}
@ -137,6 +140,7 @@ public class LuaDialogFragment extends BottomDialogFragment {
private void loadScript(LuaFile file) {
dismiss();
Toast.makeText(getContext(), String.format(getString(R.string.running_ff), file.name), Toast.LENGTH_SHORT).show();
new Task(() -> {
String script = FileUtils.readTextFile(file.absolutePath());
@ -148,6 +152,7 @@ public class LuaDialogFragment extends BottomDialogFragment {
@Override
public void onDestroy() {
super.onDestroy();
openDocumentLauncher.unregister();
codeEditorLauncher.unregister();
}

25
src/pandroid/app/src/main/java/com/panda3ds/pandroid/utils/FileUtils.java
View file

@ -102,6 +102,7 @@ public class FileUtils {
return true;
}
public static String readTextFile(String path) {
if (!exists(path)) {
return null;
@ -189,16 +190,22 @@ public class FileUtils {
public static void updateFile(String path){
DocumentFile file = parseFile(path);
Uri uri = file.getUri();
switch (uri.getScheme()){
switch (uri.getScheme()) {
case "file": {
new File(uri.getPath()).setLastModified(System.currentTimeMillis());
}break;
case "content":{
getContext().getContentResolver().update(uri, null,null, null);
}break;
default:{
Log.w(Constants.LOG_TAG, "Cannot update file from scheme: "+uri.getScheme());
}break;
break;
}
case "content": {
getContext().getContentResolver().update(uri, null, null, null);
break;
}
default: {
Log.w(Constants.LOG_TAG, "Cannot update file from scheme: " + uri.getScheme());
break;
}
}
}
@ -209,10 +216,12 @@ public class FileUtils {
public static String[] listFiles(String path){
DocumentFile folder = parseFile(path);
DocumentFile[] files = folder.listFiles();
String[] result = new String[files.length];
for (int i = 0; i < result.length; i++){
result[i] = files[i].getName();
}
return result;
}
}

19
src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/code/BaseEditor.java
View file

@ -37,8 +37,8 @@ public class BaseEditor extends BasicTextEditor {
private final char[] textBuffer = new char[1];
protected final int[] colors = new int[256];
//512KB OF BUFFER
protected final byte[] syntaxBuffer = new byte[1024 * 512];
// Allocate 512KB for the buffer
protected final byte[] syntaxBuffer = new byte[512 * 1024];
private boolean requireUpdate = true;
public BaseEditor(@NonNull Context context) {
@ -89,6 +89,7 @@ public class BaseEditor extends BasicTextEditor {
} else {
drawSelection(canvas);
}
drawText(canvas);
drawLineCount(canvas);
} catch (Throwable e) {
@ -102,6 +103,7 @@ public class BaseEditor extends BasicTextEditor {
paint.setColor(Color.WHITE);
canvas.drawText("Editor draw error:", getPaddingLeft(), getLineHeight(), paint);
canvas.drawText(String.valueOf(e), getPaddingLeft(), getLineHeight() * 2, paint);
int index = 2;
for (StackTraceElement trace : e.getStackTrace()) {
index++;
@ -122,7 +124,6 @@ public class BaseEditor extends BasicTextEditor {
{
int ascent = (int) Math.abs(fontMetrics.ascent);
paint.getTextBounds(HELLO_WORLD, 0, HELLO_WORLD.length(), rect);
;
textOffset = Math.max(((lineHeight - rect.height()) / 2), 0) + ascent;
}
@ -173,6 +174,7 @@ public class BaseEditor extends BasicTextEditor {
} else {
paint.setColor(colorDisable);
}
float width = paint.measureText(text);
canvas.drawText(text, getPaddingLeft() - width - (spaceWidth * 2.5f), (i * lineHeight) + textOffset, paint);
}
@ -202,13 +204,15 @@ public class BaseEditor extends BasicTextEditor {
textBuffer[0] = edit.charAt(i);
switch (textBuffer[0]) {
case '\n':
x = 0;
line++;
x = 0;
y = (line * lineHeight) + textOffset;
break;
case ' ':
x += spaceWidth;
break;
default:
paint.setColor(colors[syntaxBuffer[i - beginIndex]]);
canvas.drawText(textBuffer, 0, 1, x, y, paint);
@ -228,7 +232,10 @@ public class BaseEditor extends BasicTextEditor {
float y = (currentLine * lineHeight);
Editable text = getText();
for (int i = start; i < end; i++) {
if (i == position) break;
if (i == position) {
break;
}
textBuffer[0] = text.charAt(i);
x += paint.measureText(textBuffer, 0, 1);
}
@ -309,7 +316,7 @@ public class BaseEditor extends BasicTextEditor {
@Override
protected void onTextChanged() {
super.onTextChanged();
requireUpdate = true;
super.onTextChanged();
}
}

12
src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/code/BasicTextEditor.java
View file

@ -52,7 +52,6 @@ public class BasicTextEditor extends AppCompatEditText {
setLineSpacing(0, 1.3f);
setScroller(new Scroller(getContext()));
setInputType(InputType.TYPE_CLASS_TEXT |
InputType.TYPE_TEXT_FLAG_NO_SUGGESTIONS |
InputType.TYPE_TEXT_FLAG_IME_MULTI_LINE |
@ -70,14 +69,12 @@ public class BasicTextEditor extends AppCompatEditText {
addTextChangedListener((SimpleTextWatcher) value -> BasicTextEditor.this.onTextChanged());
}
// DISABLE ANDROID DEFAULT SCROLL
// Disable default Android scroll
@Override
public void scrollBy(int x, int y) {
}
public void scrollBy(int x, int y) {}
@Override
public void scrollTo(int x, int y) {
}
public void scrollTo(int x, int y) {}
public void setScroll(int x, int y) {
x = Math.max(0, x);
@ -100,8 +97,7 @@ public class BasicTextEditor extends AppCompatEditText {
setScroll(getScrollX(), getScrollY());
}
protected void onTextChanged() {
}
protected void onTextChanged() {}
private boolean onSuperTouchListener(MotionEvent event) {
return super.onTouchEvent(event);

1
src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/code/CodeEditor.java
View file

@ -41,6 +41,7 @@ public class CodeEditor extends BaseEditor {
@Override
protected void onRefreshColorScheme(byte[] buffer, int index, int length) {
super.onRefreshColorScheme(buffer, index, length);
if (syntax != null) {
final CharSequence text = getText().subSequence(index, index + length);
syntax.apply(syntaxBuffer, text);

5
src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/code/syntax/CodeSyntax.java
View file

@ -3,11 +3,14 @@ package com.panda3ds.pandroid.view.code.syntax;
public abstract class CodeSyntax {
public abstract void apply(byte[] syntaxBuffer, final CharSequence text);
public static CodeSyntax obtainByFileName(String name) {
// Get syntax highlighting data for a file based on its filename, by looking at the extension
public static CodeSyntax getFromFilename(String name) {
name = name.trim().toLowerCase();
String[] parts = name.split("\\.");
if (parts.length == 0)
return null;
// Get syntax based on file extension
switch (parts[parts.length - 1]) {
case "lua":
return new LuaSyntax();

1
src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/code/syntax/LuaSyntax.java
View file

@ -29,7 +29,6 @@ class LuaSyntax extends CodeSyntax {
public static final Pattern symbols = Pattern.compile("([.!&?:;*+/{}()\\]\\[,=-])");
public static final Pattern numbers = Pattern.compile("\\b((\\d*[.]?\\d+([Ee][+-]?[\\d]+)?[LlfFdD]?)|(0[xX][0-9a-zA-Z]+)|(0[bB][0-1]+)|(0[0-7]+))\\b");
@Override
public void apply(byte[] syntaxBuffer, CharSequence text) {
for (Matcher matcher = keywords.matcher(text); matcher.find(); ) {

5
src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/recycler/AutoFitGridLayout.java
View file

@ -14,6 +14,7 @@ public final class AutoFitGridLayout extends GridLayoutManager {
public AutoFitGridLayout(Context context, int iconSize) {
super(context, 1);
this.iconSize = iconSize;
this.context = context;
}
@ -24,7 +25,9 @@ public final class AutoFitGridLayout extends GridLayoutManager {
int width = View.MeasureSpec.getSize(widthSpec);
int iconSize = (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, this.iconSize, context.getResources().getDisplayMetrics());
int iconCount = Math.max(1, width / iconSize);
if (getSpanCount() != iconCount)
if (getSpanCount() != iconCount) {
setSpanCount(iconCount);
}
}
}

1
src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/recycler/SimpleListAdapter.java
View file

@ -14,7 +14,6 @@ import java.util.Comparator;
import java.util.List;
public class SimpleListAdapter<T> extends RecyclerView.Adapter<SimpleListAdapter.Holder> {
private final ArrayList<T> list = new ArrayList<>();
private final Binder<T> binder;
private final int layoutId;