From fa0614175af86fdf91a504f244c890b823c1df04 Mon Sep 17 00:00:00 2001 From: Paul Akhamiogu Date: Fri, 27 Aug 2021 13:31:56 +0100 Subject: [PATCH 1/7] Update Breadcrumbs and commons library version --- app/build.gradle | 2 +- .../filemanager/pro/activities/MainActivity.kt | 2 +- .../filemanager/pro/fragments/ItemsFragment.kt | 2 +- app/src/main/res/layout/items_fragment.xml | 6 +++++- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 7e6382db..0580912f 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -58,7 +58,7 @@ android { } dependencies { - implementation 'com.github.SimpleMobileTools:Simple-Commons:16ae1d2c03' + implementation 'com.github.SimpleMobileTools:Simple-Commons:8979ca8187' implementation 'com.github.Stericson:RootTools:df729dcb13' implementation 'com.github.Stericson:RootShell:1.6' implementation 'com.alexvasilkov:gesture-views:2.5.2' diff --git a/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/activities/MainActivity.kt b/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/activities/MainActivity.kt index 4f806260..da278734 100644 --- a/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/activities/MainActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/activities/MainActivity.kt @@ -547,7 +547,7 @@ class MainActivity : SimpleActivity() { return } - if (getCurrentFragment()!!.breadcrumbs.childCount <= 1) { + if (getCurrentFragment()!!.breadcrumbs.itemsCount <= 1) { if (!wasBackJustPressed && config.pressBackTwice) { wasBackJustPressed = true toast(R.string.press_back_again) diff --git a/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/fragments/ItemsFragment.kt b/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/fragments/ItemsFragment.kt index e935585a..a694e675 100644 --- a/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/fragments/ItemsFragment.kt +++ b/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/fragments/ItemsFragment.kt @@ -494,7 +494,7 @@ class ItemsFragment(context: Context, attributeSet: AttributeSet) : MyViewPagerF openPath(it) } } else { - val item = breadcrumbs.getChildAt(id).tag as FileDirItem + val item = breadcrumbs.getItem(id) openPath(item.path) } } diff --git a/app/src/main/res/layout/items_fragment.xml b/app/src/main/res/layout/items_fragment.xml index cda96fa8..5aa25ced 100644 --- a/app/src/main/res/layout/items_fragment.xml +++ b/app/src/main/res/layout/items_fragment.xml @@ -24,7 +24,11 @@ android:id="@+id/breadcrumbs" android:layout_width="match_parent" android:layout_height="wrap_content" - android:padding="@dimen/activity_margin" /> + android:paddingStart="@dimen/activity_margin" + android:paddingEnd="@dimen/small_margin" + android:paddingTop="@dimen/small_margin" + android:paddingBottom="@dimen/small_margin" + /> Date: Fri, 27 Aug 2021 14:58:54 +0200 Subject: [PATCH 2/7] adding some top margin --- app/src/main/res/layout/items_fragment.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/src/main/res/layout/items_fragment.xml b/app/src/main/res/layout/items_fragment.xml index 5aa25ced..19834892 100644 --- a/app/src/main/res/layout/items_fragment.xml +++ b/app/src/main/res/layout/items_fragment.xml @@ -24,11 +24,11 @@ android:id="@+id/breadcrumbs" android:layout_width="match_parent" android:layout_height="wrap_content" + android:layout_marginTop="@dimen/medium_margin" android:paddingStart="@dimen/activity_margin" - android:paddingEnd="@dimen/small_margin" android:paddingTop="@dimen/small_margin" - android:paddingBottom="@dimen/small_margin" - /> + android:paddingEnd="@dimen/small_margin" + android:paddingBottom="@dimen/small_margin" /> Date: Fri, 27 Aug 2021 15:19:08 +0200 Subject: [PATCH 3/7] updating commons and gradle --- app/build.gradle | 2 +- build.gradle | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 0580912f..19b767ec 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -58,7 +58,7 @@ android { } dependencies { - implementation 'com.github.SimpleMobileTools:Simple-Commons:8979ca8187' + implementation 'com.github.SimpleMobileTools:Simple-Commons:08dfa11641' implementation 'com.github.Stericson:RootTools:df729dcb13' implementation 'com.github.Stericson:RootShell:1.6' implementation 'com.alexvasilkov:gesture-views:2.5.2' diff --git a/build.gradle b/build.gradle index 8aef38e0..313bed26 100644 --- a/build.gradle +++ b/build.gradle @@ -9,7 +9,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:4.2.1' + classpath 'com.android.tools.build:gradle:4.2.2' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" // NOTE: Do not place your application dependencies here; they belong From ccab2e357129defc1acbf1e52b78091c8fb31dc9 Mon Sep 17 00:00:00 2001 From: tibbi Date: Fri, 27 Aug 2021 15:24:52 +0200 Subject: [PATCH 4/7] updating commons with a crashfix --- app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index 19b767ec..e3f0a0ec 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -58,7 +58,7 @@ android { } dependencies { - implementation 'com.github.SimpleMobileTools:Simple-Commons:08dfa11641' + implementation 'com.github.SimpleMobileTools:Simple-Commons:649211e294' implementation 'com.github.Stericson:RootTools:df729dcb13' implementation 'com.github.Stericson:RootShell:1.6' implementation 'com.alexvasilkov:gesture-views:2.5.2' From fb9d9694866d72866bc633604cd5a0917a59897c Mon Sep 17 00:00:00 2001 From: tibbi Date: Fri, 27 Aug 2021 15:28:23 +0200 Subject: [PATCH 5/7] updating kotlin to 1.5.30 --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 313bed26..e0fb0bd8 100644 --- a/build.gradle +++ b/build.gradle @@ -1,7 +1,7 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { - ext.kotlin_version = '1.5.10' + ext.kotlin_version = '1.5.30' repositories { google() From f739c429e8f31eea9b39936fe5f192e863d7d1d5 Mon Sep 17 00:00:00 2001 From: tibbi Date: Fri, 27 Aug 2021 15:32:08 +0200 Subject: [PATCH 6/7] update version to 6.9.4 --- app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index e3f0a0ec..88cc1fee 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -16,8 +16,8 @@ android { applicationId "com.simplemobiletools.filemanager.pro" minSdkVersion 21 targetSdkVersion 29 - versionCode 107 - versionName "6.9.3" + versionCode 108 + versionName "6.9.4" multiDexEnabled true setProperty("archivesBaseName", "file-manager") vectorDrawables.useSupportLibrary = true From 9854ccc2e379e078b7c4a2779016dd5192ba9959 Mon Sep 17 00:00:00 2001 From: tibbi Date: Fri, 27 Aug 2021 15:32:15 +0200 Subject: [PATCH 7/7] updating changelog --- CHANGELOG.md | 6 ++++++ fastlane/metadata/android/en-US/changelogs/108.txt | 2 ++ 2 files changed, 8 insertions(+) create mode 100644 fastlane/metadata/android/en-US/changelogs/108.txt diff --git a/CHANGELOG.md b/CHANGELOG.md index 21567f84..e636b643 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,12 @@ Changelog ========== +Version 6.10.0 *(2021-08-27)* +---------------------------- + + * Rewrote the current folder path into a 1 liner + * Show a save/discard prompt when exiting file editor with unsaved changes + Version 6.9.3 *(2021-06-14)* ---------------------------- diff --git a/fastlane/metadata/android/en-US/changelogs/108.txt b/fastlane/metadata/android/en-US/changelogs/108.txt new file mode 100644 index 00000000..78a3d790 --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/108.txt @@ -0,0 +1,2 @@ + * Rewrote the current folder path into a 1 liner + * Show a save/discard prompt when exiting file editor with unsaved changes