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

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

View File

@@ -24,9 +24,11 @@ import android.content.SharedPreferences;
import android.os.Environment;
import android.preference.PreferenceManager;
import java.io.File;
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() {
}
@@ -93,8 +95,21 @@ public final class PreferenceHelper {
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) {
return getPrefs(context).getString("working_folder", SD_CARD_ROOT);
return getPrefs(context).getString("working_folder", defaultFolder(context));
}
public static String[] getSavedPaths(Context context) {

View File

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