Small changes

This commit is contained in:
Vlad Mihalachi 2015-03-15 17:38:03 +01:00
parent 60395106e5
commit 1cd94a5310
4 changed files with 44 additions and 23 deletions

View File

@ -96,8 +96,8 @@
jar="/Users/mac/AndroidStudioProjects/turbo-editor/app/build/intermediates/exploded-aar/turbo-editor.libraries/sharedCode/unspecified/classes.jar" jar="/Users/mac/AndroidStudioProjects/turbo-editor/app/build/intermediates/exploded-aar/turbo-editor.libraries/sharedCode/unspecified/classes.jar"
jumboMode="false" jumboMode="false"
revision="22.0.0" revision="22.0.0"
sha1="5f8b3de6e00b82a3937c97aa571ca2e05a4075d6"> sha1="6b22f22976cfd612e54da1632d59fe5a4a5d47ea">
<dex dex="/Users/mac/AndroidStudioProjects/turbo-editor/app/build/intermediates/pre-dexed/release/classes-7af851cddf38d5159407b847c0234eebc467ba34.jar" /> <dex dex="/Users/mac/AndroidStudioProjects/turbo-editor/app/build/intermediates/pre-dexed/debug/classes-7af851cddf38d5159407b847c0234eebc467ba34.jar" />
</item> </item>
<item <item
jar="/Users/mac/.gradle/caches/modules-2/files-2.1/commons-io/commons-io/2.4/b1b6ea3b7e4aa4f492509a4952029cd8e48019ad/commons-io-2.4.jar" jar="/Users/mac/.gradle/caches/modules-2/files-2.1/commons-io/commons-io/2.4/b1b6ea3b7e4aa4f492509a4952029cd8e48019ad/commons-io-2.4.jar"
@ -120,13 +120,6 @@
sha1="591d72211acc0b909b79c840e0b3ed9a0982d807"> sha1="591d72211acc0b909b79c840e0b3ed9a0982d807">
<dex dex="/Users/mac/AndroidStudioProjects/turbo-editor/app/build/intermediates/pre-dexed/release/juniversalchardet-1.0.3-6da18fe8b14fd219de988c9272910bd26b1433a2.jar" /> <dex dex="/Users/mac/AndroidStudioProjects/turbo-editor/app/build/intermediates/pre-dexed/release/juniversalchardet-1.0.3-6da18fe8b14fd219de988c9272910bd26b1433a2.jar" />
</item> </item>
<item
jar="/Users/mac/AndroidStudioProjects/turbo-editor/app-pro/build/intermediates/exploded-aar/turbo-editor.libraries/sharedCode/unspecified/classes.jar"
jumboMode="false"
revision="21.1.2"
sha1="2c3d4d7b9f51d8f85dd121d722fcdce37b6f5752">
<dex dex="/Users/mac/AndroidStudioProjects/turbo-editor/app-pro/build/intermediates/pre-dexed/debug/classes-d2f158f0c6d8e71984e1b2f52f7c248ddf421cff.jar" />
</item>
<item <item
jar="/Users/mac/AndroidStudioProjects/turbo-editor/app/build/intermediates/exploded-aar/turbo-editor.libraries/RootCommands/unspecified/classes.jar" jar="/Users/mac/AndroidStudioProjects/turbo-editor/app/build/intermediates/exploded-aar/turbo-editor.libraries/RootCommands/unspecified/classes.jar"
jumboMode="false" jumboMode="false"
@ -134,6 +127,13 @@
sha1="8fc5121de38525c53e82648c80cf0a9818b956ff"> sha1="8fc5121de38525c53e82648c80cf0a9818b956ff">
<dex dex="/Users/mac/AndroidStudioProjects/turbo-editor/app/build/intermediates/pre-dexed/release/classes-8e353cdc5188a33b2ae051656b4023deec32169f.jar" /> <dex dex="/Users/mac/AndroidStudioProjects/turbo-editor/app/build/intermediates/pre-dexed/release/classes-8e353cdc5188a33b2ae051656b4023deec32169f.jar" />
</item> </item>
<item
jar="/Users/mac/AndroidStudioProjects/turbo-editor/app-pro/build/intermediates/exploded-aar/turbo-editor.libraries/sharedCode/unspecified/classes.jar"
jumboMode="false"
revision="21.1.2"
sha1="2c3d4d7b9f51d8f85dd121d722fcdce37b6f5752">
<dex dex="/Users/mac/AndroidStudioProjects/turbo-editor/app-pro/build/intermediates/pre-dexed/debug/classes-d2f158f0c6d8e71984e1b2f52f7c248ddf421cff.jar" />
</item>
<item <item
jar="/Users/mac/AndroidStudioProjects/turbo-editor/app/build/intermediates/exploded-aar/com.crashlytics.sdk.android/beta/1.1.2/classes.jar" jar="/Users/mac/AndroidStudioProjects/turbo-editor/app/build/intermediates/exploded-aar/com.crashlytics.sdk.android/beta/1.1.2/classes.jar"
jumboMode="false" jumboMode="false"
@ -142,11 +142,11 @@
<dex dex="/Users/mac/AndroidStudioProjects/turbo-editor/app/build/intermediates/pre-dexed/release/classes-d7c3cbd32b25008f71bfaf501c6d05efb73f9642.jar" /> <dex dex="/Users/mac/AndroidStudioProjects/turbo-editor/app/build/intermediates/pre-dexed/release/classes-d7c3cbd32b25008f71bfaf501c6d05efb73f9642.jar" />
</item> </item>
<item <item
jar="/Users/mac/.gradle/caches/modules-2/files-2.1/org.apache.commons/commons-lang3/3.1/905075e6c80f206bbe6cf1e809d2caa69f420c76/commons-lang3-3.1.jar" jar="/Users/mac/AndroidStudioProjects/turbo-editor/app/build/intermediates/exploded-aar/com.github.gabrielemariotti.changeloglib/library/1.5.1/classes.jar"
jumboMode="false" jumboMode="false"
revision="22.0.0" revision="22.0.0"
sha1="905075e6c80f206bbe6cf1e809d2caa69f420c76"> sha1="74a89f0f8b56d9f11d70b8d8134cf4109f4797dc">
<dex dex="/Users/mac/AndroidStudioProjects/turbo-editor/app-pro/build/intermediates/pre-dexed/debug/commons-lang3-3.1-b10c93b68b275dbbda03ac96f3dca1760aaa7c91.jar" /> <dex dex="/Users/mac/AndroidStudioProjects/turbo-editor/app/build/intermediates/pre-dexed/release/classes-378a7c750e497deeb602597a239d4846198295a3.jar" />
</item> </item>
<item <item
jar="/Users/mac/AndroidStudioProjects/turbo-editor/app/build/intermediates/exploded-aar/turbo-editor.libraries/RootCommands/unspecified/classes.jar" jar="/Users/mac/AndroidStudioProjects/turbo-editor/app/build/intermediates/exploded-aar/turbo-editor.libraries/RootCommands/unspecified/classes.jar"
@ -156,11 +156,11 @@
<dex dex="/Users/mac/AndroidStudioProjects/turbo-editor/app/build/intermediates/pre-dexed/debug/classes-8e353cdc5188a33b2ae051656b4023deec32169f.jar" /> <dex dex="/Users/mac/AndroidStudioProjects/turbo-editor/app/build/intermediates/pre-dexed/debug/classes-8e353cdc5188a33b2ae051656b4023deec32169f.jar" />
</item> </item>
<item <item
jar="/Users/mac/AndroidStudioProjects/turbo-editor/app/build/intermediates/exploded-aar/com.github.gabrielemariotti.changeloglib/library/1.5.1/classes.jar" jar="/Users/mac/.gradle/caches/modules-2/files-2.1/org.apache.commons/commons-lang3/3.1/905075e6c80f206bbe6cf1e809d2caa69f420c76/commons-lang3-3.1.jar"
jumboMode="false" jumboMode="false"
revision="22.0.0" revision="22.0.0"
sha1="74a89f0f8b56d9f11d70b8d8134cf4109f4797dc"> sha1="905075e6c80f206bbe6cf1e809d2caa69f420c76">
<dex dex="/Users/mac/AndroidStudioProjects/turbo-editor/app/build/intermediates/pre-dexed/release/classes-378a7c750e497deeb602597a239d4846198295a3.jar" /> <dex dex="/Users/mac/AndroidStudioProjects/turbo-editor/app-pro/build/intermediates/pre-dexed/debug/commons-lang3-3.1-b10c93b68b275dbbda03ac96f3dca1760aaa7c91.jar" />
</item> </item>
<item <item
jar="/Users/mac/AndroidStudioProjects/turbo-editor/app-pro/build/intermediates/exploded-aar/turbo-editor.libraries/RootCommands/unspecified/classes.jar" jar="/Users/mac/AndroidStudioProjects/turbo-editor/app-pro/build/intermediates/exploded-aar/turbo-editor.libraries/RootCommands/unspecified/classes.jar"

