Update string.xml

app/src/main/java/com/hippo/ehviewer/ui/scene/DownloadLabelScene.java

@@ -41,35 +41,22 @@ public class DownloadLabelScene extends AbsDragSortScene implements AppbarScene.
 
     private List<DownloadLabel> mDownloadLabels;
 
-    private boolean mChanged = false;
-
     private static final int POSITION_ADD = 0;
 
     @Override
     protected void onCreate(boolean rebirth) {
         super.onCreate(rebirth);
 
-        setTipText("No download label"); // TODO hardcode
+        setTipText(getResources().getString(R.string.download_label_list_empty));
 
         addAction(R.drawable.ic_plus_dark_x24);
 
         setOnClickActionListener(this);
     }
 
-    @Override
-    protected void onDestroy(boolean die) {
-        super.onDestroy(die);
-
-        // notify update
-        if (mChanged) {
-            //Messenger.getInstance().notify(Constants.MESSENGER_ID_UPDATE_DOWNLOAD_LABEL, null);
-            mChanged = false;
-        }
-    }
-
     @Override
     protected String getTitle() {
-        return "Download label"; // TODO hardcode
+        return getResources().getString(R.string.download_label);
     }
 
     @Override
@@ -79,7 +66,7 @@ public class DownloadLabelScene extends AbsDragSortScene implements AppbarScene.
     }
 
 
