From 22d89a63e84cdce30da8952086b22d7fad79e046 Mon Sep 17 00:00:00 2001 From: Satyajit Pradhan Date: Tue, 19 Nov 2019 01:23:08 +0530 Subject: [PATCH] Fixed BottomNav Sliding Animations Fixed Image Delete Issue , TrashBin Issue and More Clicking on Delete Icon on the Toolbar now deletes all the images. Fixed issue when images of same name are added by changing the PrimaryKey from binPath to an auto_increment id. Fixed an issue in which files are not deleted from ".nomedia" directory. Also Updated some external library versions. Fixed Image Delete Issue , TrashBin Issue and More Clicking on Delete Icon on the Toolbar now deletes all the images. Fixed issue when images of same name are added by changing the PrimaryKey from binPath to an auto_increment id. Fixed an issue in which files are not deleted from ".nomedia" directory. Also Updated some external library versions. Update build.gradle Origin --- app/build.gradle | 2 +- .../java/org/fossasia/phimpme/MyApplication.java | 1 + .../fossasia/phimpme/accounts/AccountActivity.java | 13 +++++++++++-- .../org/fossasia/phimpme/base/BaseActivity.java | 1 - .../phimpme/gallery/activities/LFMainActivity.java | 12 +++++++++++- .../phimpme/opencamera/Camera/CameraActivity.java | 14 ++++++++++++-- app/src/main/res/anim/left_to_right.xml | 8 -------- app/src/main/res/anim/right_to_left.xml | 8 -------- app/src/main/res/anim/slide_in_left.xml | 8 ++++++++ app/src/main/res/anim/slide_in_right.xml | 8 ++++++++ app/src/main/res/anim/slide_out_left.xml | 8 ++++++++ app/src/main/res/anim/slide_out_right.xml | 8 ++++++++ build.gradle | 2 +- 13 files changed, 69 insertions(+), 24 deletions(-) delete mode 100644 app/src/main/res/anim/left_to_right.xml delete mode 100644 app/src/main/res/anim/right_to_left.xml create mode 100644 app/src/main/res/anim/slide_in_left.xml create mode 100644 app/src/main/res/anim/slide_in_right.xml create mode 100644 app/src/main/res/anim/slide_out_left.xml create mode 100644 app/src/main/res/anim/slide_out_right.xml diff --git a/app/build.gradle b/app/build.gradle index 19a777a0f..77c781e8d 100755 --- a/app/build.gradle +++ b/app/build.gradle @@ -31,7 +31,7 @@ android { defaultConfig { applicationId "org.fossasia.phimpme" minSdkVersion 21 - targetSdkVersion 29 + targetSdkVersion 28 versionCode 12 versionName '1.9.0' multiDexEnabled true diff --git a/app/src/main/java/org/fossasia/phimpme/MyApplication.java b/app/src/main/java/org/fossasia/phimpme/MyApplication.java index c5a0387b1..af549e63b 100644 --- a/app/src/main/java/org/fossasia/phimpme/MyApplication.java +++ b/app/src/main/java/org/fossasia/phimpme/MyApplication.java @@ -23,6 +23,7 @@ public class MyApplication extends Application { private HandlingAlbums albums = null; public static Context applicationContext; private RefWatcher refWatcher; + public int NavItem = 1; public Album getAlbum() { return albums.dispAlbums.size() > 0 ? albums.getCurrentAlbum() : Album.getEmptyAlbum(); diff --git a/app/src/main/java/org/fossasia/phimpme/accounts/AccountActivity.java b/app/src/main/java/org/fossasia/phimpme/accounts/AccountActivity.java index f6a3736dc..95391d6d5 100644 --- a/app/src/main/java/org/fossasia/phimpme/accounts/AccountActivity.java +++ b/app/src/main/java/org/fossasia/phimpme/accounts/AccountActivity.java @@ -38,6 +38,7 @@ import com.twitter.sdk.android.core.identity.TwitterAuthClient; import io.realm.RealmQuery; import java.util.ArrayList; +import org.fossasia.phimpme.MyApplication; import org.fossasia.phimpme.R; import org.fossasia.phimpme.base.PhimpmeProgressBarHandler; import org.fossasia.phimpme.base.RecyclerItemClickListner; @@ -92,7 +93,7 @@ public void onCreate(Bundle savedInstanceState) { ActivitySwitchHelper.setContext(this); setSupportActionBar(toolbar); parentLayout.setBackgroundColor(getBackgroundColor()); - overridePendingTransition(R.anim.right_to_left, R.anim.left_to_right); + startSlideAnimation(2); phimpmeProgressBarHandler = new PhimpmeProgressBarHandler(this); ThemeHelper themeHelper = new ThemeHelper(this); toolbar.setPopupTheme(getPopupToolbarStyle()); @@ -110,6 +111,15 @@ public void onCreate(Bundle savedInstanceState) { initObserver(); } + private void startSlideAnimation(int currentMenuItem) { + if (((MyApplication) this.getApplication()).NavItem > currentMenuItem) + overridePendingTransition(R.anim.slide_in_left, R.anim.slide_out_right); + else if (((MyApplication) this.getApplication()).NavItem < currentMenuItem) + overridePendingTransition(R.anim.slide_in_right, R.anim.slide_out_left); + // Update the Global NavItem + ((MyApplication) this.getApplication()).NavItem = currentMenuItem; + } + private void initObserver() { accountViewModel.error.observe( this, @@ -348,7 +358,6 @@ public void onBackPressed() { Intent intent = new Intent(this, LFMainActivity.class); startActivity(intent); finish(); - overridePendingTransition(R.anim.left_to_right, R.anim.right_to_left); } private void boxAuthentication() { diff --git a/app/src/main/java/org/fossasia/phimpme/base/BaseActivity.java b/app/src/main/java/org/fossasia/phimpme/base/BaseActivity.java index ce38bec74..fbd9a7c1d 100644 --- a/app/src/main/java/org/fossasia/phimpme/base/BaseActivity.java +++ b/app/src/main/java/org/fossasia/phimpme/base/BaseActivity.java @@ -149,7 +149,6 @@ public boolean onNavigationItemSelected(@NonNull final MenuItem item) { break; } finish(); - overridePendingTransition(R.anim.left_to_right, R.anim.right_to_left); } return true; } diff --git a/app/src/main/java/org/fossasia/phimpme/gallery/activities/LFMainActivity.java b/app/src/main/java/org/fossasia/phimpme/gallery/activities/LFMainActivity.java index 31789fda3..8c0abd198 100644 --- a/app/src/main/java/org/fossasia/phimpme/gallery/activities/LFMainActivity.java +++ b/app/src/main/java/org/fossasia/phimpme/gallery/activities/LFMainActivity.java @@ -106,6 +106,7 @@ import java.util.Locale; import java.util.zip.ZipEntry; import java.util.zip.ZipOutputStream; +import org.fossasia.phimpme.MyApplication; import org.fossasia.phimpme.R; import org.fossasia.phimpme.base.SharedMediaActivity; import org.fossasia.phimpme.data.local.FavouriteImagesModel; @@ -661,7 +662,7 @@ public void onCreate(Bundle savedInstanceState) { rvAlbums = findViewById(R.id.grid_albums); rvMedia = findViewById(R.id.grid_photos); - overridePendingTransition(R.anim.right_to_left, R.anim.left_to_right); + startSlideAnimation(1); SP = PreferenceUtil.getInstance(getApplicationContext()); albumsMode = true; editMode = false; @@ -730,6 +731,15 @@ public void onResume() { firstLaunch = false; } + private void startSlideAnimation(int currentMenuItem) { + if (((MyApplication) this.getApplication()).NavItem > currentMenuItem) + overridePendingTransition(R.anim.slide_in_left, R.anim.slide_out_right); + else if (((MyApplication) this.getApplication()).NavItem < currentMenuItem) + overridePendingTransition(R.anim.slide_in_right, R.anim.slide_out_left); + // Update the Global NavItem + ((MyApplication) this.getApplication()).NavItem = currentMenuItem; + } + private void displayCurrentAlbumMedia(boolean reload) { toolbar.setTitle(getAlbum().getName()); toolbar.setNavigationIcon(getToolbarIcon(GoogleMaterial.Icon.gmd_arrow_back)); diff --git a/app/src/main/java/org/fossasia/phimpme/opencamera/Camera/CameraActivity.java b/app/src/main/java/org/fossasia/phimpme/opencamera/Camera/CameraActivity.java index 1344ceecb..f853ba67d 100644 --- a/app/src/main/java/org/fossasia/phimpme/opencamera/Camera/CameraActivity.java +++ b/app/src/main/java/org/fossasia/phimpme/opencamera/Camera/CameraActivity.java @@ -78,6 +78,7 @@ import java.util.List; import java.util.Locale; import java.util.Map; +import org.fossasia.phimpme.MyApplication; import org.fossasia.phimpme.R; import org.fossasia.phimpme.base.ThemedActivity; import org.fossasia.phimpme.gallery.activities.LFMainActivity; @@ -180,7 +181,7 @@ public void onCreate(Bundle savedInstanceState) { } super.onCreate(savedInstanceState); ButterKnife.bind(this); - overridePendingTransition(R.anim.right_to_left, R.anim.left_to_right); + startSlideAnimation(0); ButterKnife.bind(this); PreferenceManager.setDefaultValues( this, R.xml.preferences, false); // initialise any unset preferences to their default values @@ -886,6 +887,16 @@ public void onResume() { } } + private void startSlideAnimation(int currentMenuItem) { + + if (((MyApplication) this.getApplication()).NavItem > currentMenuItem) + overridePendingTransition(R.anim.slide_in_left, R.anim.slide_out_right); + else if (((MyApplication) this.getApplication()).NavItem < currentMenuItem) + overridePendingTransition(R.anim.slide_in_right, R.anim.slide_out_left); + // Update the Global NavItem + ((MyApplication) this.getApplication()).NavItem = currentMenuItem; + } + private void defaultBrightness() { WindowManager.LayoutParams layout = getWindow().getAttributes(); layout.screenBrightness = WindowManager.LayoutParams.BRIGHTNESS_OVERRIDE_NONE; @@ -1404,7 +1415,6 @@ public void onBackPressed() { Intent intent = new Intent(this, LFMainActivity.class); startActivity(intent); finish(); - overridePendingTransition(R.anim.left_to_right, R.anim.right_to_left); } public boolean usingKitKatImmersiveMode() { diff --git a/app/src/main/res/anim/left_to_right.xml b/app/src/main/res/anim/left_to_right.xml deleted file mode 100644 index 9fec2db70..000000000 --- a/app/src/main/res/anim/left_to_right.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - \ No newline at end of file diff --git a/app/src/main/res/anim/right_to_left.xml b/app/src/main/res/anim/right_to_left.xml deleted file mode 100644 index 3ba3f5e49..000000000 --- a/app/src/main/res/anim/right_to_left.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - \ No newline at end of file diff --git a/app/src/main/res/anim/slide_in_left.xml b/app/src/main/res/anim/slide_in_left.xml new file mode 100644 index 000000000..92b69f308 --- /dev/null +++ b/app/src/main/res/anim/slide_in_left.xml @@ -0,0 +1,8 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/anim/slide_in_right.xml b/app/src/main/res/anim/slide_in_right.xml new file mode 100644 index 000000000..d98ccedae --- /dev/null +++ b/app/src/main/res/anim/slide_in_right.xml @@ -0,0 +1,8 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/anim/slide_out_left.xml b/app/src/main/res/anim/slide_out_left.xml new file mode 100644 index 000000000..79f5c251f --- /dev/null +++ b/app/src/main/res/anim/slide_out_left.xml @@ -0,0 +1,8 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/anim/slide_out_right.xml b/app/src/main/res/anim/slide_out_right.xml new file mode 100644 index 000000000..36ab81f39 --- /dev/null +++ b/app/src/main/res/anim/slide_out_right.xml @@ -0,0 +1,8 @@ + + + + + \ No newline at end of file diff --git a/build.gradle b/build.gradle index 464b00e68..8b49850e0 100755 --- a/build.gradle +++ b/build.gradle @@ -18,7 +18,7 @@ buildscript { google() } dependencies { - classpath 'com.android.tools.build:gradle:3.5.0' + classpath 'com.android.tools.build:gradle:3.5.2' classpath 'com.dicedmelon.gradle:jacoco-android:0.1.4' classpath "io.realm:realm-gradle-plugin:$realm_version" classpath "gradle.plugin.com.github.b3er.local.properties:local-properties-plugin:1.1"