fenix/Simple-File-Manager
1
0
Fork 0
mirror of https://github.com/SimpleMobileTools/Simple-File-Manager.git synced 2025-06-05 22:09:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into fix/android-data-dir-access

Browse Source 
# Conflicts:
#	app/build.gradle
This commit is contained in:
Paul Akhamiogu
2021-09-12 23:14:02 +01:00
parent 6a94feaf0e 9854ccc2e3
commit 3a52528a54
7 changed files with 20 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
CHANGELOG.md
View File

@ -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)*
----------------------------

7
app/build.gradle
View File

@ -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
@ -58,8 +58,7 @@ android {
}
dependencies {
// implementation 'com.github.SimpleMobileTools:Simple-Commons:e56c724d04'
implementation project(":commons")
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'

2
app/src/main/kotlin/com/simplemobiletools/filemanager/pro/activities/MainActivity.kt
View File

@ -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)

2
app/src/main/kotlin/com/simplemobiletools/filemanager/pro/fragments/ItemsFragment.kt
View File

@ -525,7 +525,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)
}
}

6
app/src/main/res/layout/items_fragment.xml
View File

@ -24,7 +24,11 @@
android:id="@+id/breadcrumbs"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:padding="@dimen/activity_margin" />
android:layout_marginTop="@dimen/medium_margin"
android:paddingStart="@dimen/activity_margin"
android:paddingTop="@dimen/small_margin"
android:paddingEnd="@dimen/small_margin"
android:paddingBottom="@dimen/small_margin" />
<com.simplemobiletools.commons.views.MyTextView
android:id="@+id/items_placeholder"

4
build.gradle
View File

@ -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()
@ -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

2
fastlane/metadata/android/en-US/changelogs/108.txt Normal file
View File

@ -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