Skip to content

Commit c3a2aba

Browse files
committed
use the FileProperties dialog from bintray
1 parent 0757bf2 commit c3a2aba

File tree

4 files changed

+9
-128
lines changed

4 files changed

+9
-128
lines changed

app/build.gradle

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,10 @@ android {
2727
}
2828
}
2929

30+
packagingOptions {
31+
exclude 'META-INF/library-compileDebugKotlin.kotlin_module'
32+
}
33+
3034
sourceSets {
3135
main.java.srcDirs += 'src/main/kotlin'
3236
}
@@ -40,6 +44,7 @@ dependencies {
4044
compile 'com.jakewharton:butterknife:8.0.1'
4145
compile 'com.github.bumptech.glide:glide:3.7.0'
4246
compile 'com.simplemobiletools:filepicker:1.3.6@aar'
47+
compile 'com.simplemobiletools:fileproperties:1.0.2@aar'
4348
compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
4449

4550
apt 'com.jakewharton:butterknife-compiler:8.0.1'

app/src/main/java/com/simplemobiletools/filemanager/fragments/ItemsFragment.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,9 @@
3232
import com.simplemobiletools.filemanager.asynctasks.CopyTask;
3333
import com.simplemobiletools.filemanager.dialogs.CopyDialog;
3434
import com.simplemobiletools.filemanager.dialogs.CreateNewItemDialog;
35-
import com.simplemobiletools.filemanager.dialogs.PropertiesDialog;
3635
import com.simplemobiletools.filemanager.dialogs.RenameItemDialog;
3736
import com.simplemobiletools.filepicker.models.FileDirItem;
37+
import com.simplemobiletools.fileproperties.dialogs.PropertiesDialog;
3838

3939
import java.io.File;
4040
import java.io.FileFilter;
@@ -332,15 +332,15 @@ private void showOneItemProperties() {
332332
if (item == null)
333333
return;
334334

335-
new PropertiesDialog(getContext(), item.getPath(), mConfig.getShowHidden());
335+
new PropertiesDialog(getActivity(), item.getPath(), mConfig.getShowHidden());
336336
}
337337

338338
private void showMultipleItemProperties(List<Integer> itemIndexes) {
339339
final List<String> paths = new ArrayList<>(itemIndexes.size());
340340
for (int i : itemIndexes) {
341341
paths.add(mItems.get(i).getPath());
342342
}
343-
new PropertiesDialog(getContext(), paths, mConfig.getShowHidden());
343+
new PropertiesDialog(getActivity(), paths, mConfig.getShowHidden());
344344
}
345345

346346
private void displayRenameDialog() {

app/src/main/kotlin/com/simplemobiletools/filemanager/activities/MainActivity.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ class MainActivity : SimpleActivity(), ItemsFragment.ItemInteractionListener, Br
4646
}
4747

4848
private fun openPath(path: String) {
49-
breadcrumbs.setBreadcrumb(path, mBasePath)
49+
breadcrumbs.setBreadcrumb(path)
5050
val bundle = Bundle()
5151
bundle.putString(Constants.PATH, path)
5252

app/src/main/kotlin/com/simplemobiletools/filemanager/dialogs/PropertiesDialog.kt

Lines changed: 0 additions & 124 deletions
This file was deleted.

0 commit comments

Comments
 (0)