View File

@ -63,7 +63,7 @@ import sharedcode.turboeditor.util.Build;
import sharedcode.turboeditor.util.ThemeUtils; import sharedcode.turboeditor.util.ThemeUtils;
public class SelectFileActivity extends ActionBarActivity implements SearchView.OnQueryTextListener, AdapterView.OnItemClickListener, EditTextDialog.EditDialogListener { public class SelectFileActivity extends ActionBarActivity implements SearchView.OnQueryTextListener, AdapterView.OnItemClickListener, EditTextDialog.EditDialogListener {
private String currentFolder = PreferenceHelper.SD_CARD_ROOT; private String currentFolder;
private ListView listView; private ListView listView;
private boolean wantAFile = true; private boolean wantAFile = true;
private MenuItem mSearchViewMenuItem; private MenuItem mSearchViewMenuItem;
@ -73,7 +73,7 @@ public class SelectFileActivity extends ActionBarActivity implements SearchView.
@Override @Override
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {
currentFolder = PreferenceHelper.defaultFolder(this);
ThemeUtils.setTheme(this); ThemeUtils.setTheme(this);
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
@ -129,8 +129,8 @@ public class SelectFileActivity extends ActionBarActivity implements SearchView.
File file = new File(lastNavigatedPath); File file = new File(lastNavigatedPath);
if (!file.exists()) { if (!file.exists()) {
PreferenceHelper.setWorkingFolder(this, PreferenceHelper.SD_CARD_ROOT); PreferenceHelper.setWorkingFolder(this, PreferenceHelper.defaultFolder(this));
file = new File(PreferenceHelper.SD_CARD_ROOT); file = new File(PreferenceHelper.defaultFolder(this));
} }
new UpdateList().execute(file.getAbsolutePath()); new UpdateList().execute(file.getAbsolutePath());

View File

@ -24,9 +24,11 @@ import android.content.SharedPreferences;
import android.os.Environment; import android.os.Environment;
import android.preference.PreferenceManager; import android.preference.PreferenceManager;
import java.io.File;
public final class PreferenceHelper { public final class PreferenceHelper {
public static final String SD_CARD_ROOT = Environment.getExternalStorageDirectory().getAbsolutePath(); //public static final String SD_CARD_ROOT = Environment.getExternalStorageDirectory().getAbsolutePath();
private PreferenceHelper() { private PreferenceHelper() {
} }
@ -93,8 +95,21 @@ public final class PreferenceHelper {
return getPrefs(context).getInt("font_size", 16); return getPrefs(context).getInt("font_size", 16);
} }
public static String defaultFolder(Context context) {
String folder;
/*File externalFolder = context.getFilesDir();
if (externalFolder != null) {
folder = externalFolder.getAbsolutePath();
} else {
folder = Environment.getExternalStorageDirectory().getAbsolutePath();
}*/
folder = Environment.getExternalStorageDirectory().getAbsolutePath();
return folder;
}
public static String getWorkingFolder(Context context) { public static String getWorkingFolder(Context context) {
return getPrefs(context).getString("working_folder", SD_CARD_ROOT); return getPrefs(context).getString("working_folder", defaultFolder(context));
} }
public static String[] getSavedPaths(Context context) { public static String[] getSavedPaths(Context context) {

View File

@ -20,7 +20,8 @@
<resources> <resources>
<style name="AppThemeBaseDark" parent="Theme.AppCompat.NoActionBar"> <style name="AppThemeBaseDark" parent="Theme.AppCompat.NoActionBar">
<item name="windowActionModeOverlay">true</item>
<item name="actionModeStyle">@style/LStyled.ActionMode</item>
<!-- Dialog --> <!-- Dialog -->
<item name="textAppearanceDialogTitle">@style/TextAppearance.Dialog.Title</item> <item name="textAppearanceDialogTitle">@style/TextAppearance.Dialog.Title</item>
<item name="textAppearanceDialogMessage">@style/TextAppearance.Dialog.Message</item> <item name="textAppearanceDialogMessage">@style/TextAppearance.Dialog.Message</item>
@ -40,7 +41,8 @@
</style> </style>
<style name="AppThemeBaseLight" parent="Theme.AppCompat.Light.NoActionBar"> <style name="AppThemeBaseLight" parent="Theme.AppCompat.Light.NoActionBar">
<item name="windowActionModeOverlay">true</item>
<item name="actionModeStyle">@style/LStyled.ActionMode</item>
<!-- Dialog --> <!-- Dialog -->
<item name="textAppearanceDialogTitle">@style/TextAppearance.Dialog.Title</item> <item name="textAppearanceDialogTitle">@style/TextAppearance.Dialog.Title</item>
<item name="textAppearanceDialogMessage">@style/TextAppearance.Dialog.Message</item> <item name="textAppearanceDialogMessage">@style/TextAppearance.Dialog.Message</item>
@ -63,6 +65,10 @@
<item name="android:windowBackground">@null</item> <item name="android:windowBackground">@null</item>
</style> </style>
<style name="LStyled.ActionMode" parent="@style/Widget.AppCompat.ActionMode">
<item name="background">@color/actionbar_background</item>
</style>
<style name="PreferenceDark" parent="android:Theme.Holo"> <style name="PreferenceDark" parent="android:Theme.Holo">
</style> </style>