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

resources harmonization

Browse source
This commit is contained in:
Nikolay Pultsin 2014-04-14 21:29:25 +01:00
parent 5dfcbc7d76
commit d6b3352215
2 changed files with 41 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

34
assets/resources/application/en.xml
View file

@ -311,23 +311,6 @@
<node name="fontPath" value="Where to seek for fonts"/>
<node name="wallpaperPath" value="Where to seek for background images"/>
<node name="tempDir" value="Where to store temporary files"/>
<node name="fileChooser" value="File chooser">
<node name="root" value="Root"/>
<node name="ok" value="Ok"/>
<node name="cancel" value="Cancel"/>
<node name="newFolder" value="New folder"/>
<node name="folderName" value="Folder name"/>
<node name="chooseFolder" value="Choose a folder..."/>
<node name="chooseFolders" value="Choose folders..."/>
<node name="chooseFile" value="Choose a file..."/>
<node name="menuHome" value="Home"/>
<node name="menuReload" value="Reload"/>
<node name="sortBy" value="Sort by">
<node name="name" value="Name"/>
<node name="size" value="Size"/>
<node name="date" value="Date"/>
</node>
</node>
</node>
<node name="appearance" value="Appearance">
<node name="summary" value="Display settings, status bar, button lights"/>
@ -878,6 +861,23 @@
<node name="message1" value="FBReader works in fullscreen mode by default. Tap center third of the screen to show controls. You can change this behaviour in “Appearance” section of the Settings dialog."/>
<node name="message2" value="Well done! Now tap the center third again to hide the controls and this hint. If you want to keep controls on the screen during reading, select “Show action bar” option in “Appearance” section of the Settings dialog."/>
</node>
<node name="fileChooser" value="File chooser">
<node name="root" value="Root"/>
<node name="ok" value="Ok"/>
<node name="cancel" value="Cancel"/>
<node name="newFolder" value="New folder"/>
<node name="folderName" value="Folder name"/>
<node name="chooseFolder" value="Choose a folder…"/>
<node name="chooseFolders" value="Choose folders…"/>
<node name="chooseFile" value="Choose a file…"/>
<node name="menuHome" value="Home"/>
<node name="menuReload" value="Reload"/>
<node name="sortBy" value="Sort by">
<node name="name" value="Name"/>
<node name="size" value="Size"/>
<node name="date" value="Date"/>
</node>
</node>
</node>
<node name="errorMessage">
<node name="nativeCodeFailure" value="Error %s in native code during reading '%s'"/>

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

@ -19,14 +19,14 @@
package org.geometerplus.android.fbreader.preferences.fileChooser;
import java.util.HashMap;
import android.app.Activity;
import android.content.Context;
import android.content.Intent;
import android.os.Parcelable;
import android.preference.Preference;
import java.util.HashMap;
import group.pals.android.lib.ui.filechooser.FileChooserActivity;
import group.pals.android.lib.ui.filechooser.services.IFileProvider;
import group.pals.android.lib.ui.filechooser.io.localfile.LocalFile;
@ -35,39 +35,36 @@ import org.geometerplus.zlibrary.core.resources.ZLResource;
abstract class FileChooserPreference extends Preference {
private final int myRegCode;
private ZLResource myRootResource;
private String myResourceName;
FileChooserPreference(Context context, ZLResource rootResource, String resourceKey, int regCode) {
super(context);
myRegCode = regCode;
myRootResource = rootResource;
myResourceName = "fileChooser";
setTitle(myRootResource.getResource(resourceKey).getValue());
setTitle(rootResource.getResource(resourceKey).getValue());
}
@Override
protected void onClick() {
HashMap<String, String> textResources = new HashMap<String, String>();
textResources.put("root", myRootResource.getResource(myResourceName).getResource("root").getValue());
textResources.put("ok", myRootResource.getResource(myResourceName).getResource("ok").getValue());
textResources.put("cancel", myRootResource.getResource(myResourceName).getResource("cancel").getValue());
textResources.put("newFolder", myRootResource.getResource(myResourceName).getResource("newFolder").getValue());
textResources.put("folderName", myRootResource.getResource(myResourceName).getResource("folderName").getValue());
textResources.put("chooseFolder", myRootResource.getResource(myResourceName).getResource("chooseFolder").getValue());
textResources.put("chooseFolders", myRootResource.getResource(myResourceName).getResource("chooseFolders").getValue());
textResources.put("chooseFile", myRootResource.getResource(myResourceName).getResource("chooseFile").getValue());
textResources.put("sortBy", myRootResource.getResource(myResourceName).getResource("sortBy").getValue());
textResources.put("sortByName", myRootResource.getResource(myResourceName).getResource("sortBy").getResource("name").getValue());
textResources.put("sortBySize", myRootResource.getResource(myResourceName).getResource("sortBy").getResource("size").getValue());
textResources.put("sortByDate", myRootResource.getResource(myResourceName).getResource("sortBy").getResource("date").getValue());
textResources.put("menuHome", myRootResource.getResource(myResourceName).getResource("menuHome").getValue());
textResources.put("menuReload", myRootResource.getResource(myResourceName).getResource("menuReload").getValue());
final ZLResource resource = ZLResource.resource("dialog").getResource("fileChooser");
final HashMap<String,String> textResources = new HashMap<String,String>();
textResources.put("root", resource.getResource("root").getValue());
textResources.put("ok", resource.getResource("ok").getValue());
textResources.put("cancel", resource.getResource("cancel").getValue());
textResources.put("newFolder", resource.getResource("newFolder").getValue());
textResources.put("folderName", resource.getResource("folderName").getValue());
textResources.put("chooseFolder", resource.getResource("chooseFolder").getValue());
textResources.put("chooseFolders", resource.getResource("chooseFolders").getValue());
textResources.put("chooseFile", resource.getResource("chooseFile").getValue());
final ZLResource sortResource = resource.getResource("sortBy");
textResources.put("sortBy", sortResource.getValue());
textResources.put("sortByName", sortResource.getResource("name").getValue());
textResources.put("sortBySize", sortResource.getResource("size").getValue());
textResources.put("sortByDate", sortResource.getResource("date").getValue());
textResources.put("menuHome", resource.getResource("menuHome").getValue());
textResources.put("menuReload", resource.getResource("menuReload").getValue());
final Intent intent = new Intent(getContext(), FileChooserActivity.class);
intent.putExtra(FileChooserActivity._TextResources, textResources);
intent.putExtra(FileChooserActivity._Rootpath, (Parcelable)new LocalFile(getStringValue()));
intent.putExtra(FileChooserActivity._ActionBar, true);