-    private class AddDownloadTagHelper implements SimpleDialog.OnCreateCustomViewListener,
+    private class AddDownloadLabelHelper implements SimpleDialog.OnCreateCustomViewListener,
             SimpleDialog.OnClickListener {
 
         private EditText mEditText;
@@ -87,7 +74,7 @@ public class DownloadLabelScene extends AbsDragSortScene implements AppbarScene.
         @Override
         public void onCreateCustomView(final SimpleDialog dialog, View view) {
             FloatLabelEditText floatLabelEditText = (FloatLabelEditText) view.findViewById(R.id.float_label_edit_text);
-            floatLabelEditText.setHint("Download label"); // TODO hardcode
+            floatLabelEditText.setHint(getResources().getString(R.string.label));
             mEditText = (EditText) view.findViewById(R.id.edit_text);
             mEditText.setOnEditorActionListener(new TextView.OnEditorActionListener() {
                 @Override
@@ -116,10 +103,10 @@ public class DownloadLabelScene extends AbsDragSortScene implements AppbarScene.
             if (which == SimpleDialog.POSITIVE) {
                 String label = mEditText.getText().toString().trim();
                 if (TextUtils.isEmpty(label)) {
-                    Toast.makeText(getStageActivity(), "Empty label", Toast.LENGTH_SHORT).show(); // TODO hardcode
+                    Toast.makeText(getStageActivity(), R.string.empty_label, Toast.LENGTH_SHORT).show();
                     return false;
                 } else if (containLabel(label)) {
-                    Toast.makeText(getStageActivity(), "The label already exists", Toast.LENGTH_SHORT).show(); // TODO hardcode
+                    Toast.makeText(getStageActivity(), R.string.label_exists, Toast.LENGTH_SHORT).show();
                     return false;
                 } else {
                     // Tell DownloadManager
@@ -132,8 +119,6 @@ public class DownloadLabelScene extends AbsDragSortScene implements AppbarScene.
                     mDownloadLabels.clear();
                     mDownloadLabels.addAll(DBUtils.getAllDownloadLabelWithId());
                     notifyDataSetChanged();
-
-                    mChanged = true;
                     return true;
                 }
             } else {
@@ -146,8 +131,8 @@ public class DownloadLabelScene extends AbsDragSortScene implements AppbarScene.
     public void onClickAction(int index) {
         switch (index) {
             case POSITION_ADD:
-                AddDownloadTagHelper helper = new AddDownloadTagHelper();
-                new SimpleDialog.Builder(getContext()).setTitle("Add download tag")
+                AddDownloadLabelHelper helper = new AddDownloadLabelHelper();
+                new SimpleDialog.Builder(getContext()).setTitle(R.string.add_download_label)
                         .setCustomView(R.layout.dialog_edit_text, helper)
                         .setPositiveButton(android.R.string.ok)
                         .setOnButtonClickListener(helper).show(this);
@@ -178,8 +163,6 @@ public class DownloadLabelScene extends AbsDragSortScene implements AppbarScene.
             modify.label = getData(fromPosition);
             modify.label2 = getData(toPosition);
             Messenger.getInstance().notify(Constants.MESSENGER_ID_MODIFY_DOWNLOAD_LABEL_FROM_SCENE, modify);
-
-            mChanged = true;
         }
 
         @Override
@@ -188,8 +171,6 @@ public class DownloadLabelScene extends AbsDragSortScene implements AppbarScene.
             modify.ops = DownloadManager.DownloadLabelModify.OPS_REMOVE;
             modify.label = getData(position);
             Messenger.getInstance().notify(Constants.MESSENGER_ID_MODIFY_DOWNLOAD_LABEL_FROM_SCENE, modify);
-
-            mChanged = true;
         }
 
         @Override

app/src/main/java/com/hippo/ehviewer/ui/scene/DownloadScene.java

@@ -145,7 +145,7 @@ public class DownloadScene extends AppbarScene implements DrawerProvider,
         } else {
             label = mActivatedLabel;
         }
-        setTitle("Download" + " - " + label); // TODO hardcode
+        setTitle(getResources().getString(R.string.download_title, label));
     }
 
     @Override
@@ -192,7 +192,7 @@ public class DownloadScene extends AppbarScene implements DrawerProvider,
         mOriginalFabLayoutPaddingBottom = mFabLayout.getPaddingBottom();
 
         mRightDrawerView = new AppbarRecyclerView(getStageActivity());
-        mRightDrawerView.setTitle("Label"); // TODO hardcode
+        mRightDrawerView.setTitle(getResources().getString(R.string.label));
         mDownloadLabelAdapter = new DownloadLabelAdapter();
         mRightDrawerView.setAdapter(mDownloadLabelAdapter);
         mRightDrawerView.setOnItemClickListener(new DownloadTagClickListener());
@@ -650,9 +650,9 @@ public class DownloadScene extends AppbarScene implements DrawerProvider,
             }
 
             if (labels.isEmpty()) {
-                Toast.makeText(getContext(), "No available label", Toast.LENGTH_SHORT).show(); // TODO hardcode
+                Toast.makeText(getContext(), R.string.no_label_available, Toast.LENGTH_SHORT).show();
             } else {
-                new SimpleDialog.Builder(getContext()).setTitle("Move to") // TODO hardcode
+                new SimpleDialog.Builder(getContext()).setTitle(R.string.move_to)
                         .setItems(labels.toArray(new String[labels.size()]),
                                 new MoveDownloadInfoListener(labels, hasDefaultLabel)).show(this);
             }

app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryDetailScene.java

@@ -598,8 +598,8 @@ public class GalleryDetailScene extends Scene implements View.OnClickListener,
             DownloadLabelHelper helper = new DownloadLabelHelper();
             new ListViewCheckBoxDialog.Builder(getContext())
                     .setListItems(helper.mLabels, helper)
-                    .setCheckBoxText("Remeber") // TODO hardcode
-                    .setTitle("Choose label") // TODO hardcode
+                    .setCheckBoxText(getResources().getString(R.string.remeber))
+                    .setTitle(R.string.choose_label)
                     .setOnCloseListener(helper)
                     .show(this);
         } else if (mRead == v) {

app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryListScene.java

@@ -334,7 +334,7 @@ public final class GalleryListScene extends Scene implements ListSearchBar.Helpe
         mRightDrawerView.setAdapter(mQuickSearchAdapter);
         mRightDrawerView.setOnItemClickListener(new QuickSearchClickListener());
         mRightDrawerView.setHelper(this);
-        mRightDrawerView.setTipText("No quick search"); // TODO hardcode
+        mRightDrawerView.setTipText(getResources().getString(R.string.quick_search_list_empty));
         if (mQuickSearchAdapter.getItemCount() == 0) {
             mRightDrawerView.showTip(false);
         } else {
@@ -605,12 +605,10 @@ public final class GalleryListScene extends Scene implements ListSearchBar.Helpe
         if (mode == ListUrlBuilder.MODE_NORMAL || mode == ListUrlBuilder.MODE_UPLOADER ||
                 mode == ListUrlBuilder.MODE_TAG) {
             AddToQuickSearchHelper helper = new AddToQuickSearchHelper(mListUrlBuilder.clone());
-            new SimpleDialog.Builder(getStageActivity()).setTitle("Add to quick search") // TODO hardcode
+            new SimpleDialog.Builder(getStageActivity()).setTitle(R.string.add_to_quick_search)
                     .setCustomView(R.layout.dialog_edit_text, helper)
                     .setPositiveButton(android.R.string.ok)
                     .setOnButtonClickListener(helper).show(this);
-        } else {
-            Toast.makeText(getStageActivity(), "Can't add", Toast.LENGTH_SHORT).show(); // TODO hardcode
         }
     }
 
@@ -864,7 +862,7 @@ public final class GalleryListScene extends Scene implements ListSearchBar.Helpe
                     Messenger.getInstance().notify(Constants.MESSENGER_ID_UPDATE_QUICK_SEARCH, null);
                     return true;
                 } else {
-                    Toast.makeText(getStageActivity(), "Empty displayname", Toast.LENGTH_SHORT).show(); // TODO hardcode
+                    Toast.makeText(getStageActivity(), R.string.empty_displayname, Toast.LENGTH_SHORT).show();
                     return false;
                 }
             } else {
@@ -881,7 +879,7 @@ public final class GalleryListScene extends Scene implements ListSearchBar.Helpe
             // Set keyword from search bar
             builder.setKeyword(mSearchBar.getText());
             AddToQuickSearchHelper helper = new AddToQuickSearchHelper(builder);
-            new SimpleDialog.Builder(getStageActivity()).setTitle("Add to quick search") // TODO hardcode
+            new SimpleDialog.Builder(getStageActivity()).setTitle(R.string.add_to_quick_search)
                     .setCustomView(R.layout.dialog_edit_text, helper)
                     .setPositiveButton(android.R.string.ok)
                     .setOnButtonClickListener(helper).show(this);

app/src/main/java/com/hippo/ehviewer/ui/scene/ModifyQuickSearchScene.java

@@ -166,7 +166,7 @@ public class ModifyQuickSearchScene extends AppbarScene implements SearchLayout.
                     setTitle(getName());
                     return true;
                 } else {
-                    Toast.makeText(getStageActivity(), "Empty displayname", Toast.LENGTH_SHORT).show(); // TODO hardcode
+                    Toast.makeText(getStageActivity(), R.string.empty_displayname, Toast.LENGTH_SHORT).show();
                     return false;
                 }
             } else {

app/src/main/java/com/hippo/ehviewer/ui/scene/QuickSearchScene.java

@@ -50,7 +50,7 @@ public class QuickSearchScene extends AbsDragSortScene implements Messenger.Rece
     protected void onCreate(boolean rebirth) {
         super.onCreate(rebirth);
 
-        setTipText("No quick search"); // TODO hardcode
+        setTipText(getResources().getString(R.string.quick_search_list_empty));
     }
 
     @Override

app/src/main/res/values-zh-rCN/strings.xml

@@ -23,6 +23,7 @@
     <string name="search_advance">高级选项</string>
     <string name="search_tag">标签搜索</string>
     <string name="search_image">图片搜索</string>
+    <string name="search_specify_gallery">指定画廊</string>
     <string name="search_specify_author">指定上传者</string>
     <string name="search_specify_tag">指定标签</string>
     <string name="search_hint_no_keyword">没关键字也行</string>
@@ -53,6 +54,12 @@
     <string name="star_4">4 星</string>
     <string name="star_5">5 星</string>
 
+    <!-- Quick search -->
+    <string name="quick_search">快速搜索</string>
+    <string name="add_to_quick_search">添加快速搜索</string>
+    <string name="empty_displayname">名称为空</string>
+    <string name="quick_search_list_empty">快速搜索列表为空</string>
+
     <!-- Go to -->
     <string name="go_to_page_info">第 %1$d 页，共 %2$s 页</string>
     <string name="go_to_string">跳至</string>
@@ -65,9 +72,12 @@
     <string name="favorited_times">%d \u2665</string>
     <string name="more_information">更多信息</string>
     <string name="we_feel">大家感觉 %s</string>
+    <string name="no_tags">暂无标签</string>
     <string name="no_comments">暂无评论</string>
     <string name="no_more_comments">暂无更多评论</string>
     <string name="more_comment">更多评论</string>
+    <string name="rate_successfully">评价成功</string>
+    <string name="rate_failed">评价失败</string>
 
     <!-- Info Scene -->
     <string name="copied_to_clipboard">已复制到剪切板</string>
@@ -110,11 +120,23 @@
     <string name="em_redirection">太多重定向</string>
     <string name="em_socket">网络错误</string>
     <string name="em_unknown">奇怪的问题</string>
-    <string name="erm_unknown_host">联网了么？</string>
+    <string name="em_invalid_input">非法输入</string>
+    <string name="erm_unknown_host">没联网？</string>
 
     <!-- Settings -->
     <string name="settings_display">显示</string>
 
+    <string name="settings_reading">阅读</string>
+    <string name="settings_reading_direction_title">阅读方向</string>
+    <string name="settings_reading_direction_left_to_right">从左至右</string>
+    <string name="settings_reading_direction_right_to_left">从右至左</string>
+    <string name="settings_reading_direction_top_to_bottom">从上至下</string>
+    <string name="settings_reading_hide_nav_bar_title">隐藏导航栏</string>
+    <string name="settings_reading_hide_nav_bar_summary">仅在 Android 4.4 及以上有效</string>
+    <string name="settings_reading_hide_nav_bar_summary_on">沉浸全屏模式</string>
+    <string name="settings_reading_hide_nav_bar_summary_off">不隐藏状态栏</string>
+    <string name="settings_volume_page">音量键翻页</string>
+
     <string name="settings_eh_source_title">EH 源</string>
     <string name="settings_jpn_title_title">日文标题</string>
     <string name="settings_jpn_title_summary_on">尝试显示日文标题</string>
@@ -125,6 +147,10 @@
     <string name="settings_preview_size_normal">一般</string>
     <string name="settings_preview_size_large">较大</string>
 
+    <string name="settings_download">Download</string>
+    <string name="settings_image_download_location">图片下载目录</string>
+    <string name="settings_archive_download_location">归档文件下载目录</string>
+
     <string name="settings_advanced">高级</string>
     <string name="settings_show_application_stats_title">显示应用状态</string>
     <string name="settings_show_application_stats_summary">在屏幕右上角显示设备状态</string>
@@ -141,6 +167,13 @@
     <string name="translated">翻译</string>
     <string name="rewrite">改写</string>
 
+    <!-- DirPickScene -->
+    <string name="dir_pick">选择目录</string>
+    <string name="em_cant_get_folder">无法获取目录</string>
+    <string name="em_cant_write_folder">无法写入该目录</string>
+    <string name="em_cant_parse_document_uri">无法解析文档 uri</string>
+    <string name="document_help">Lollipop 提供了新的读写外置存储设备的 API，也就是 SD 卡。这需要用户的辅助操作。如果你想要把下载路径设置到 SD 卡，请点击“文档”按钮。</string>
+
     <string name="language_japanese">日语</string>
     <string name="language_english">英语</string>
     <string name="language_chinese">汉语</string>
@@ -163,12 +196,47 @@
     <string name="line_dean">“啥？”</string>
     <string name="line_sam">“我把熊猫给丢了……”</string>
 
+    <!-- Download Server -->
+    <string name="download_server">下载服务</string>
+    <string name="stop">停止</string>
+    <string name="stop_all">全部停止</string>
+    <string name="successfully_downloaded">下载成功</string>
+    <string name="incompletely_downloaded">未完全下载</string>
+    <string name="downloading_complete">下载完成</string>
+    <plurals name="item_successfully_downloaded">
+        <item quantity="one">一项下载成功</item>
+        <item quantity="other">%d 项下载成功</item>
+    </plurals>
+    <plurals name="item_incompletely_downloaded">
+        <item quantity="one">一项未完全下载</item>
+        <item quantity="other">%d 项未完全下载</item>
+    </plurals>
+    <string name="download_state_none">未启动</string>
+    <string name="download_state_wait">等待中</string>
+    <string name="download_state_done">已完成</string>
+    <string name="download_state_incomplete">未完成</string>
+
+    <!-- Download -->
+    <string name="download_list_empty">下载列表为空</string>
+    <string name="download_label">下载标签</string>
+    <string name="download_label_all">全部</string>
+    <string name="download_label_default">默认</string>
+    <string name="empty_label">标签为空</string>
+    <string name="label_exists">该标签已存在</string>
+    <string name="download_label_list_empty">下载标签列表为空</string>
+    <string name="add_download_label">添加下载标签</string>
+    <string name="no_label_available">没有可用下载标签</string>
+    <string name="label">标签</string>
+    <string name="download_title">下载 - %s</string>
+    <string name="choose_label">选择标签</string>
+
     <string name="keyword">关键字</string>
     <string name="search">搜索</string>
     <string name="retry">重试</string>
     <string name="_goto">跳页</string>
-
     <string name="unknown">未知</string>
+    <string name="apply">应用</string>
+
     <string name="homepage">首页</string>
     <string name="whatshot">热门</string>
     <string name="history">历史</string>
@@ -182,10 +250,20 @@
     <string name="username">用户名</string>
     <string name="password">密码</string>
 
+    <string name="displayname">名称</string>
+
     <string name="read">阅读</string>
     <string name="torrent">种子</string>
     <string name="share">分享</string>
+    <string name="rate">评价</string>
 
     <string name="comments">评论</string>
+    <string name="info">信息</string>
+
+    <string name="document">文档</string>
+    <string name="rename">重命名</string>
+
+    <string name="move_to">移动到 …</string>
+    <string name="remeber">记住</string>
 
 </resources>

app/src/main/res/values/strings.xml

@@ -73,6 +73,9 @@
 
     <!-- Quick search -->
     <string name="quick_search">Quick search</string>
+    <string name="add_to_quick_search">Add to quick search</string>
+    <string name="empty_displayname">Empty displayname</string>
+    <string name="quick_search_list_empty">Quick search list is empty</string>
 
     <!-- Go to -->
     <string name="go_to_page_info">Page %1$d, %2$s pages in total</string>
@@ -135,7 +138,7 @@
     <string name="em_socket">Network error</string>
     <string name="em_unknown">Weird</string>
     <string name="em_invalid_input">Invalid input</string>
-    <string name="erm_unknown_host">Network available ?</string>
+    <string name="erm_unknown_host">Offline ?</string>
 
     <string name="em_cant_find_activity">Can\'t find target Activity</string>
 
@@ -192,7 +195,7 @@
     <string name="em_cant_get_folder">Can\'t get folder</string>
     <string name="em_cant_write_folder">Can\'t write to this folder</string>
     <string name="em_cant_parse_document_uri">Can\'t parse document uri</string>
-    <string name="document_help">Lollipop provides an API to write to secondary external storage devices, namely SD card. If you want to set download location to SD card, click the \"DOCUMENT\" button.</string>
+    <string name="document_help">Lollipop provides an API to write to secondary external storage devices, namely SD card. Your operation is necessary. If you want to set download location to SD card, click the \"DOCUMENT\" button.</string>
 
     <string name="language_japanese">Japanese</string>
     <string name="language_english">English</string>
@@ -238,8 +241,17 @@
 
     <!-- Download -->
     <string name="download_list_empty">Download list is empty</string>
+    <string name="download_label">Download label</string>
     <string name="download_label_all">All</string>
     <string name="download_label_default">Default</string>
+    <string name="empty_label">Empty label</string>
+    <string name="label_exists">The label already exists</string>
+    <string name="download_label_list_empty">Download label list is empty</string>
+    <string name="add_download_label">Add download label</string>
+    <string name="no_label_available">No label available</string>
+    <string name="label">Label</string>
+    <string name="download_title">Download - %s</string>
+    <string name="choose_label">Choose label</string>
 
     <string name="keyword">Keyword</string>
     <string name="search">Search</string>
@@ -274,4 +286,7 @@
     <string name="document">Document</string>
     <string name="rename">Rename</string>
 
+    <string name="move_to">Move to …</string>
+    <string name="remeber">Remeber</string>
+
 </resources>