yenru0/EhViewer
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update string.xml

Browse Source
This commit is contained in:
seven332 committed 2016-03-06 14:49:30 +08:00
1 parent 008c662209
commit de6a5141b9
11 files changed
+80 -25
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

app/src/main/java/com/hippo/ehviewer/ui/CommonOperations.java
+1 -1
View File
@@ -75,7 +75,7 @@ public final class CommonOperations {
Settings.putDefaultFavSlot(Settings.INVALID_DEFAULT_FAV_SLOT);
}
}
}, activity.getString(R.string.remember_favorite_slot), false)
}, activity.getString(R.string.remember_favorite_collection), false)
.setTitle(R.string.add_favorites_dialog_title)
.show();
}
app/src/main/java/com/hippo/ehviewer/ui/MainActivity.java
+4 -4
View File
@@ -38,7 +38,7 @@ import com.hippo.ehviewer.client.EhUrlOpener;
import com.hippo.ehviewer.client.EhUtils;
import com.hippo.ehviewer.ui.scene.BaseScene;
import com.hippo.ehviewer.ui.scene.DownloadLabelScene;
import com.hippo.ehviewer.ui.scene.DownloadScene;
import com.hippo.ehviewer.ui.scene.DownloadsScene;
import com.hippo.ehviewer.ui.scene.FavoritesScene;
import com.hippo.ehviewer.ui.scene.GalleryCommentsScene;
import com.hippo.ehviewer.ui.scene.GalleryDetailScene;
@@ -76,7 +76,7 @@ public final class MainActivity extends StageActivity
registerLaunchMode(GalleryInfoScene.class, SceneFragment.LAUNCH_MODE_STANDARD);
registerLaunchMode(GalleryCommentsScene.class, SceneFragment.LAUNCH_MODE_STANDARD);
registerLaunchMode(GalleryPreviewsScene.class, SceneFragment.LAUNCH_MODE_STANDARD);
registerLaunchMode(DownloadScene.class, SceneFragment.LAUNCH_MODE_SINGLE_TASK);
registerLaunchMode(DownloadsScene.class, SceneFragment.LAUNCH_MODE_SINGLE_TASK);
registerLaunchMode(DownloadLabelScene.class, SceneFragment.LAUNCH_MODE_SINGLE_TASK);
registerLaunchMode(FavoritesScene.class, SceneFragment.LAUNCH_MODE_SINGLE_TASK);
registerLaunchMode(ProgressScene.class, SceneFragment.LAUNCH_MODE_STANDARD);
@@ -295,8 +295,8 @@ public final class MainActivity extends StageActivity
startScene(new Announcer(FavoritesScene.class));
} else if (id == R.id.nav_history) {
} else if (id == R.id.nav_download) {
startScene(new Announcer(DownloadScene.class));
} else if (id == R.id.nav_downloads) {
startScene(new Announcer(DownloadsScene.class));
} else if (id == R.id.nav_settings) {
Intent intent = new Intent(this, SettingsActivity.class);
startActivity(intent);
app/src/main/java/com/hippo/ehviewer/ui/scene/DownloadScene.java → app/src/main/java/com/hippo/ehviewer/ui/scene/DownloadsScene.java
+3 -3
View File
@@ -86,7 +86,7 @@ import java.util.ArrayList;
import java.util.LinkedList;
import java.util.List;
public class DownloadScene extends ToolbarScene
public class DownloadsScene extends ToolbarScene
implements DownloadManager.DownloadInfoListener,
EasyRecyclerView.OnItemClickListener,
EasyRecyclerView.OnItemLongClickListener,
@@ -238,7 +238,7 @@ public class DownloadScene extends ToolbarScene
setNavigationIcon(R.drawable.v_arrow_left_dark_x24);
// Clear nav checked item
setNavCheckedItem(R.id.nav_download);
setNavCheckedItem(R.id.nav_downloads);
// Hide IME
ActivityHelper.hideSoftInput(getActivity());
@@ -1000,7 +1000,7 @@ public class DownloadScene extends ToolbarScene
@Override
public void onOutOfCustomChoice(EasyRecyclerView view) {
if (mRecyclerView != null) {
mRecyclerView.setOnItemLongClickListener(DownloadScene.this);
mRecyclerView.setOnItemLongClickListener(DownloadsScene.this);
}
if (mFabLayout != null) {
mFabLayout.setExpanded(false);
app/src/main/java/com/hippo/ehviewer/ui/scene/FavoritesScene.java
+1 -1
View File
@@ -403,7 +403,7 @@ public class FavoritesScene extends BaseScene implements
String[] favCat = Settings.getFavCat();
System.arraycopy(favCat, 0, items, 2, 10);
new AlertDialog.Builder(getContext())
.setTitle(R.string.default_favorites_slot)
.setTitle(R.string.default_favorites_collection)
.setItems(items, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryDetailScene.java
+1 -1
View File
@@ -1248,7 +1248,7 @@ public class GalleryDetailScene extends BaseScene implements View.OnClickListene
@TargetApi(Build.VERSION_CODES.LOLLIPOP)
public boolean onTransition(Context context,
FragmentTransaction transaction, Fragment exit, Fragment enter) {
if (!(enter instanceof GalleryListScene) && !(enter instanceof DownloadScene) &&
if (!(enter instanceof GalleryListScene) && !(enter instanceof DownloadsScene) &&
!(enter instanceof FavoritesScene)) {
return false;
}