Merge branch 'develop' into feature/import_html

# Conflicts:
#	app/src/main/res/values/strings.xml

app/src/main/java/org/houxg/leamonax/ui/SearchActivity.java

@@ -17,7 +17,7 @@ import org.houxg.leamonax.model.Note;
 import org.houxg.leamonax.service.NoteService;
 import org.houxg.leamonax.utils.DisplayUtils;
 import org.houxg.leamonax.utils.ToastUtils;
-import org.houxg.leamonax.widget.DashDividerDecoration;
+import org.houxg.leamonax.widget.DividerDecoration;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -57,11 +57,8 @@ public class SearchActivity extends BaseActivity implements NoteAdapter.NoteAdap
         RecyclerView.LayoutManager layoutManager = new LinearLayoutManager(this);
         mNoteListView.setLayoutManager(layoutManager);
         mNoteListView.setItemAnimator(new DefaultItemAnimator());
-
-        int dashGap = DisplayUtils.dp2px(4);
-        int dashWidth = DisplayUtils.dp2px(8);
-        int height = DisplayUtils.dp2px(1);
-        mNoteListView.addItemDecoration(new DashDividerDecoration(0xffa0a0a0, dashGap, dashWidth, height));
+        
+        mNoteListView.addItemDecoration(new DividerDecoration(DisplayUtils.dp2px(8)));
         mAdapter = new NoteAdapter(this);
         mNoteListView.setAdapter(mAdapter);
         mNoteListView.addOnScrollListener(new RecyclerView.OnScrollListener() {

app/src/main/java/org/houxg/leamonax/ui/edit/NoteEditActivity.java

@@ -106,7 +106,7 @@ public class NoteEditActivity extends BaseActivity implements EditorFragment.Edi
     }
 
     @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
+    public boolean onOptionsItemSelected(final MenuItem item) {
         switch (item.getItemId()) {
             case R.id.action_save:
                 filterUnchanged()
@@ -159,6 +159,34 @@ public class NoteEditActivity extends BaseActivity implements EditorFragment.Edi
             case R.id.action_settings:
                 mPager.setCurrentItem(FRAG_SETTINGS);
                 return true;
+            case android.R.id.home:
+                if (mPager.getCurrentItem() > FRAG_EDITOR) {
+                    mPager.setCurrentItem(FRAG_EDITOR);
+                } else {
+                    filterUnchanged()
+                            .observeOn(AndroidSchedulers.mainThread())
+                            .doOnCompleted(new Action0() {
+                                @Override
+                                public void call() {
+                                    NoteEditActivity.super.onOptionsItemSelected(item);
+                                }
+                            })
+                            .subscribe(new Action1<Wrapper>() {
+                                @Override
+                                public void call(Wrapper wrapper) {
+                                    setResult(RESULT_OK);
+                                    Log.i(TAG, wrapper.toString());
+
+                                    if (mIsNewNote && isTitleContentEmpty(wrapper.note)) {
+                                        Log.i(TAG, "remove empty note, id=" + wrapper.note.getId());
+                                        AppDataBase.deleteNoteByLocalId(wrapper.note.getId());
+                                    } else {
+                                        saveAsDraft(wrapper);
+                                    }
+                                }
+                            });
+                }
+                return true;
         }
         return super.onOptionsItemSelected(item);
     }

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

@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name">Leamonax</string>
+    <string name="add_notebook">添加笔记本</string>
+    <string name="apply">应用</string>
+    <string name="are_you_sure_to_delete_all_data_in_this_account">你确定要删除该账户所有的数据吗？</string>
+    <string name="are_you_sure_to_delete_note">你确定要删除%s?</string>
+    <string name="are_your_sure_to_log_out">你确定要登出吗？</string>
+    <string name="avatar">头像</string>
+    <string name="cancel">取消</string>
+    <string name="change_password">更改密码</string>
+    <string name="change_password_failed">更改密码失败</string>
+    <string name="change_password_successful">更改密码成功</string>
+    <string name="change_user_name">更改用户名</string>
+    <string name="change_user_name_failed">更改用户名失败</string>
+    <string name="change_user_name_successful">更改用户名成功</string>
+    <string name="changed">有变动</string>
+    <string name="choose_editor">选择编辑器</string>
+    <string name="clear">清除数据</string>
+    <string name="clear_data">清除数据</string>
+    <string name="choose_notebook">选择笔记本</string>
+    <string name="clear_data_successful">清除数据成功</string>
+    <string name="confirm">确认</string>
+    <string name="delete_note">删除笔记</string>
+    <string name="delete_note_failed">删除笔记失败</string>
+    <string name="edit">编辑</string>
+    <string name="editor">编辑器</string>
+    <string name="email">邮箱</string>
+    <string name="email_or_password_incorrect">邮箱或密码错误</string>
+    <string name="forgot_password">忘记密码？</string>
+    <string name="host">服务器</string>
+    <string name="host_address">服务器地址</string>
+    <string name="host_address_is_incorrect">服务器地址错误</string>
+    <string name="illegal_host">不合法的服务器地址，请检查</string>
+    <string name="image_size">图片尺寸</string>
+    <string name="import_from_html">导入HTML</string>
+    <string name="license">许可证</string>
+    <string name="link">链接</string>
+    <string name="log_out">登出</string>
+    <string name="multiple_links">多个链接</string>
+    <string name="network_error">网络错误</string>
+    <string name="network_is_unavailable">网络不可用</string>
+    <string name="new_password">新密码</string>
+    <string name="no">否</string>
+    <string name="notebook">笔记本</string>
+    <string name="notebooks">笔记本</string>
+    <string name="old_password">旧密码</string>
+    <string name="parse_error">解析错误</string>
+    <string name="parsing_html">HTML解析中</string>
+    <string name="password">密码</string>
+    <string name="preview">预览</string>
+    <string name="public_note">公开笔记</string>
+    <string name="recent_notes">最近</string>
+    <string name="revert">撤回</string>
+    <string name="reverting">撤回中</string>
+    <string name="save">保存</string>
+    <string name="save_note_failed">保存笔记失败</string>
+    <string name="save_to_server">保存</string>
+    <string name="saving_note">笔记保存中</string>
+    <string name="search">搜索</string>
+    <string name="select_notebook">选择笔记本</string>
+    <string name="settings">设置</string>
+    <string name="sign_in">登入</string>
+    <string name="sync_notes_failed">同步笔记失败</string>
+    <string name="tags">标签</string>
+    <string name="thanks">致谢</string>
+    <string name="time_yesterday">昨天 %s</string>
+    <string name="title">标题</string>
+    <string name="untitled"></string>
+    <string name="use_custom_host">使用自定义服务器</string>
+    <string name="use_leanote_host">使用Leanote.com</string>
+    <string name="user_name">用户名</string>
+    <string name="version">版本</string>
+    <string name="yes">是</string>
+    <string name="about">关于</string>
+</resources>

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

@@ -31,7 +31,7 @@
     <string name="delete_note_failed">Delete note failed</string>
     <string name="email_or_password_incorrect">Email or password is incorrect</string>
     <string name="network_error">Network error</string>
-    <string name="untitled">Untitled</string>
+    <string name="untitled" translatable="false">Untitled</string>
     <string name="time_yesterday">Yesterday %s</string>
     <string name="use_leanote_host">Use Leanote.com</string>
     <string name="use_custom_host">Use custom host</string>
@@ -68,8 +68,8 @@
     <string name="clear">Clear</string>
     <string name="multiple_links">Multiple links</string>
     <string name="apply">Apply</string>
-    <string name="import_from_html">Import from html</string>
-    <string name="parsing_html">Parsing html</string>
+    <string name="import_from_html">Import from HTML</string>
     <string name="parse_error">Parse error</string>
+    <string name="parsing_html">Parsing HTML</string>
     <string name="select_notebook">Select notebook</string>
 </resources>