ProfessionalUwU/Infinity-For-Lemmy
1
0
Fork 0
mirror of https://codeberg.org/Bazsalanszky/Infinity-For-Lemmy.git synced 2024-09-20 20:52:41 +02:00
Code Issues Packages Projects Releases Wiki Activity

Use discard instead of yes in several dialogs.

Browse Source
This commit is contained in:
Alex Ning 2021-08-18 21:23:44 +08:00
parent 9870c592eb
commit 6b874cc25d
9 changed files with 81 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/ml/docilealligator/infinityforreddit/activities/EditCommentActivity.java
View File

@ -265,7 +265,7 @@ public class EditCommentActivity extends BaseActivity implements UploadImageEnab
new MaterialAlertDialogBuilder(this, R.style.MaterialAlertDialogTheme) new MaterialAlertDialogBuilder(this, R.style.MaterialAlertDialogTheme)
.setTitle(titleResId) .setTitle(titleResId)
.setMessage(messageResId) .setMessage(messageResId)
.setPositiveButton(R.string.yes, (dialogInterface, i) .setPositiveButton(R.string.discard_dialog_button, (dialogInterface, i)
-> finish()) -> finish())
.setNegativeButton(R.string.no, null) .setNegativeButton(R.string.no, null)
.show(); .show();

2
app/src/main/java/ml/docilealligator/infinityforreddit/activities/EditPostActivity.java
View File

@ -293,7 +293,7 @@ public class EditPostActivity extends BaseActivity implements UploadImageEnabled
new MaterialAlertDialogBuilder(this, R.style.MaterialAlertDialogTheme) new MaterialAlertDialogBuilder(this, R.style.MaterialAlertDialogTheme)
.setTitle(titleResId) .setTitle(titleResId)
.setMessage(messageResId) .setMessage(messageResId)
.setPositiveButton(R.string.yes, (dialogInterface, i) .setPositiveButton(R.string.discard_dialog_button, (dialogInterface, i)
-> finish()) -> finish())
.setNegativeButton(R.string.no, null) .setNegativeButton(R.string.no, null)
.show(); .show();

14
app/src/main/java/ml/docilealligator/infinityforreddit/activities/FilteredPostsActivity.java
View File

