i/rtabmap
1
0
Fork 0
mirror of https://github.com/introlab/rtabmap.git synced 2026-10-07 10:37:47 +08:00
Code Issues Packages Projects Releases Wiki Activity

Tango: added setCanceledOnTouchOutside() on all dialogs

Browse Source
This commit is contained in:
matlabbe
2019-04-29 18:08:16 -04:00
parent 630b565cd4
commit 4675240d6e
3 changed files with 101 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/android/src/com/introlab/rtabmap/RTABMapActivity.java
+86 -50
View File
@@ -1168,6 +1168,7 @@ public class RTABMapActivity extends Activity implements OnClickListener, OnItem
}
})
.create();
mMemoryWarningDialog.setCanceledOnTouchOutside(false);
mMemoryWarningDialog.show();
}
else if(mMemoryWarningDialog == null && memoryUsed*3 > memoryFree && (mItemDataRecorderMode == null || !mItemDataRecorderMode.isChecked()))
@@ -1191,6 +1192,7 @@ public class RTABMapActivity extends Activity implements OnClickListener, OnItem
}
})
.create();
mMemoryWarningDialog.setCanceledOnTouchOutside(false);
mMemoryWarningDialog.show();
}
}
@@ -1765,7 +1767,8 @@ public class RTABMapActivity extends Activity implements OnClickListener, OnItem
if(!mOnPause && !mItemLocalizationMode.isChecked() && !mItemDataRecorderMode.isChecked() && memoryFree >= 100 && mMapNodes>2)
{
// Do standard post processing?
new AlertDialog.Builder(getActivity())
AlertDialog d2 = new AlertDialog.Builder(getActivity())
.setCancelable(false)
.setTitle("Mapping Paused! Optimize Now?")
.setMessage("Do you want to do standard map optimization now? This can be also done later using \"Optimize\" menu.")
.setPositiveButton("Yes", new DialogInterface.OnClickListener() {
@@ -1778,7 +1781,9 @@ public class RTABMapActivity extends Activity implements OnClickListener, OnItem
// do nothing...
}
})
.show();
.create();
d2.setCanceledOnTouchOutside(false);
d2.show();
}
}
else
@@ -2007,6 +2012,7 @@ public class RTABMapActivity extends Activity implements OnClickListener, OnItem
else if (itemId == R.id.save)
{
AlertDialog.Builder builder = new AlertDialog.Builder(this);
builder.setCancelable(false);
builder.setTitle("RTAB-Map Database Name (*.db):");
final EditText input = new EditText(this);
input.setInputType(InputType.TYPE_CLASS_TEXT);
@@ -2036,7 +2042,8 @@ public class RTABMapActivity extends Activity implements OnClickListener, OnItem
File newFile = new File(mWorkingDirectory + fileName + ".db");
if(newFile.exists())
{
new AlertDialog.Builder(getActivity())
AlertDialog d2 = new AlertDialog.Builder(getActivity())
.setCancelable(false)
.setTitle("File Already Exists")
.setMessage("Do you want to overwrite the existing file?")
.setPositiveButton("Yes", new DialogInterface.OnClickListener() {
@@ -2050,7 +2057,9 @@ public class RTABMapActivity extends Activity implements OnClickListener, OnItem
resetNoTouchTimer(true);
}
})
.show();
.create();
d2.setCanceledOnTouchOutside(false);
d2.show();
}
else
{
@@ -2060,6 +2069,7 @@ public class RTABMapActivity extends Activity implements OnClickListener, OnItem
}
});
AlertDialog alertToShow = builder.create();
alertToShow.setCanceledOnTouchOutside(false);
alertToShow.getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_VISIBLE);
alertToShow.show();
}
@@ -2100,7 +2110,8 @@ public class RTABMapActivity extends Activity implements OnClickListener, OnItem
else if(itemId == R.id.data_recorder)
{
final boolean dataRecorderOldState = item.isChecked();
new AlertDialog.Builder(getActivity())
AlertDialog d2 = new AlertDialog.Builder(getActivity())
.setCancelable(false)
.setTitle("Data Recorder Mode")
.setMessage("Changing from/to data recorder mode will close the current session. Do you want to continue?")
.setPositiveButton("Yes", new DialogInterface.OnClickListener() {
@@ -2155,7 +2166,9 @@ public class RTABMapActivity extends Activity implements OnClickListener, OnItem
dialog.dismiss();
}
})
.show();
.create();
d2.setCanceledOnTouchOutside(false);
d2.show();
}
else if(itemId == R.id.export_point_cloud ||
itemId == R.id.export_point_cloud_highrez)
@@ -2210,27 +2223,26 @@ public class RTABMapActivity extends Activity implements OnClickListener, OnItem
linearLayout.setLayoutParams(params);
linearLayout.addView(aNumberPicker,numPicerParams);
AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder(this);
alertDialogBuilder.setTitle("Maximum polygons");
alertDialogBuilder.setView(linearLayout);
alertDialogBuilder
.setCancelable(false)
.setPositiveButton("Ok",
new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog,
int id) {
export(isOBJ, true, false, true, aNumberPicker.getValue()*100000);
}
})
.setNegativeButton("Cancel",
new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog,
int id) {
dialog.cancel();
}
});
AlertDialog alertDialog = alertDialogBuilder.create();
alertDialog.show();
AlertDialog ad = new AlertDialog.Builder(this)
.setTitle("Maximum polygons")
.setView(linearLayout)
.setCancelable(false)
.setPositiveButton("Ok",
new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog,
int id) {
export(isOBJ, true, false, true, aNumberPicker.getValue()*100000);
}
})
.setNegativeButton("Cancel",
new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog,
int id) {
dialog.cancel();
}
}).create();
ad.setCanceledOnTouchOutside(false);
ad.show();
}
else if(itemId == R.id.open)
{
@@ -2277,13 +2289,15 @@ public class RTABMapActivity extends Activity implements OnClickListener, OnItem
DatabaseListArrayAdapter simpleAdapter = new DatabaseListArrayAdapter(this, arrayList, R.layout.database_list, from, to);//Create object and set the parameters for simpleAdapter
AlertDialog.Builder builder = new AlertDialog.Builder(this);
builder.setCancelable(false);
builder.setTitle("Choose Your File (*.db)");
builder.setAdapter(simpleAdapter, new DialogInterface.OnClickListener() {
//builder.setItems(filesWithSize, new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, final int which) {
// Adjust color now?
new AlertDialog.Builder(getActivity())
AlertDialog d2 = new AlertDialog.Builder(getActivity())
.setCancelable(false)
.setTitle("Opening database...")
.setMessage("Do you want to adjust colors now?\nThis can be done later under Optimize menu.")
.setPositiveButton("Yes", new DialogInterface.OnClickListener() {
@@ -2296,12 +2310,15 @@ public class RTABMapActivity extends Activity implements OnClickListener, OnItem
openDatabase(files[which], false);
}
})
.show();
.create();
d2.setCanceledOnTouchOutside(false);
d2.show();
return;
}
});
final AlertDialog ad = builder.create(); //don't show dialog yet
ad.setCanceledOnTouchOutside(false);
ad.setOnShowListener(new OnShowListener()
{
@Override
@@ -2322,6 +2339,7 @@ public class RTABMapActivity extends Activity implements OnClickListener, OnItem
@Override
public boolean onMenuItemClick(MenuItem item) {
AlertDialog.Builder builderRename = new AlertDialog.Builder(getActivity());
builderRename.setCancelable(false);
builderRename.setTitle("RTAB-Map Database Name (*.db):");
final EditText input = new EditText(getActivity());
input.setInputType(InputType.TYPE_CLASS_TEXT);
@@ -2341,10 +2359,13 @@ public class RTABMapActivity extends Activity implements OnClickListener, OnItem
File newFile = new File(mWorkingDirectory + fileName + ".db");
if(newFile.exists())
{
new AlertDialog.Builder(getActivity())
AlertDialog d2 = new AlertDialog.Builder(getActivity())
.setCancelable(false)
.setTitle("File Already Exists")
.setMessage(String.format("Name %s already used, choose another name.", fileName))
.show();
.create();
d2.setCanceledOnTouchOutside(false);
d2.show();
}
else
{
@@ -2371,6 +2392,7 @@ public class RTABMapActivity extends Activity implements OnClickListener, OnItem
}
});
AlertDialog alertToShow = builderRename.create();
alertToShow.setCanceledOnTouchOutside(false);
alertToShow.getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_VISIBLE);
alertToShow.show();
return true;
@@ -2397,11 +2419,14 @@ public class RTABMapActivity extends Activity implements OnClickListener, OnItem
}
}
};
AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
builder.setTitle(String.format("Delete %s", files[position]))
AlertDialog dialog = new AlertDialog.Builder(getActivity())
.setCancelable(false)
.setTitle(String.format("Delete %s", files[position]))
.setMessage("Are you sure?")
.setPositiveButton("Yes", dialogClickListener)
.setNegativeButton("No", dialogClickListener).show();
.setNegativeButton("No", dialogClickListener).create();
dialog.setCanceledOnTouchOutside(false);
dialog.show();
return true;
}
});
@@ -2571,14 +2596,15 @@ public class RTABMapActivity extends Activity implements OnClickListener, OnItem
public void onClick(DialogInterface dialog, int which) {
resetNoTouchTimer(true);
}
})
.create();
}).create();
d2.setCanceledOnTouchOutside(false);
d2.show();
// Make the textview clickable. Must be called after show()
((TextView)d2.findViewById(android.R.id.message)).setMovementMethod(LinkMovementMethod.getInstance());
}
})
.create();
d.setCanceledOnTouchOutside(false);
d.show();
// Make the textview clickable. Must be called after show()
((TextView)d.findViewById(android.R.id.message)).setMovementMethod(LinkMovementMethod.getInstance());
@@ -2670,7 +2696,8 @@ public class RTABMapActivity extends Activity implements OnClickListener, OnItem
final File f = new File(newDatabasePath);
final int fileSizeMB = (int)f.length()/(1024 * 1024);
new AlertDialog.Builder(getActivity())
AlertDialog d2 = new AlertDialog.Builder(getActivity())
.setCancelable(false)
.setTitle("Database saved!")
.setMessage(String.format("Database \"%s\" (%d MB) successfully saved on the SD-CARD! Share it?", newDatabasePathHuman, fileSizeMB))
.setPositiveButton("Yes", new DialogInterface.OnClickListener() {
@@ -2702,7 +2729,9 @@ public class RTABMapActivity extends Activity implements OnClickListener, OnItem
updateState(previousState);
}
})
.show();
.create();
d2.setCanceledOnTouchOutside(false);
d2.show();
}
});
}
@@ -2751,7 +2780,8 @@ public class RTABMapActivity extends Activity implements OnClickListener, OnItem
File newFile = new File(mWorkingDirectory + RTABMAP_EXPORT_DIR + fileName + ".zip");
if(newFile.exists())
{
new AlertDialog.Builder(getActivity())
AlertDialog ad = new AlertDialog.Builder(getActivity())
.setCancelable(false)
.setTitle("File Already Exists")
.setMessage("Do you want to overwrite the existing file?")
.setPositiveButton("Yes", new DialogInterface.OnClickListener() {
@@ -2763,8 +2793,9 @@ public class RTABMapActivity extends Activity implements OnClickListener, OnItem
public void onClick(DialogInterface dialog, int which) {
saveOnDevice();
}
})
.show();
}).create();
ad.setCanceledOnTouchOutside(false);
ad.show();
}
else
{
@@ -2774,6 +2805,7 @@ public class RTABMapActivity extends Activity implements OnClickListener, OnItem
}
});
AlertDialog alertToShow = builder.create();
alertToShow.setCanceledOnTouchOutside(false);
alertToShow.getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_VISIBLE);
alertToShow.show();
}
@@ -2851,7 +2883,8 @@ public class RTABMapActivity extends Activity implements OnClickListener, OnItem
final File f = new File(zipOutput);
final int fileSizeMB = (int)f.length()/(1024 * 1024);
new AlertDialog.Builder(getActivity())
AlertDialog d = new AlertDialog.Builder(getActivity())
.setCancelable(false)
.setTitle("Database saved!")
.setMessage(String.format("Mesh \"%s\" (%d MB) successfully exported on the SD-CARD! Share it?", pathHuman, fileSizeMB))
.setPositiveButton("Yes", new DialogInterface.OnClickListener() {
@@ -2870,8 +2903,9 @@ public class RTABMapActivity extends Activity implements OnClickListener, OnItem
public void onClick(DialogInterface dialog, int which) {
resetNoTouchTimer(true);
}
})
.show();
}).create();
d.setCanceledOnTouchOutside(false);
d.show();
}
});
}
@@ -2917,7 +2951,7 @@ public class RTABMapActivity extends Activity implements OnClickListener, OnItem
{
updateState(State.STATE_IDLE);
mProgressDialog.dismiss();
new AlertDialog.Builder(getActivity())
AlertDialog d = new AlertDialog.Builder(getActivity())
.setCancelable(false)
.setTitle("Error")
.setMessage("The map is loaded but optimization of the map's graph has "
@@ -2934,14 +2968,15 @@ public class RTABMapActivity extends Activity implements OnClickListener, OnItem
.setNegativeButton("Close", new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int which) {
}
})
.show();
}).create();
d.setCanceledOnTouchOutside(false);
d.show();
}
else if(status == -2)
{
updateState(State.STATE_IDLE);
mProgressDialog.dismiss();
new AlertDialog.Builder(getActivity())
AlertDialog d = new AlertDialog.Builder(getActivity())
.setCancelable(false)
.setTitle("Error")
.setMessage("Failed to open database: Out of memory! Try "
@@ -2956,8 +2991,9 @@ public class RTABMapActivity extends Activity implements OnClickListener, OnItem
.setNegativeButton("Close", new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int which) {
}
})
.show();
}).create();
d.setCanceledOnTouchOutside(false);
d.show();
}
else
{
app/android/src/com/introlab/rtabmap/SketchfabActivity.java
+15 -4
View File
@@ -66,6 +66,7 @@ public class SketchfabActivity extends Activity implements OnClickListener {
mButtonOk = (Button)findViewById(R.id.button_ok);
mProgressDialog = new ProgressDialog(this);
mProgressDialog.setCancelable(false);
mProgressDialog.setCanceledOnTouchOutside(false);
mAuthToken = getIntent().getExtras().getString(RTABMapActivity.RTABMAP_AUTH_TOKEN_KEY);
@@ -142,7 +143,8 @@ public class SketchfabActivity extends Activity implements OnClickListener {
if(!isNetworkAvailable())
{
// Visualize the result?
new AlertDialog.Builder(this)
AlertDialog ad = new AlertDialog.Builder(this)
.setCancelable(false)
.setTitle("Sharing to Sketchfab...")
.setMessage("Network is not available. Make sure you have internet before continuing.")
.setPositiveButton("Try Again", new DialogInterface.OnClickListener() {
@@ -154,7 +156,9 @@ public class SketchfabActivity extends Activity implements OnClickListener {
public void onClick(DialogInterface dialog, int which) {
}
})
.show();
.create();
ad.setCanceledOnTouchOutside(false);
ad.show();
return;
}
@@ -165,6 +169,8 @@ public class SketchfabActivity extends Activity implements OnClickListener {
WebView web;
mAuthDialog = new Dialog(this);
mAuthDialog.setCancelable(false);
mAuthDialog.setCanceledOnTouchOutside(false);
mAuthDialog.setContentView(R.layout.auth_dialog);
web = (WebView)mAuthDialog.findViewById(R.id.webv);
web.setWebContentsDebuggingEnabled(!RTABMapActivity.DISABLE_LOG);
@@ -200,7 +206,6 @@ public class SketchfabActivity extends Activity implements OnClickListener {
});
mAuthDialog.show();
mAuthDialog.setTitle("Authorize RTAB-Map");
mAuthDialog.setCancelable(true);
web.loadUrl(auth_url);
}
else
@@ -213,6 +218,8 @@ public class SketchfabActivity extends Activity implements OnClickListener {
{
mProgressDialog.setTitle("Upload to Sketchfab");
mProgressDialog.setMessage(String.format("Compressing the files..."));
mProgressDialog.setCancelable(false);
mProgressDialog.setCanceledOnTouchOutside(false);
mProgressDialog.show();
Thread workingThread = new Thread(new Runnable() {
@@ -308,7 +315,10 @@ public class SketchfabActivity extends Activity implements OnClickListener {
// do nothing...
}
});
builder.show();
AlertDialog ad = builder.create();
ad.setCancelable(false);
ad.setCanceledOnTouchOutside(false);
ad.show();
}
});
}
@@ -371,6 +381,7 @@ public class SketchfabActivity extends Activity implements OnClickListener {
finish();
}
}).create();
d.setCanceledOnTouchOutside(false);
d.show();
((TextView)d.findViewById(android.R.id.message)).setMovementMethod(LinkMovementMethod.getInstance());
}