From 13d34e55901bd17093c9f632d41e04fbc0a03f0e Mon Sep 17 00:00:00 2001 From: houxg Date: Wed, 21 Dec 2016 16:38:20 +0800 Subject: [PATCH 1/4] =?UTF-8?q?fix=20can=E2=80=99t=20save=20changes=20when?= =?UTF-8?q?=20clicked=20navigation=20button?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../leamonax/ui/edit/NoteEditActivity.java | 31 ++++++++++++++++++- 1 file changed, 30 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/org/houxg/leamonax/ui/edit/NoteEditActivity.java b/app/src/main/java/org/houxg/leamonax/ui/edit/NoteEditActivity.java index b1142b4..c38f959 100644 --- a/app/src/main/java/org/houxg/leamonax/ui/edit/NoteEditActivity.java +++ b/app/src/main/java/org/houxg/leamonax/ui/edit/NoteEditActivity.java @@ -106,8 +106,9 @@ public class NoteEditActivity extends BaseActivity implements EditorFragment.Edi } @Override - public boolean onOptionsItemSelected(MenuItem item) { + public boolean onOptionsItemSelected(final MenuItem item) { switch (item.getItemId()) { + case case R.id.action_save: filterUnchanged() .doOnNext(new Action1() { @@ -159,6 +160,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() { + @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); } From a8deccc0c555af28dc2ea07fc576345c89243ded Mon Sep 17 00:00:00 2001 From: houxg Date: Wed, 21 Dec 2016 18:33:57 +0800 Subject: [PATCH 2/4] fix typeos --- .../main/java/org/houxg/leamonax/ui/edit/NoteEditActivity.java | 1 - 1 file changed, 1 deletion(-) diff --git a/app/src/main/java/org/houxg/leamonax/ui/edit/NoteEditActivity.java b/app/src/main/java/org/houxg/leamonax/ui/edit/NoteEditActivity.java index c38f959..bb5e106 100644 --- a/app/src/main/java/org/houxg/leamonax/ui/edit/NoteEditActivity.java +++ b/app/src/main/java/org/houxg/leamonax/ui/edit/NoteEditActivity.java @@ -108,7 +108,6 @@ public class NoteEditActivity extends BaseActivity implements EditorFragment.Edi @Override public boolean onOptionsItemSelected(final MenuItem item) { switch (item.getItemId()) { - case case R.id.action_save: filterUnchanged() .doOnNext(new Action1() { From 5ddd1f6538578f771487ae7a3b454a5b0c2659af Mon Sep 17 00:00:00 2001 From: houxg Date: Wed, 21 Dec 2016 18:36:01 +0800 Subject: [PATCH 3/4] add Chinese support --- app/src/main/res/values-zh/strings.xml | 76 ++++++++++++++++++++++++++ app/src/main/res/values/strings.xml | 6 +- 2 files changed, 81 insertions(+), 1 deletion(-) create mode 100644 app/src/main/res/values-zh/strings.xml diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml new file mode 100644 index 0000000..75fad5e --- /dev/null +++ b/app/src/main/res/values-zh/strings.xml @@ -0,0 +1,76 @@ + + + Leamonax + 添加笔记本 + 应用 + 你确定要删除该账户所有的数据吗？ + 你确定要删除%s? + 你确定要登出吗？ + 头像 + 取消 + 更改密码 + 更改密码失败 + 更改密码成功 + 更改用户名 + 更改用户名失败 + 更改用户名成功 + 有变动 + 选择编辑器 + 清除数据 + 清除数据 + 选择笔记本 + 清除数据成功 + 确认 + 删除笔记 + 删除笔记失败 + 编辑 + 编辑器 + 邮箱 + 邮箱或密码错误 + 忘记密码？ + 服务器 + 服务器地址 + 服务器地址错误 + 不合法的服务器地址，请检查 + 图片尺寸 + 导入HTML + 许可证 + 链接 + 登出 + 多个链接 + 网络错误 + 网络不可用 + 新密码 + 否 + 笔记本 + 笔记本 + 旧密码 + 解析错误 + HTML解析中 + 密码 + 预览 + 公开笔记 + 最近 + 撤回 + 撤回中 + 保存 + 保存笔记失败 + 保存 + 笔记保存中 + 搜索 + 选择笔记本 + 设置 + 登入 + 同步笔记失败 + 标签 + 致谢 + 昨天 %s + 标题 + + 使用自定义服务器 + 使用Leanote.com + 用户名 + 版本 + 是 + 关于 + \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 13e46d5..7c98249 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -31,7 +31,7 @@ Delete note failed Email or password is incorrect Network error - Untitled + Untitled Yesterday %s Use Leanote.com Use custom host @@ -68,4 +68,8 @@ Clear Multiple links Apply + Import from HTML + Parse error + Parsing HTML + Select notebook From 5d01486134b7d099a11dc7aaf22672c1ab145455 Mon Sep 17 00:00:00 2001 From: houxg Date: Wed, 21 Dec 2016 18:38:27 +0800 Subject: [PATCH 4/4] fix different UI in SearchActivity --- .../main/java/org/houxg/leamonax/ui/SearchActivity.java | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/org/houxg/leamonax/ui/SearchActivity.java b/app/src/main/java/org/houxg/leamonax/ui/SearchActivity.java index 1cc218e..399d457 100644 --- a/app/src/main/java/org/houxg/leamonax/ui/SearchActivity.java +++ b/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() {