@ -361,11 +361,11 @@ public class FilteredPostsActivity extends BaseActivity implements SortTypeSelec
@Override @Override
public boolean onOptionsItemSelected(@NonNull MenuItem item) { public boolean onOptionsItemSelected(@NonNull MenuItem item) {
switch (item.getItemId()) { int itemId = item.getItemId();
case android.R.id.home: if (itemId == android.R.id.home) {
finish(); finish();
return true; return true;
case R.id.action_sort_filtered_thing_activity: } else if (itemId == R.id.action_sort_filtered_thing_activity) {
switch (postType) { switch (postType) {
case PostDataSource.TYPE_FRONT_PAGE: case PostDataSource.TYPE_FRONT_PAGE:
SortTypeBottomSheetFragment bestSortTypeBottomSheetFragment = new SortTypeBottomSheetFragment(); SortTypeBottomSheetFragment bestSortTypeBottomSheetFragment = new SortTypeBottomSheetFragment();
@ -407,15 +407,15 @@ public class FilteredPostsActivity extends BaseActivity implements SortTypeSelec
userThingSortTypeBottomSheetFragment.show(getSupportFragmentManager(), userThingSortTypeBottomSheetFragment.getTag()); userThingSortTypeBottomSheetFragment.show(getSupportFragmentManager(), userThingSortTypeBottomSheetFragment.getTag());
} }
return true; return true;
case R.id.action_refresh_filtered_thing_activity: } else if (itemId == R.id.action_refresh_filtered_thing_activity) {
if (mMenu != null) { if (mMenu != null) {
mMenu.findItem(R.id.action_lazy_mode_filtered_thing_activity).setTitle(R.string.action_start_lazy_mode); mMenu.findItem(R.id.action_lazy_mode_filtered_thing_activity).setTitle(R.string.action_start_lazy_mode);
} }
if (mFragment instanceof FragmentCommunicator) { if (mFragment != null) {
((FragmentCommunicator) mFragment).refresh(); ((FragmentCommunicator) mFragment).refresh();
} }
return true; return true;
case R.id.action_lazy_mode_filtered_thing_activity: } else if (itemId == R.id.action_lazy_mode_filtered_thing_activity) {
MenuItem lazyModeItem = mMenu.findItem(R.id.action_lazy_mode_filtered_thing_activity); MenuItem lazyModeItem = mMenu.findItem(R.id.action_lazy_mode_filtered_thing_activity);
if (isInLazyMode) { if (isInLazyMode) {
((FragmentCommunicator) mFragment).stopLazyMode(); ((FragmentCommunicator) mFragment).stopLazyMode();
@ -432,7 +432,7 @@ public class FilteredPostsActivity extends BaseActivity implements SortTypeSelec
} }
} }
return true; return true;
case R.id.action_change_post_layout_filtered_post_activity: } else if (itemId == R.id.action_change_post_layout_filtered_post_activity) {
PostLayoutBottomSheetFragment postLayoutBottomSheetFragment = new PostLayoutBottomSheetFragment(); PostLayoutBottomSheetFragment postLayoutBottomSheetFragment = new PostLayoutBottomSheetFragment();
postLayoutBottomSheetFragment.show(getSupportFragmentManager(), postLayoutBottomSheetFragment.getTag()); postLayoutBottomSheetFragment.show(getSupportFragmentManager(), postLayoutBottomSheetFragment.getTag());
return true; return true;

2
app/src/main/java/ml/docilealligator/infinityforreddit/activities/PostGalleryActivity.java
View File

@ -509,7 +509,7 @@ public class PostGalleryActivity extends BaseActivity implements FlairBottomShee
new MaterialAlertDialogBuilder(this, R.style.MaterialAlertDialogTheme) new MaterialAlertDialogBuilder(this, R.style.MaterialAlertDialogTheme)
.setTitle(titleResId) .setTitle(titleResId)
.setMessage(messageResId) .setMessage(messageResId)
.setPositiveButton(R.string.yes, (dialogInterface, i) .setPositiveButton(R.string.discard_dialog_button, (dialogInterface, i)
-> finish()) -> finish())
.setNegativeButton(R.string.no, null) .setNegativeButton(R.string.no, null)
.show(); .show();

2
app/src/main/java/ml/docilealligator/infinityforreddit/activities/PostImageActivity.java
View File

@ -449,7 +449,7 @@ public class PostImageActivity extends BaseActivity implements FlairBottomSheetF
new MaterialAlertDialogBuilder(this, R.style.MaterialAlertDialogTheme) new MaterialAlertDialogBuilder(this, R.style.MaterialAlertDialogTheme)
.setTitle(titleResId) .setTitle(titleResId)
.setMessage(messageResId) .setMessage(messageResId)
.setPositiveButton(R.string.yes, (dialogInterface, i) .setPositiveButton(R.string.discard_dialog_button, (dialogInterface, i)
-> finish()) -> finish())
.setNegativeButton(R.string.no, null) .setNegativeButton(R.string.no, null)
.show(); .show();

2
app/src/main/java/ml/docilealligator/infinityforreddit/activities/PostLinkActivity.java
View File

@ -418,7 +418,7 @@ public class PostLinkActivity extends BaseActivity implements FlairBottomSheetFr
new MaterialAlertDialogBuilder(this, R.style.MaterialAlertDialogTheme) new MaterialAlertDialogBuilder(this, R.style.MaterialAlertDialogTheme)
.setTitle(titleResId) .setTitle(titleResId)
.setMessage(messageResId) .setMessage(messageResId)
.setPositiveButton(R.string.yes, (dialogInterface, i) -> finish()) .setPositiveButton(R.string.discard_dialog_button, (dialogInterface, i) -> finish())
.setNegativeButton(R.string.no, null) .setNegativeButton(R.string.no, null)
.show(); .show();
} }

2
app/src/main/java/ml/docilealligator/infinityforreddit/activities/PostTextActivity.java
View File

@ -439,7 +439,7 @@ public class PostTextActivity extends BaseActivity implements FlairBottomSheetFr
new MaterialAlertDialogBuilder(this, R.style.MaterialAlertDialogTheme) new MaterialAlertDialogBuilder(this, R.style.MaterialAlertDialogTheme)
.setTitle(titleResId) .setTitle(titleResId)
.setMessage(messageResId) .setMessage(messageResId)
.setPositiveButton(R.string.discard, (dialogInterface, i) .setPositiveButton(R.string.discard_dialog_button, (dialogInterface, i)
-> finish()) -> finish())
.setNegativeButton(R.string.cancel, null) .setNegativeButton(R.string.cancel, null)
.show(); .show();

2
app/src/main/java/ml/docilealligator/infinityforreddit/activities/PostVideoActivity.java
View File

@ -459,7 +459,7 @@ public class PostVideoActivity extends BaseActivity implements FlairBottomSheetF
new MaterialAlertDialogBuilder(this, R.style.MaterialAlertDialogTheme) new MaterialAlertDialogBuilder(this, R.style.MaterialAlertDialogTheme)
.setTitle(titleResId) .setTitle(titleResId)
.setMessage(messageResId) .setMessage(messageResId)
.setPositiveButton(R.string.yes, (dialogInterface, i) -> finish()) .setPositiveButton(R.string.discard_dialog_button, (dialogInterface, i) -> finish())
.setNegativeButton(R.string.no, null) .setNegativeButton(R.string.no, null)
.show(); .show();
} }

1
app/src/main/res/values/strings.xml
View File

@ -607,6 +607,7 @@
<string name="discard_detail">All the draft will NOT be saved.</string> <string name="discard_detail">All the draft will NOT be saved.</string>
<string name="yes">Yes</string> <string name="yes">Yes</string>
<string name="no">No</string> <string name="no">No</string>
<string name="discard_dialog_button">Discard</string>
<string name="no_data_received">No data received</string> <string name="no_data_received">No data received</string>
<string name="no_image_path_received">No image path received</string> <string name="no_image_path_received">No image path received</string>