Skip to content

Commit 5c37785

Browse files
adityak368adityak368
committed
Fixed Dependency Error
1 parent 586c901 commit 5c37785

19 files changed

+27
-73
lines changed

‎.idea/misc.xml‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎filebrowser/build.gradle‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apply plugin: 'com.android.library'
33
ext {
44
PUBLISH_GROUP_ID = 'com.adityak'
55
PUBLISH_ARTIFACT_ID = 'browsemyfiles'
6-
PUBLISH_VERSION = '1.1'
6+
PUBLISH_VERSION = '1.2'
77
}
88

99
android {
@@ -14,8 +14,8 @@ android {
1414
//applicationId "com.aditya.filebrowser"
1515
minSdkVersion 15
1616
targetSdkVersion 25
17-
versionCode 1
18-
versionName "1.0"
17+
versionCode 3
18+
versionName "1.2"
1919
}
2020
buildTypes {
2121
release {
@@ -28,9 +28,8 @@ android {
2828
dependencies {
2929
compile fileTree(include: ['*.jar'], dir: 'libs')
3030
testCompile 'junit:junit:4.12'
31-
compile 'com.android.support:appcompat-v7:25.3.1'
32-
compile 'com.android.support:design:25.3.1'
33-
compile 'com.android.support:recyclerview-v7:25.3.1'
31+
compile 'com.android.support:appcompat-v7:25.3.0'
32+
compile 'com.android.support:recyclerview-v7:25.3.0'
3433
compile 'com.beardedhen:androidbootstrap:2.3.1'
3534
compile 'com.roughike:bottom-bar:2.3.1'
3635
compile files('libs/commons-io-2.5.jar')

‎filebrowser/src/main/AndroidManifest.xml‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,13 @@
77
<application
88
android:allowBackup="true"
99
android:label="@string/app_name"
10-
android:supportsRtl="true"
11-
android:theme="@style/AppTheme">
12-
<activity android:name=".FileBrowser" />
13-
<activity android:name=".FileChooser" />
14-
<activity android:name=".FileBrowserWithCustomHandler" />
10+
android:supportsRtl="true">
11+
<activity android:name=".FileBrowser"
12+
android:theme="@style/FileBrowserTheme"/>
13+
<activity android:name=".FileChooser"
14+
android:theme="@style/FileBrowserTheme"/>
15+
<activity android:name=".FileBrowserWithCustomHandler"
16+
android:theme="@style/FileBrowserTheme"/>
1517
<activity android:name=".utils.Permissions" android:theme="@style/Theme.AppCompat.Translucent" />
1618
</application>
1719

‎filebrowser/src/main/java/com/aditya/filebrowser/Constants.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,8 @@
22

33
import android.Manifest;
44
import android.os.Environment;
5-
import android.util.Log;
65

76
import java.io.File;
8-
import java.io.IOException;
97
import java.util.List;
108

119
/**

‎filebrowser/src/main/java/com/aditya/filebrowser/FileBrowser.java‎

Lines changed: 3 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@
1010
import android.content.Intent;
1111
import android.net.Uri;
1212
import android.os.Bundle;
13-
import android.os.Environment;
14-
import android.support.annotation.IdRes;
1513
import android.support.v7.app.AppCompatActivity;
1614
import android.support.v7.view.ActionMode;
1715
import android.support.v7.widget.LinearLayoutManager;
@@ -21,7 +19,6 @@
2119
import android.view.MenuItem;
2220
import android.view.View;
2321
import android.webkit.MimeTypeMap;
24-
import android.widget.RadioGroup;
2522
import android.widget.TextView;
2623
import android.widget.Toast;
2724

@@ -31,26 +28,16 @@
3128
import com.aditya.filebrowser.interfaces.FuncPtr;
3229
import com.aditya.filebrowser.interfaces.OnChangeDirectoryListener;
3330
import com.aditya.filebrowser.listeners.TabChangeListener;
34-
import com.aditya.filebrowser.models.FileItem;
3531
import com.aditya.filebrowser.utils.AssortedUtils;
3632
import com.aditya.filebrowser.utils.Permissions;
3733
import com.aditya.filebrowser.utils.ToolbarActionMode;
3834
import com.aditya.filebrowser.utils.UIUtils;
3935
import com.roughike.bottombar.BottomBar;
40-
import com.roughike.bottombar.OnTabReselectListener;
41-
import com.roughike.bottombar.OnTabSelectListener;
4236

4337
import org.apache.commons.io.FileUtils;
4438
import org.apache.commons.io.FilenameUtils;
45-
import org.apache.commons.io.comparator.LastModifiedFileComparator;
46-
import org.apache.commons.io.comparator.NameFileComparator;
47-
import org.apache.commons.io.comparator.SizeFileComparator;
4839

4940
import java.io.File;
50-
import java.util.ArrayList;
51-
import java.util.Arrays;
52-
import java.util.Comparator;
53-
import java.util.List;
5441

5542

5643
public class FileBrowser extends AppCompatActivity implements OnChangeDirectoryListener,ContextSwitcher {
@@ -71,7 +58,7 @@ public class FileBrowser extends AppCompatActivity implements OnChangeDirectoryL
7158
private Operations op;
7259
private FileIO io;
7360

74-
//Action Mode for toolbar
61+
//Action Mode for filebrowser_toolbar
7562
private static ActionMode mActionMode;
7663
private static final int APP_PERMISSION_REQUEST = 0;
7764

@@ -189,8 +176,8 @@ public void updateUI(File updatedDirectory,boolean shouldRePopulateCurrentDirect
189176
}
190177

191178
private void loadUi() {
192-
setContentView(R.layout.activity_main);
193-
toolbar = (Toolbar) findViewById(R.id.tool_bar);
179+
setContentView(R.layout.filebrowser_activity_main);
180+
toolbar = (Toolbar) findViewById(R.id.filebrowser_tool_bar);
194181
setSupportActionBar(toolbar);
195182

196183
mCurrentPath = (TextView) findViewById(R.id.currentPath);

‎filebrowser/src/main/java/com/aditya/filebrowser/FileBrowserWithCustomHandler.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ public class FileBrowserWithCustomHandler extends AppCompatActivity implements O
5454
private NavigationHelper mNavigationHelper;
5555
private Operations op;
5656
private FileIO io;
57-
//Action Mode for toolbar
57+
//Action Mode for filebrowser_toolbar
5858
private static ActionMode mActionMode;
5959
private static final int APP_PERMISSION_REQUEST = 0;
6060

@@ -173,8 +173,8 @@ public void updateUI(File updatedDirectory,boolean shouldRePopulateCurrentDirect
173173
}
174174

175175
private void loadUi() {
176-
setContentView(R.layout.activity_main);
177-
toolbar = (Toolbar) findViewById(R.id.tool_bar);
176+
setContentView(R.layout.filebrowser_activity_main);
177+
toolbar = (Toolbar) findViewById(R.id.filebrowser_tool_bar);
178178
setSupportActionBar(toolbar);
179179

180180
mCurrentPath = (TextView) findViewById(R.id.currentPath);

‎filebrowser/src/main/java/com/aditya/filebrowser/FileChooser.java‎

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@
55
import android.content.Intent;
66
import android.net.Uri;
77
import android.os.Bundle;
8-
import android.os.Environment;
9-
import android.support.annotation.IdRes;
108
import android.support.v7.app.AppCompatActivity;
119
import android.support.v7.view.ActionMode;
1210
import android.support.v7.widget.LinearLayoutManager;
@@ -15,7 +13,6 @@
1513
import android.view.Menu;
1614
import android.view.MenuItem;
1715
import android.view.View;
18-
import android.widget.RadioGroup;
1916
import android.widget.TextView;
2017
import android.widget.Toast;
2118

@@ -24,24 +21,15 @@
2421
import com.aditya.filebrowser.interfaces.ContextSwitcher;
2522
import com.aditya.filebrowser.interfaces.OnChangeDirectoryListener;
2623
import com.aditya.filebrowser.listeners.TabChangeListener;
27-
import com.aditya.filebrowser.models.FileItem;
2824
import com.aditya.filebrowser.utils.AssortedUtils;
2925
import com.aditya.filebrowser.utils.Permissions;
3026
import com.aditya.filebrowser.utils.ToolbarActionMode;
31-
import com.aditya.filebrowser.utils.UIUtils;
3227
import com.roughike.bottombar.BottomBar;
33-
import com.roughike.bottombar.OnTabReselectListener;
34-
import com.roughike.bottombar.OnTabSelectListener;
3528

3629
import org.apache.commons.io.FileUtils;
37-
import org.apache.commons.io.comparator.LastModifiedFileComparator;
38-
import org.apache.commons.io.comparator.NameFileComparator;
39-
import org.apache.commons.io.comparator.SizeFileComparator;
4030

4131
import java.io.File;
4232
import java.util.ArrayList;
43-
import java.util.Arrays;
44-
import java.util.Comparator;
4533

4634
/**
4735
* Created by Aditya on 4/17/2017.
@@ -65,7 +53,7 @@ public class FileChooser extends AppCompatActivity implements OnChangeDirectoryL
6553
private FileIO io;
6654
private int mSelectionMode;
6755

68-
//Action Mode for toolbar
56+
//Action Mode for filebrowser_toolbar
6957
private static ActionMode mActionMode;
7058
private static final int APP_PERMISSION_REQUEST = 0;
7159

@@ -141,8 +129,8 @@ public boolean onOptionsItemSelected(MenuItem item) {
141129
}
142130

143131
private void loadUi() {
144-
setContentView(R.layout.activity_main);
145-
toolbar = (Toolbar) findViewById(R.id.tool_bar);
132+
setContentView(R.layout.filebrowser_activity_main);
133+
toolbar = (Toolbar) findViewById(R.id.filebrowser_tool_bar);
146134
setSupportActionBar(toolbar);
147135

148136
mCurrentPath = (TextView) findViewById(R.id.currentPath);

‎filebrowser/src/main/java/com/aditya/filebrowser/FileIO.java‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,13 @@
22

33
import android.app.Activity;
44
import android.app.ProgressDialog;
5-
import android.content.Context;
65
import android.content.DialogInterface;
76
import android.content.Intent;
87
import android.content.pm.PackageManager;
98
import android.content.pm.ResolveInfo;
109
import android.net.Uri;
1110
import android.support.v7.app.AlertDialog;
1211

13-
import com.aditya.filebrowser.adapters.CustomAdapter;
14-
import com.aditya.filebrowser.interfaces.ContextSwitcher;
1512
import com.aditya.filebrowser.interfaces.FuncPtr;
1613
import com.aditya.filebrowser.interfaces.OnChangeDirectoryListener;
1714
import com.aditya.filebrowser.models.FileItem;

‎filebrowser/src/main/java/com/aditya/filebrowser/FileNavigator.java‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
package com.aditya.filebrowser;
22

3-
import com.aditya.filebrowser.models.FileItem;
4-
53
import java.io.File;
6-
import java.util.ArrayList;
74

85
/**
96
* Created by Aditya on 4/17/2017.

‎filebrowser/src/main/java/com/aditya/filebrowser/GetRemovableDevice.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package com.aditya.filebrowser;
22

3-
import android.os.Environment;
43
import android.util.Log;
54

65
import java.io.BufferedReader;

0 commit comments

Comments
 (0)