From a7e78d9c480a4623ea42f5e1d82ce8d878fbab79 Mon Sep 17 00:00:00 2001 From: life Date: Wed, 22 Feb 2017 13:50:45 +0800 Subject: [PATCH] About/My blog/Leanote Explore --- .../org/houxg/leamonax/ui/AboutActivity.java | 9 ++- .../org/houxg/leamonax/ui/Navigation.java | 18 ++++++ app/src/main/res/drawable-xxhdpi/ic_blog.png | Bin 0 -> 1618 bytes .../main/res/drawable-xxhdpi/ic_leanote.png | Bin 0 -> 3755 bytes app/src/main/res/layout/activity_about.xml | 3 +- app/src/main/res/layout/navigation.xml | 56 +++++++++++++++++- app/src/main/res/values-zh/strings.xml | 2 + app/src/main/res/values/strings.xml | 3 +- 8 files changed, 86 insertions(+), 5 deletions(-) create mode 100644 app/src/main/res/drawable-xxhdpi/ic_blog.png create mode 100644 app/src/main/res/drawable-xxhdpi/ic_leanote.png diff --git a/app/src/main/java/org/houxg/leamonax/ui/AboutActivity.java b/app/src/main/java/org/houxg/leamonax/ui/AboutActivity.java index bb00a90..4d8bb6e 100644 --- a/app/src/main/java/org/houxg/leamonax/ui/AboutActivity.java +++ b/app/src/main/java/org/houxg/leamonax/ui/AboutActivity.java @@ -80,12 +80,17 @@ public class AboutActivity extends BaseActivity { @OnClick(R.id.ll_github) void clickedGithub() { - OpenUtils.openUrl(this, "https://github.com/houxg/Leamonax"); + OpenUtils.openUrl(this, "https://github.com/leanote/leanote-android"); } @OnClick(R.id.ll_feedback) void clickedFeedback() { - OpenUtils.openUrl(this, "https://github.com/houxg/Leamonax/issues"); + OpenUtils.openUrl(this, "https://github.com/leanote/leanote-android/issues"); + } + + @OnClick(R.id.thanks) + void clickedThanks() { + OpenUtils.openUrl(this, "https://github.com/leanote/leanote-android/graphs/contributors"); } } diff --git a/app/src/main/java/org/houxg/leamonax/ui/Navigation.java b/app/src/main/java/org/houxg/leamonax/ui/Navigation.java index f1949d5..2e3a126 100644 --- a/app/src/main/java/org/houxg/leamonax/ui/Navigation.java +++ b/app/src/main/java/org/houxg/leamonax/ui/Navigation.java @@ -42,6 +42,7 @@ import org.houxg.leamonax.model.User; import org.houxg.leamonax.service.AccountService; import org.houxg.leamonax.service.NotebookService; import org.houxg.leamonax.utils.DisplayUtils; +import org.houxg.leamonax.utils.OpenUtils; import org.houxg.leamonax.widget.AlphabetDrawable; import org.houxg.leamonax.widget.TriangleView; @@ -506,4 +507,21 @@ public class Navigation { '}'; } } + + @OnClick(R.id.rl_blog) + void clickedMyBlog() { + Account current = AccountService.getCurrent(); + String host = current.getHost(); + if (host == null || host.equals("")) { + host = "https://leanote.com"; + } + + host = host.replace("https://", "http://"); + OpenUtils.openUrl(mActivity, host + "/blog/" + current.getUserId()); + } + + @OnClick(R.id.rl_explore) + void clickedExplore() { + OpenUtils.openUrl(mActivity, "http://lea.leanote.com"); + } } diff --git a/app/src/main/res/drawable-xxhdpi/ic_blog.png b/app/src/main/res/drawable-xxhdpi/ic_blog.png new file mode 100644 index 0000000000000000000000000000000000000000..0623fab270e7932699ec73ef5e928fd255f67631 GIT binary patch literal 1618 zcmV-Y2CeytP)U5CxzD&Z*#>3gT1{T?KI(5XcJRRB*luoK!$U4MeUWb_H=Nh+RRP0=RqgI13F# zfdoKFcQcvrPsR#B?8EN9{i0UC=%as8TLwb5E{thKi#d&kxu49q!anfY344ecEK zF!Q6<`r2CS4td#ZU`^9NGdE*^wALTGu7im^LcqGN`+xDQ*Xt{0K7%Pj%gnsgTK^FO z0YGN1>$<+11F#ra(=-sM(OSdo!sj*=5WwJL*4nFZkq1RYAM3h?3HA>z${2&SZw3H2 z0&u%F2WSy6kb>6w^FT|tM05p>G);4^wf?HL{)XS6EiZi2G)rU5DuImkiUMv>pUDrJuV=jmY<^#buUbwbxv3Cg* ztE%cHfGrk_%dYD-BLHFQtv68+3^V_g3oZ+o(D&EC1fY>+OrW8etk>&`nVaDEPcTnt zcd=M3iRe8ue~9@Kz#C(5Nw2WK1Y8o>P*X}NC#ILQ`L=CAE}@S-iGbgs4W-m;rPO-? z{g1U4Cb;tmIB352y|BD4XshF`5#tB(<2 z@HxcDtH2H5bFZf?W)fK2wjc`6e%a<1up9*aGZ6OPTDz40$7R7MvBnb7%P=HJd_)+C zUL-Sbs;YW7cFCi_gnmDV8@1N;YPEt1Wk2#BT#i*r_5KxZ_I||7-@Tv_zl@$oL?DxB zoErt!wk`Z%FPk7D(C(J)auGV`HbitCV>JPXV17eHw_0m3Xfl)W3>%Xn3T*1e#Cc&h zN%EKi?L!1J!&G0$T2Cao_oc?HC<<&$TmG~u6Udbaz{JO({XQIo1d;omF|F+Zi}}{@ zkYfOI&Otk8l7{t!GWUtO#~v`}9LNEVKKdLA%sKbBQfe<|%>{<w-3k6fU@)znLN9eVGb88wX|3HBo-t-+W|SaVd1mU&Fzgs( zzR2I(bZyVaoO8v%B>tdJ0cPr%Zti<>0m-^vL(Vxq88892Ed&FN-J|ow%)>0d5X0W` zExn%{m_HgO$IPGbH&`ksE|#Jsq8Hw$|1)5rkj(s%nbAf=CG35n6vy6rP`&^0e*qSl zXdUz~99XjJx<_LSQYny5ShFR8&jD6M_elwY1z=B@XsqOs_=!3#3!qQwr1Rx1VVv$u z19Sz|0|Vycdlz9fbfJ6++}dD8DknCXWe zlPMJzv~ByG^Wqucb^_?wet;9Qf$zZwlL-SdkgBS71|hS`mKmT>L{2teCV-;#ol3>h zWlOG|&jB~5j>~E6WEGl{5~1Ih#ZV;xOZz2}W^L@aCu{9qJMgYsX6v-SOX4aOAaNBG4O?B6UivB!MtGXE|bANcZ`H8IhhR5zPLD*pIa};nfCd+Bd<${_dkKyef6I@s*iZ3ULq6AbCFt0gd3<%{Q zpYx2E8Gvy#eCje~exWk5OflRbO;5DJXS1aT<_GQx-$Z*4L;RxYPBAbqgcNxISgO4~ zVI35S(NswQ6?L2ai)I7!FOVb^sZS}uQ7XqLN2Qa~qBvGS-~P)Qd_IKlGm6+#I=Yy6 z;+v1+X=zN(gEba=DM&%e_T*=MUDw@}kV5Wdp9EO$;ip{p8`vpt_Z08`7kYXVbM7Vd QK>z>%07*qoM6N<$g5iGqxBvhE literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xxhdpi/ic_leanote.png b/app/src/main/res/drawable-xxhdpi/ic_leanote.png new file mode 100644 index 0000000000000000000000000000000000000000..9830909cc19b591c4333bf3742d85b66975df032 GIT binary patch literal 3755 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 VT~j#n*I)nu002ovPDHLkV1oVA5L*BM literal 0 HcmV?d00001 diff --git a/app/src/main/res/layout/activity_about.xml b/app/src/main/res/layout/activity_about.xml index 9c119b2..d12d22b 100644 --- a/app/src/main/res/layout/activity_about.xml +++ b/app/src/main/res/layout/activity_about.xml @@ -80,6 +80,7 @@ @@ -93,7 +94,7 @@ style="@style/SettingsStatus" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:text="@string/leanote" /> + android:text="https://github.com/houxg/Leamonax" /> + + + + + + + + + + + + + + + + - + 蚂蚁笔记 糟糕，笔记冲突 登录接口地址将会是:\n%s/api/login + 我的博客 + 蚂蚁笔记探索 \ 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 dbe8e43..302a697 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -108,5 +108,6 @@ Generate random note Oops! Conflicts occurs For example, login api will be:\n%s/api/login - + My Blog + Leanote Explore