etc/furnace
0
0
Fork 0
mirror of https://github.com/tildearrow/furnace.git synced 2024-11-26 06:25:16 +00:00
Code Issues Projects Releases Packages Wiki Activity

GUI: mobile file dialog improvements, part 2

Browse source
This commit is contained in:
tildearrow 2022-12-02 18:16:41 -05:00
parent 4e88a677d0
commit 4daf959f15
2 changed files with 66 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
android/app/src/main/java/org/tildearrow/furnace/MainActivity.java
View file

@ -2,12 +2,14 @@ package org.tildearrow.furnace;
import android.content.Context;
import android.content.Intent;
import android.net.Uri;
import android.widget.Toast;
import org.libsdl.app.SDLActivity;
public class MainActivity extends SDLActivity {
static final int TA_FILE_REQUEST=1000;
static final int TA_FILE_SAVE_REQUEST=1001;
public void showFileDialog() {
Intent picker=new Intent(Intent.ACTION_GET_CONTENT);
@ -16,12 +18,22 @@ public class MainActivity extends SDLActivity {
startActivityForResult(picker,TA_FILE_REQUEST);
}
public void showSaveFileDialog() {
Intent picker=new Intent(Intent.ACTION_CREATE_DOCUMENT);
picker.addCategory(Intent.CATEGORY_OPENABLE);
picker.setType("*/*");
startActivityForResult(picker,TA_FILE_SAVE_REQUEST);
}
@Override protected void onActivityResult(int request, int result, Intent intent) {
super.onActivityResult(request,result,intent);
if (request==TA_FILE_REQUEST) {
if (result==RESULT_OK) {
Uri path=intent.getData();
Context context=getApplicationContext();
Toast toast=Toast.makeText(context,"Got a file",Toast.LENGTH_SHORT);
Toast toast=Toast.makeText(context,path.toString(),Toast.LENGTH_SHORT);
toast.show();
}
}

54
src/gui/fileDialog.cpp
View file

@ -142,6 +142,13 @@ bool FurnaceGUIFileDialog::openLoad(String header, std::vector<String> filter, c
#endif
} else {
hasError=false;
#ifdef ANDROID
if (!SDL_AndroidRequestPermission("android.permission.READ_EXTERNAL_STORAGE")) {
return false;
}
#endif
ImGuiFileDialog::Instance()->singleClickSel=singleClickSel;
ImGuiFileDialog::Instance()->DpiScale=dpiScale;
ImGuiFileDialog::Instance()->OpenModal("FileDialog",header,noSysFilter,path,allowMultiple?999:1,nullptr,0,clickCallback);
@ -152,6 +159,13 @@ bool FurnaceGUIFileDialog::openLoad(String header, std::vector<String> filter, c
bool FurnaceGUIFileDialog::openSave(String header, std::vector<String> filter, const char* noSysFilter, String path, double dpiScale) {
if (opened) return false;
#ifdef ANDROID
if (!SDL_AndroidRequestPermission("android.permission.WRITE_EXTERNAL_STORAGE")) {
return false;
}
#endif
saving=true;
curPath=path;
@ -172,13 +186,51 @@ bool FurnaceGUIFileDialog::openSave(String header, std::vector<String> filter, c
dialogS=new std::thread(_nfdThread,NFDState(true,header,filter,path,NULL,false),&dialogOK,&nfdResult,&hasError);
#endif
#elif defined(ANDROID)
hasError=true; // TODO
hasError=false;
if (jniEnv==NULL) {
jniEnv=(JNIEnv*)SDL_AndroidGetJNIEnv();
if (jniEnv==NULL) {
hasError=true;
logE("could not acquire JNI env!");
return false;
}
}
jobject activity=(jobject)SDL_AndroidGetActivity();
if (activity==NULL) {
hasError=true;
logE("the Activity is NULL!");
return false;
}
jclass class_=jniEnv->GetObjectClass(activity);
jmethodID showSaveFileDialog=jniEnv->GetMethodID(class_,"showSaveFileDialog","()V");
if (showSaveFileDialog==NULL) {
logE("method showSaveFileDialog not found!");
hasError=true;
jniEnv->DeleteLocalRef(class_);
jniEnv->DeleteLocalRef(activity);
return false;
}
jniEnv->CallVoidMethod(activity,showSaveFileDialog);
/*if (!(bool)mret) {
hasError=true;
logW("could not open Android file picker...");
}*/
jniEnv->DeleteLocalRef(class_);
jniEnv->DeleteLocalRef(activity);
return true;
#else
dialogS=new pfd::save_file(header,path,filter);
hasError=!pfd::settings::available();
#endif
} else {
hasError=false;
ImGuiFileDialog::Instance()->singleClickSel=false;
ImGuiFileDialog::Instance()->DpiScale=dpiScale;
ImGuiFileDialog::Instance()->OpenModal("FileDialog",header,noSysFilter,path,1,nullptr,ImGuiFileDialogFlags_ConfirmOverwrite);