yetangitu/FBReaderJ
1
0
Fork 0
mirror of https://github.com/geometer/FBReaderJ.git synced 2025-10-04 10:19:33 +02:00
Code Issues Releases Wiki Activity

Merge branch 'master' into dm

Browse source 
Conflicts:
	src/org/geometerplus/android/fbreader/preferences/fileChooser/FileChooserPreference.java
	src/org/geometerplus/android/fbreader/preferences/fileChooser/FileChooserStringListPreference.java
This commit is contained in:
Nikolay Pultsin 2014-05-03 03:32:57 +01:00
commit 7c15fe932c
6 changed files with 22 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

2
AndroidManifest.xml
View file

@ -288,6 +288,6 @@
<service android:name="org.geometerplus.android.fbreader.httpd.DataService" android:launchMode="singleTask" android:process=":dataService" android:exported="false"/>
<service android:name="group.pals.android.lib.ui.filechooser.services.LocalFileProvider" android:exported="false"/>
<activity android:name="group.pals.android.lib.ui.filechooser.FileChooserActivity" android:configChanges="orientation|screenSize|keyboard|keyboardHidden" android:theme="@style/FBReader.Dialog" android:exported="false"/>
<activity android:name="org.geometerplus.android.fbreader.DirectoriesManagerActivity" android:configChanges="orientation|screenSize|keyboard|keyboardHidden" android:theme="@style/FBReader.Dialog"/>
<activity android:name="org.geometerplus.android.util.FolderListDialogActivity" android:configChanges="orientation|screenSize|keyboard|keyboardHidden" android:theme="@style/FBReader.Dialog"/>
</application>
</manifest>

16
src/org/geometerplus/android/fbreader/preferences/fileChooser/FileChooserPreference.java
View file

@ -19,18 +19,15 @@
package org.geometerplus.android.fbreader.preferences.fileChooser;
import android.app.Activity;
import android.content.Context;
import android.content.Intent;
import android.preference.Preference;
import org.geometerplus.zlibrary.core.resources.ZLResource;
import org.geometerplus.android.util.FileChooserUtil;
abstract class FileChooserPreference extends Preference {
protected final int myRegCode;
private final ZLResource myResource;
protected final ZLResource myResource;
protected final boolean myChooseWritableDirectoriesOnly;
protected final Runnable myOnValueSetAction;
@ -45,17 +42,6 @@ abstract class FileChooserPreference extends Preference {
myOnValueSetAction = onValueSetAction;
}
@Override
protected void onClick() {
FileChooserUtil.runDirectoryChooser(
(Activity)getContext(),
myRegCode,
myResource.getResource("chooserTitle").getValue(),
getStringValue(),
myChooseWritableDirectoriesOnly
);
}
protected abstract String getStringValue();
protected abstract void setValueFromIntent(Intent data);
}

3
src/org/geometerplus/android/fbreader/preferences/fileChooser/FileChooserStringListPreference.java
View file

@ -34,15 +34,12 @@ import org.geometerplus.android.util.FileChooserUtil;
class FileChooserStringListPreference extends FileChooserPreference {
private final ZLStringListOption myOption;
private final ZLResource myResource;
FileChooserStringListPreference(Context context, ZLResource rootResource, String resourceKey, ZLStringListOption option, int regCode, Runnable onValueSetAction) {
super(context, rootResource, resourceKey, false, regCode, onValueSetAction);
myOption = option;
myResource = rootResource.getResource(resourceKey);
setSummary(getStringValue());
}

12
src/org/geometerplus/android/fbreader/preferences/fileChooser/FileChooserStringPreference.java
View file

@ -19,6 +19,7 @@
package org.geometerplus.android.fbreader.preferences.fileChooser;
import android.app.Activity;
import android.content.Context;
import android.content.Intent;
@ -38,6 +39,17 @@ class FileChooserStringPreference extends FileChooserPreference {
setSummary(getStringValue());
}
@Override
protected void onClick() {
FileChooserUtil.runDirectoryChooser(
(Activity)getContext(),
myRegCode,
myResource.getResource("chooserTitle").getValue(),
getStringValue(),
myChooseWritableDirectoriesOnly
);
}
@Override
protected String getStringValue() {
return myOption.getValue();

14
src/org/geometerplus/android/util/FileChooserUtil.java
View file

@ -32,8 +32,6 @@ import group.pals.android.lib.ui.filechooser.io.localfile.LocalFile;
import org.geometerplus.zlibrary.core.resources.ZLResource;
import org.geometerplus.android.fbreader.DirectoriesManagerActivity;
public abstract class FileChooserUtil {
private FileChooserUtil() {
}
@ -46,11 +44,11 @@ public abstract class FileChooserUtil {
ArrayList<String> initinalValue,
boolean chooseWritableDirsOnly
) {
final Intent intent = new Intent(activity, DirectoriesManagerActivity.class);
intent.putExtra(DirectoriesManagerActivity.TITLE, title);
intent.putExtra(DirectoriesManagerActivity.CHOOSER_TITLE, fileChooserTitle);
intent.putStringArrayListExtra(DirectoriesManagerActivity.DIR_LIST, initinalValue);
intent.putExtra(DirectoriesManagerActivity.WRITABLE_DIRS_ONLY, chooseWritableDirsOnly);
final Intent intent = new Intent(activity, FolderListDialogActivity.class);
intent.putExtra(FolderListDialogActivity.TITLE, title);
intent.putExtra(FolderListDialogActivity.CHOOSER_TITLE, fileChooserTitle);
intent.putStringArrayListExtra(FolderListDialogActivity.DIR_LIST, initinalValue);
intent.putExtra(FolderListDialogActivity.WRITABLE_DIRS_ONLY, chooseWritableDirsOnly);
activity.startActivityForResult(intent, requestCode);
}
@ -81,7 +79,7 @@ public abstract class FileChooserUtil {
}
public static ArrayList<String> pathArrayFromData(Intent data) {
return data.getStringArrayListExtra(DirectoriesManagerActivity.DIR_LIST);
return data.getStringArrayListExtra(FolderListDialogActivity.DIR_LIST);
}
private static HashMap<String,String> textResources(String title) {

4
src/org/geometerplus/android/fbreader/DirectoriesManagerActivity.java → src/org/geometerplus/android/util/FolderListDialogActivity.java
View file

@ -17,7 +17,7 @@
* 02110-1301, USA.
*/
package org.geometerplus.android.fbreader;
package org.geometerplus.android.util;
import java.util.ArrayList;
@ -31,7 +31,7 @@ import org.geometerplus.zlibrary.core.resources.ZLResource;
import org.geometerplus.zlibrary.ui.android.R;
import org.geometerplus.android.util.FileChooserUtil;
public class DirectoriesManagerActivity extends Activity{
public class FolderListDialogActivity extends Activity{
private final int ADD_NEW_DIR_POSITION = 0;
public static final String TITLE = "dir_manager_title";
public static final String CHOOSER_TITLE = "chooser_title";