fenix
/
Simple-Gallery
mirror of https://github.com/SimpleMobileTools/Simple-Gallery.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

some refactoring

This commit is contained in:
tibbi 2016-03-07 22:02:10 +01:00
parent 50bf296f89
commit e160894144
1 changed files with 43 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

83
app/src/main/java/com/simplemobiletools/gallery/activities/MainActivity.java
View File

@ -208,56 +208,59 @@ public class MainActivity extends AppCompatActivity
adapter.updateItems(dirs);
}
private void renameDirectory() {
private void editDirectory() {
final SparseBooleanArray items = gridView.getCheckedItemPositions();
final int cnt = items.size();
for (int i = 0; i < cnt; i++) {
if (items.valueAt(i)) {
final int id = items.keyAt(i);
final String path = dirs.get(id).getPath();
final File dir = new File(path);
final View renameFileView = getLayoutInflater().inflate(R.layout.rename_directory, null);
final EditText dirNameET = (EditText) renameFileView.findViewById(R.id.directory_name);
dirNameET.setText(dir.getName());
final AlertDialog.Builder builder = new AlertDialog.Builder(this);
builder.setTitle(getResources().getString(R.string.rename_folder));
builder.setView(renameFileView);
builder.setPositiveButton("OK", null);
builder.setNegativeButton("Cancel", null);
final AlertDialog alertDialog = builder.create();
alertDialog.show();
alertDialog.getButton(AlertDialog.BUTTON_POSITIVE).setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
final String newDirName = dirNameET.getText().toString().trim();
if (!newDirName.isEmpty()) {
final File newDir = new File(dir.getParent(), newDirName);
if (dir.renameTo(newDir)) {
Utils.showToast(getApplicationContext(), R.string.rename_folder_ok);
alertDialog.dismiss();
actionMode.finish();
final String[] newDirPath = new String[]{newDir.getAbsolutePath()};
MediaScannerConnection.scanFile(getApplicationContext(), newDirPath, null, MainActivity.this);
} else {
Utils.showToast(getApplicationContext(), R.string.rename_folder_error);
}
} else {
Utils.showToast(getApplicationContext(), R.string.rename_folder_error);
}
}
});
renameDir(path);
break;
}
}
}
private void renameDir(final String path) {
final File dir = new File(path);
final View renameFileView = getLayoutInflater().inflate(R.layout.rename_directory, null);
final EditText dirNameET = (EditText) renameFileView.findViewById(R.id.directory_name);
dirNameET.setText(dir.getName());
final AlertDialog.Builder builder = new AlertDialog.Builder(this);
builder.setTitle(getResources().getString(R.string.rename_folder));
builder.setView(renameFileView);
builder.setPositiveButton("OK", null);
builder.setNegativeButton("Cancel", null);
final AlertDialog alertDialog = builder.create();
alertDialog.show();
alertDialog.getButton(AlertDialog.BUTTON_POSITIVE).setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
final String newDirName = dirNameET.getText().toString().trim();
if (!newDirName.isEmpty()) {
final File newDir = new File(dir.getParent(), newDirName);
if (dir.renameTo(newDir)) {
Utils.showToast(getApplicationContext(), R.string.rename_folder_ok);
alertDialog.dismiss();
actionMode.finish();
final String[] newDirPath = new String[]{newDir.getAbsolutePath()};
MediaScannerConnection.scanFile(getApplicationContext(), newDirPath, null, MainActivity.this);
} else {
Utils.showToast(getApplicationContext(), R.string.rename_folder_error);
}
} else {
Utils.showToast(getApplicationContext(), R.string.rename_folder_error);
}
}
});
}
@Override
public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
final Intent intent = new Intent(this, PhotosActivity.class);
@ -297,7 +300,7 @@ public class MainActivity extends AppCompatActivity
public boolean onActionItemClicked(ActionMode mode, MenuItem item) {
switch (item.getItemId()) {
case R.id.cab_edit:
renameDirectory();
editDirectory();
return true;
case R.id.cab_remove:
prepareForDeleting();