Skip to content

Commit b31402c

Browse files
yashk2000sauravvishal8797
yashk2000
authored and
sauravvishal8797
committed
Fixed snackbars in LFMain activity and added snackbar for gif creation. (#2650)
1 parent 7352e88 commit b31402c

File tree

1 file changed

+48
-25
lines changed

1 file changed

+48
-25
lines changed

‎app/src/main/java/org/fossasia/phimpme/gallery/activities/LFMainActivity.java‎

Lines changed: 48 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1734,9 +1734,11 @@ private void checkNothingFavourites() {
17341734

17351735
private void showsnackbar(Boolean result) {
17361736
if(result) {
1737-
SnackBarHandler.show(mDrawerLayout,getApplicationContext().getString(R.string.photo_deleted_msg), navigationView.getHeight());
1737+
Snackbar snackbar = SnackBarHandler.show(mDrawerLayout,getApplicationContext().getString(R.string.photo_deleted_msg), navigationView.getHeight());
1738+
snackbar.show();
17381739
} else {
1739-
SnackBarHandler.show(mDrawerLayout,getApplicationContext().getString(R.string.photo_deletion_failed), navigationView.getHeight());
1740+
Snackbar snackbar = SnackBarHandler.show(mDrawerLayout,getApplicationContext().getString(R.string.photo_deletion_failed), navigationView.getHeight());
1741+
snackbar.show();
17401742
}
17411743
}
17421744

@@ -2323,10 +2325,13 @@ protected void onPostExecute(Boolean result) {
23232325
mediaAdapter.swapDataSet(listAll, false);
23242326
}
23252327
else if(fav_photos && !all_photos){
2326-
if (imagesUnfav >= 2)
2327-
SnackBarHandler.show(mDrawerLayout, imagesUnfav + " " + getResources().getString(R.string.remove_from_favourite));
2328-
else
2329-
SnackBarHandler.show(mDrawerLayout, getResources().getString(R.string.single_image_removed));
2328+
if (imagesUnfav >= 2) {
2329+
Snackbar snackbar = SnackBarHandler.show(mDrawerLayout, imagesUnfav + " " + getResources().getString(R.string.remove_from_favourite));
2330+
snackbar.show();
2331+
} else {
2332+
Snackbar snackbar = SnackBarHandler.show(mDrawerLayout, getResources().getString(R.string.single_image_removed));
2333+
snackbar.show();
2334+
}
23302335
clearSelectedPhotos();
23312336
getfavouriteslist();
23322337
new FavouritePhotos(activityContext).execute();
@@ -3676,6 +3681,9 @@ private class CreateGIFTask extends AsyncTask<Void, Void, Void>{
36763681

36773682
@Override protected void onPostExecute(Void aVoid) {
36783683
super.onPostExecute(aVoid);
3684+
Snackbar snackbar = SnackBarHandler.showWithBottomMargin2(mDrawerLayout, "GIF created",
3685+
navigationView.getHeight(), Snackbar.LENGTH_SHORT);
3686+
snackbar.show();
36793687
if(!albumsMode && !all_photos && !fav_photos){
36803688
getAlbum().clearSelectedPhotos();
36813689
}else if(!albumsMode && all_photos && !fav_photos){
@@ -3763,8 +3771,11 @@ protected void onPostExecute(String dateAndTime) {
37633771
super.onPostExecute(dateAndTime);
37643772
NotificationHandler.actionPassed(R.string.zip_completion);
37653773
String path = "ZIP: "+dateAndTime+".zip";
3766-
SnackBarHandler.show(mDrawerLayout, getResources().getString(R.string.zip_location) +
3767-
path);
3774+
Snackbar snackbar = SnackBarHandler.showWithBottomMargin2(mDrawerLayout, getResources().getString(R.string.zip_location) +
3775+
path,
3776+
navigationView.getHeight
3777+
(), Snackbar.LENGTH_SHORT);
3778+
snackbar.show();
37683779
if(!albumsMode && !all_photos && !fav_photos){
37693780
getAlbum().clearSelectedPhotos();
37703781
}
@@ -3831,8 +3842,11 @@ protected void onPostExecute(Void aVoid) {
38313842
NotificationHandler.actionPassed(R.string.zip_completion);
38323843
String path = getAlbums().getSelectedAlbum(0).getParentsFolders().get(1) + getAlbums().getSelectedAlbum
38333844
(0).getName() + ".zip";
3834-
SnackBarHandler.show(mDrawerLayout, getResources().getString(R.string.zip_location) +
3835-
path);
3845+
Snackbar snackbar = SnackBarHandler.showWithBottomMargin2(mDrawerLayout, getResources().getString(R.string.zip_location) +
3846+
path,
3847+
navigationView.getHeight
3848+
(), Snackbar.LENGTH_SHORT);
3849+
snackbar.show();
38363850
getAlbums().clearSelectedAlbums();
38373851
mDrawerLayout.setDrawerLockMode(DrawerLayout.LOCK_MODE_UNLOCKED);
38383852
albumsAdapter.notifyDataSetChanged();
@@ -4046,10 +4060,14 @@ protected void onPreExecute() {
40464060
swipeRefreshLayout.setRefreshing(false);
40474061
finishEditMode();
40484062
if (count == 0) {
4049-
SnackBarHandler.show(mDrawerLayout, getResources().getString(R.string.check_favourite_multipleitems));
4063+
Snackbar snackbar = SnackBarHandler.showWithBottomMargin2(mDrawerLayout, getResources().getString(R.string.check_favourite_multipleitems),
4064+
navigationView.getHeight
4065+
(), Snackbar.LENGTH_SHORT);
4066+
snackbar.show();
40504067
} else if (count == 1) {
4051-
final Snackbar snackbar = SnackBarHandler.show(mDrawerLayout,
4052-
getResources().getString(R.string.add_favourite) );
4068+
Snackbar snackbar = SnackBarHandler.showWithBottomMargin2(mDrawerLayout, getResources().getString(R.string.add_favourite),
4069+
navigationView.getHeight
4070+
(), Snackbar.LENGTH_SHORT);
40534071
snackbar.setAction(R.string.openfav, new View.OnClickListener() {
40544072
@Override
40554073
public void onClick(View view) {
@@ -4059,10 +4077,10 @@ public void onClick(View view) {
40594077
});
40604078
snackbar.show();
40614079
} else {
4062-
SnackBarHandler.show(mDrawerLayout, count + " " + getResources().getString(R.string
4063-
.add_favourite_multiple));
4064-
final Snackbar snackbar = SnackBarHandler.show(mDrawerLayout,
4065-
getResources().getString(R.string.add_favourite) );
4080+
Snackbar snackbar = SnackBarHandler.showWithBottomMargin2(mDrawerLayout, count + " " + getResources().getString(R.string
4081+
.add_favourite_multiple),
4082+
navigationView.getHeight
4083+
(), Snackbar.LENGTH_SHORT);
40664084
snackbar.setAction(R.string.openfav, new View.OnClickListener() {
40674085
@Override
40684086
public void onClick(View view) {
@@ -4113,16 +4131,20 @@ protected void onPreExecute() {
41134131
swipeRefreshLayout.setRefreshing(false);
41144132
finishEditMode();
41154133
if (count == 0) {
4116-
final Snackbar snackbar = SnackBarHandler.show(mDrawerLayout,
4117-
getResources().getString(R.string.none_item_favourites));
4134+
Snackbar snackbar = SnackBarHandler.showWithBottomMargin2(mDrawerLayout, getResources().getString(R.string.none_item_favourites),
4135+
navigationView.getHeight
4136+
(), Snackbar.LENGTH_SHORT);
41184137
snackbar.show();
41194138
} else if (count == 1) {
4120-
final Snackbar snackbar = SnackBarHandler.show(mDrawerLayout,
4121-
getResources().getString(R.string.remove_favourite) );
4139+
Snackbar snackbar = SnackBarHandler.showWithBottomMargin2(mDrawerLayout, getResources().getString(R.string.remove_favourite),
4140+
navigationView.getHeight
4141+
(), Snackbar.LENGTH_SHORT);
41224142
snackbar.show();
41234143
} else {
4124-
final Snackbar snackbar = SnackBarHandler.show(mDrawerLayout, count + " " + getResources().getString(R.string
4125-
.remove_favourite_multiple));
4144+
Snackbar snackbar = SnackBarHandler.showWithBottomMargin2(mDrawerLayout, count + " " + getResources().getString(R.string
4145+
.remove_favourite_multiple),
4146+
navigationView.getHeight
4147+
(), Snackbar.LENGTH_SHORT);
41264148
snackbar.show();
41274149
}
41284150
mediaAdapter.notifyDataSetChanged();
@@ -4274,7 +4296,7 @@ private class CopyPhotos extends AsyncTask<String, Integer, Boolean> {
42744296

42754297
private WeakReference<LFMainActivity> reference;
42764298
private String path;
4277-
private Snackbar snackbar;
4299+
//private Snackbar snackbar;
42784300
private ArrayList<Media> temp;
42794301
private Boolean moveAction, copyAction, success;
42804302

@@ -4325,7 +4347,7 @@ protected void onPostExecute(Boolean result) {
43254347
asyncActivityRef.getString(R.string.photos_moved_successfully),
43264348
asyncActivityRef.navigationView.getHeight());
43274349
else if (copyAction){
4328-
snackbar = SnackBarHandler.showWithBottomMargin2(asyncActivityRef.mDrawerLayout,
4350+
Snackbar snackbar = SnackBarHandler.showWithBottomMargin2(asyncActivityRef.mDrawerLayout,
43294351
asyncActivityRef.getString(R.string.copied_successfully),
43304352
asyncActivityRef.navigationView.getHeight(), Snackbar.LENGTH_SHORT);
43314353
snackbar.setAction(R.string.undo, new View.OnClickListener() {
@@ -4358,6 +4380,7 @@ public void onClick(View view) {
43584380
}
43594381
}
43604382
});
4383+
snackbar.show();
43614384
}
43624385

43634386
} else

0 commit comments

Comments
 (0)