From fd4a535701417baf5945b850d9016050cd1e192b Mon Sep 17 00:00:00 2001 From: seven332 Date: Sat, 26 Mar 2016 19:04:39 +0800 Subject: [PATCH] Adjust button layout --- .../com/hippo/ehviewer/ui/MainActivity.java | 12 +- .../ehviewer/ui/scene/AnalyticsScene.java | 27 ++-- .../hippo/ehviewer/ui/scene/SignInScene.java | 4 - .../hippo/ehviewer/ui/scene/WarningScene.java | 29 ++--- .../res/drawable-hdpi/card_purple_2dp.9.png | Bin 440 -> 0 bytes .../res/drawable-hdpi/card_teal_2dp.9.png | Bin 431 -> 0 bytes .../res/drawable-mdpi/card_purple_2dp.9.png | Bin 284 -> 0 bytes .../res/drawable-mdpi/card_teal_2dp.9.png | Bin 282 -> 0 bytes .../res/drawable-xhdpi/card_purple_2dp.9.png | Bin 392 -> 0 bytes .../res/drawable-xhdpi/card_teal_2dp.9.png | Bin 384 -> 0 bytes .../res/drawable-xxhdpi/card_purple_2dp.9.png | Bin 720 -> 0 bytes .../res/drawable-xxhdpi/card_teal_2dp.9.png | Bin 720 -> 0 bytes .../main/res/layout/activity_set_security.xml | 1 - app/src/main/res/layout/scene_analytics.xml | 39 +++--- .../main/res/layout/scene_cookie_sign_in.xml | 28 +++-- app/src/main/res/layout/scene_crash.xml | 35 +++--- app/src/main/res/layout/scene_login.xml | 34 ++--- app/src/main/res/layout/scene_select_site.xml | 117 ++++++++++-------- app/src/main/res/layout/scene_warning.xml | 38 +++--- app/src/main/res/values-zh-rCN/strings.xml | 4 +- app/src/main/res/values-zh-rHK/strings.xml | 4 +- app/src/main/res/values-zh-rTW/strings.xml | 4 +- app/src/main/res/values/strings.xml | 4 +- 23 files changed, 204 insertions(+), 176 deletions(-) delete mode 100644 app/src/main/res/drawable-hdpi/card_purple_2dp.9.png delete mode 100644 app/src/main/res/drawable-hdpi/card_teal_2dp.9.png delete mode 100644 app/src/main/res/drawable-mdpi/card_purple_2dp.9.png delete mode 100644 app/src/main/res/drawable-mdpi/card_teal_2dp.9.png delete mode 100644 app/src/main/res/drawable-xhdpi/card_purple_2dp.9.png delete mode 100644 app/src/main/res/drawable-xhdpi/card_teal_2dp.9.png delete mode 100644 app/src/main/res/drawable-xxhdpi/card_purple_2dp.9.png delete mode 100644 app/src/main/res/drawable-xxhdpi/card_teal_2dp.9.png diff --git a/app/src/main/java/com/hippo/ehviewer/ui/MainActivity.java b/app/src/main/java/com/hippo/ehviewer/ui/MainActivity.java index 1edef5f75..174a87c2e 100644 --- a/app/src/main/java/com/hippo/ehviewer/ui/MainActivity.java +++ b/app/src/main/java/com/hippo/ehviewer/ui/MainActivity.java @@ -134,27 +134,27 @@ public final class MainActivity extends StageActivity public void startSceneForCheckStep(int checkStep, Bundle args) { switch (checkStep) { case CHECK_STEP_SECURITY: - if (Settings.getShowWarning()) { + if (true || Settings.getShowWarning()) { startScene(new Announcer(WarningScene.class).setArgs(args)); break; } case CHECK_STEP_WARNING: - if (Settings.getAskAnalytics()) { + if (true || Settings.getAskAnalytics()) { startScene(new Announcer(AnalyticsScene.class).setArgs(args)); break; } case CHECK_STEP_ANALYTICS: - if (Crash.hasCrashFile()) { + if (true || Crash.hasCrashFile()) { startScene(new Announcer(CrashScene.class).setArgs(args)); break; } case CHECK_STEP_CRASH: - if (EhUtils.needSignedIn(this)) { + if (true || EhUtils.needSignedIn(this)) { startScene(new Announcer(SignInScene.class).setArgs(args)); break; } case CHECK_STEP_SIGN_IN: - if (Settings.getSelectSite()) { + if (true || Settings.getSelectSite()) { startScene(new Announcer(SelectSiteScene.class).setArgs(args)); break; } @@ -196,7 +196,7 @@ public final class MainActivity extends StageActivity protected Announcer getLaunchAnnouncer() { if (!TextUtils.isEmpty(Settings.getSecurity())) { return new Announcer(SecurityScene.class); - } else if (Settings.getShowWarning()) { + } else if (true || Settings.getShowWarning()) { return new Announcer(WarningScene.class); } else if (Settings.getAskAnalytics()) { return new Announcer(AnalyticsScene.class); diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/AnalyticsScene.java b/app/src/main/java/com/hippo/ehviewer/ui/scene/AnalyticsScene.java index bf7c3559d..feba15ec8 100644 --- a/app/src/main/java/com/hippo/ehviewer/ui/scene/AnalyticsScene.java +++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/AnalyticsScene.java @@ -28,8 +28,6 @@ import com.hippo.ehviewer.Analytics; import com.hippo.ehviewer.R; import com.hippo.ehviewer.Settings; import com.hippo.ehviewer.ui.MainActivity; -import com.hippo.ehviewer.ui.annotation.ViewLifeCircle; -import com.hippo.rippleold.RippleSalon; import com.hippo.text.Html; import com.hippo.text.LinkMovementMethod2; import com.hippo.yorozuya.ViewUtils; @@ -37,11 +35,9 @@ import com.hippo.yorozuya.ViewUtils; public class AnalyticsScene extends BaseScene implements View.OnClickListener { @Nullable - @ViewLifeCircle - private View mCancel; + private View mReject; @Nullable - @ViewLifeCircle - private View mOk; + private View mAccept; @Override public boolean needShowLeftDrawer() { @@ -54,18 +50,15 @@ public class AnalyticsScene extends BaseScene implements View.OnClickListener { @Nullable Bundle savedInstanceState) { View view = inflater.inflate(R.layout.scene_analytics, container, false); - mCancel = ViewUtils.$$(view, R.id.cancel); - mOk = ViewUtils.$$(view, R.id.ok); + mReject = ViewUtils.$$(view, R.id.reject); + mAccept = ViewUtils.$$(view, R.id.accept); TextView text = (TextView) ViewUtils.$$(view, R.id.text); text.setText(Html.fromHtml(getString(R.string.analytics_explain))); text.setMovementMethod(LinkMovementMethod2.getInstance()); - mCancel.setOnClickListener(this); - mOk.setOnClickListener(this); - - RippleSalon.addRipple(mCancel, true); - RippleSalon.addRipple(mOk, true); + mReject.setOnClickListener(this); + mAccept.setOnClickListener(this); return view; } @@ -74,8 +67,8 @@ public class AnalyticsScene extends BaseScene implements View.OnClickListener { public void onDestroyView() { super.onDestroyView(); - mCancel = null; - mOk = null; + mReject = null; + mAccept = null; } @Override @@ -85,9 +78,9 @@ public class AnalyticsScene extends BaseScene implements View.OnClickListener { return; } - if (mCancel == v) { + if (mReject == v) { Settings.putEnableAnalytics(false); - } else if (mOk == v) { + } else if (mAccept == v) { Settings.putEnableAnalytics(true); // Start Analytics Analytics.start(context); diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/SignInScene.java b/app/src/main/java/com/hippo/ehviewer/ui/scene/SignInScene.java index 0e85fb044..1cc510eed 100644 --- a/app/src/main/java/com/hippo/ehviewer/ui/scene/SignInScene.java +++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/SignInScene.java @@ -41,7 +41,6 @@ import com.hippo.ehviewer.client.EhUrl; import com.hippo.ehviewer.client.EhUtils; import com.hippo.ehviewer.client.parser.ProfileParser; import com.hippo.ehviewer.ui.MainActivity; -import com.hippo.rippleold.RippleSalon; import com.hippo.scene.Announcer; import com.hippo.scene.SceneFragment; import com.hippo.util.ExceptionUtils; @@ -144,9 +143,6 @@ public final class SignInScene extends BaseScene implements EditText.OnEditorAct mSignInViaCookies.setOnClickListener(this); mSkipSigningIn.setOnClickListener(this); - RippleSalon.addRipple(mRegister, true); - RippleSalon.addRipple(mSignIn, true); - Context context = getContext2(); AssertUtils.assertNotNull(container); EhApplication application = (EhApplication) context.getApplicationContext(); diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/WarningScene.java b/app/src/main/java/com/hippo/ehviewer/ui/scene/WarningScene.java index cd1564c13..928b66f21 100644 --- a/app/src/main/java/com/hippo/ehviewer/ui/scene/WarningScene.java +++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/WarningScene.java @@ -26,19 +26,15 @@ import com.hippo.ehviewer.R; import com.hippo.ehviewer.Settings; import com.hippo.ehviewer.ui.MainActivity; import com.hippo.ehviewer.ui.annotation.ViewLifeCircle; -import com.hippo.rippleold.RippleSalon; import com.hippo.yorozuya.ViewUtils; public final class WarningScene extends BaseScene implements View.OnClickListener { - private static final String TAG = WarningScene.class.getSimpleName(); - + @Nullable + private View mReject; @Nullable @ViewLifeCircle - private View mCancel; - @Nullable - @ViewLifeCircle - private View mOk; + private View mAccept; @Override public boolean needShowLeftDrawer() { @@ -51,14 +47,11 @@ public final class WarningScene extends BaseScene implements View.OnClickListene @Nullable Bundle savedInstanceState) { View view = inflater.inflate(R.layout.scene_warning, container, false); - mCancel = ViewUtils.$$(view, R.id.cancel); - mOk = ViewUtils.$$(view, R.id.ok); + mReject = ViewUtils.$$(view, R.id.reject); + mAccept = ViewUtils.$$(view, R.id.accept); - mCancel.setOnClickListener(this); - mOk.setOnClickListener(this); - - RippleSalon.addRipple(mCancel, true); - RippleSalon.addRipple(mOk, true); + mReject.setOnClickListener(this); + mAccept.setOnClickListener(this); return view; } @@ -67,15 +60,15 @@ public final class WarningScene extends BaseScene implements View.OnClickListene public void onDestroyView() { super.onDestroyView(); - mCancel = null; - mOk = null; + mReject = null; + mAccept = null; } @Override public void onClick(View v) { - if (mCancel == v) { + if (mReject == v) { finishStage(); - } else if (mOk == v) { + } else if (mAccept == v) { // Never show this warning anymore Settings.putShowWarning(false); diff --git a/app/src/main/res/drawable-hdpi/card_purple_2dp.9.png b/app/src/main/res/drawable-hdpi/card_purple_2dp.9.png deleted file mode 100644 index df72d91d8e87d021ffaecc03721add04b85fd6d5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 440 zcmV;p0Z0CcP)XT1Wj$UOToi3;=j_!GH9B%Hgsr= zwfhlru;VnPMqt_iBM_vr&PL=~NsWZID7E8Rgo)gi z(j0Q!$kmmavFIV9L}5#50XZJz;<;j8GpU0~i(5*IOzJpkX=zJoNs=0lB0c!+#oK#e z>ES;agE$=StMC7AB2<0CaFEB~-1n?^SAF|$9iggMeg7MSO9wuYC8|V==ny@kuR{;( zE!1bxuQ%}Jtqsp4gO{R=z?u$KtQS!q6}C2c6DNFlE-{>WQb4W8Q16pB@x%YF9RA1b ixWAyQpz2p(rK~4kO+B!w?>aC50000GIvY-ngjA|dJvxqrrB$$<|hzyeqW>tGXXdD!IoD(fehR|md#YvVH+ z2Qy%f4HrEuaD9gL1NzpcY~rAk&t;HjKB6$hx<2OgO}y2=D=qmk`x{-Fpd|HQ2xH>R Z0|2Ro^M{WAvF88)002ovPDHLkV1h@Jz99er diff --git a/app/src/main/res/drawable-mdpi/card_purple_2dp.9.png b/app/src/main/res/drawable-mdpi/card_purple_2dp.9.png deleted file mode 100644 index daff89b8591958393da4eb637fcc46d429bd7fc6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 284 zcmV+%0ptFOP)3`KGG26va=L>shxJuQE@Bs2GUaNU`+NRqSeQA*u}ngX|TxqDN)D)d_LIWS|l zg@(XS1c{IYVt#V~S?INhqC|p75orf0#G)3lR}%V=5I=N}Gp&D8*Wet^MUBrcG-t=7 z<^+KV=W>lcOQ$f1r4$|z7Elv}Ls^9(>`&zZVFfiILx|4De`3?C4+yJVgIeFmgr5Hv zzWGq(YqM%=n_Du@5w4AVv9XjcF(M`oMu=5~i!DDrBo?qFF06s-c_1;UoDg!>qk7>$ i%i@c0(T|C7>jMCg=&PX2q>J|e00000Ev48o(kU%;5 zjzI=}GE9&z6d}>rF>@>&%NPs(jYDFQCX@uG!T0(Kejk&E&-g4I85OcRX5COK#%Fzp zRmO#Vwz8`r+|lXdFk#_<^Ep)zp6CqzLN1bzOUJo_@JwfbqZ?shH)su{MWo9P{0EPvMh=pO43IG5A07*qoM6N<$f)qJ!0ssI2 diff --git a/app/src/main/res/drawable-xhdpi/card_purple_2dp.9.png b/app/src/main/res/drawable-xhdpi/card_purple_2dp.9.png deleted file mode 100644 index 087ebed6ceb104737dc04b0066165a7fa8ba4465..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 392 zcmV;30eAk1P)sJ~x}@4ZUVGtS(KiN>8Tf+EpA(mqQYy6n zL)8ht$#7R4NmyKA2FyB^CbN!#9uI31V#7rSSxp(Zuu&h{yJ03Al^DV* zI$^1<4eQE>QYqErVM!Q=&PURH<@G13DB05ZNYV>Cp1j(KDonQ8hxz#0BladvckU}M zzd?iKT-jhRn(t$%VGfH}LcK-Ip$3gG&9BxNM*(G2P_K*v#^LFIweIq;?*CoctzpT3 m7ckH}e?tZTGgzPgKK=l+w@Ff&Q&zYD0000^<&!;UM!b25FPPuW0`{bupAuk@XJs zMf6REQ*|U2mWP?JzOaQXfW7_?`#r>ghayTsMR;)VCA5#jEVw9R7(OaOK88_-3kxB` zE>C8S$D0@9=~jiJud6pggqd(qhHso5&U1pu^cMGE84gSY2z$7BjVnxV1r4*{VHj0L zW1~0qHau8JZgIUzm*&DrhAT)?!;Lf%6l_MJB@Xuyz7rZAqBX z2Vp6CD3wzE9hQf2$Uc(puioN{(p!R$Bw^UW>T+CRdh5S1`PUw8XK}rEYu_W>Q}23% zy?DNlp^I@$Vfq(S7)KX^FyU8gR8dC@?O(J|M-{%{t92iQrR8^JUxt~;|GPkc{0$ZD e&tN(EK0W}Z-o{anT3@~Z0000t<74`fmZa-^%KsjZr= zzJ8AShHCk)bg7c5sw)VZIa__*1eL{sBGE|_d9&2lc?pN~t1QH&Yo_46c|bXfk|4ie zhW`wVOw25-Z0sDI+&p~zT)YB8!Xl!2OF#U#HC!$sCL=Gcq#~=TCiiiTozExdbsE}w z28KpjI!V*@^cff!=X<(1hEy;E zwkdtHP+8l2*?hr~l}R6t@y2wnpOT%s?PwyGz_|lmYmCB{xqEQ^z17EgUiqCgld^_L zD@$w)ujXur6Rv*@gxz8_R2r8z)cnzH-DTg+wQerwPmjt(pYC_Jd97M)eQ$WH#*2Ou z)DWy{T`RwFx>bw_8}nbT_zS$%mM5o+wmrVE_QLgyZtZVHae5Mmxgr;Kd$0L8Xg>HdW`)u7|!r< zKfFDO@7jCi<-88_+&<0L{*oU#@ixbjEjK$k1CA7wDlsf67Ra?_)erzB1y5H$mvv4F FO#l>}_AUSb diff --git a/app/src/main/res/drawable-xxhdpi/card_teal_2dp.9.png b/app/src/main/res/drawable-xxhdpi/card_teal_2dp.9.png deleted file mode 100644 index f51dc0495a7bb9018773cbd67d14cea66e21cd70..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 720 zcmeAS@N?(olHy`uVBq!ia0vp^79h;Q3?%1AoYnzSD*}8%T>t<74`fmbGU6B}HZx3Z zXPDN(P?pV*9LX@DiLjYK_1$$0er^nLp$t>n8QdKiI%{z0(ps4z0F<*R3GxeO_|L$| z#LU9V#?HaX&BMpf#Va5rEF!A6^uvE!!{riUGV;<&Dzd6-av#^&`FwI-r=hK9U}&VJ zlQdmVpMimKzNd?0NCo4QtL=QZ4R}~CEPgWe#=AfN?cd~0uISY9Imocs<(+}s@rRo} zKgbm-TKMD4&H1u*>VLL78Rh$^)J}Ganr*>+6%@-V5ne^cpZ%pU*jL)^r%eq>3(;c*Q(Xl_lCD>yyz!E4Z*6` zwelOMTg8a5G5_U?zrb5;)*8Wx$rzdfkD{^7C_nMEB_9g1itvMz! z{e+XtfANy|jnn5Df9UE`C|9@-YM2+X;bgWJ&b-dMXR`o^Thq|ht&d^^2=Ub7r7Wfm~Zw4N!D5c)I$ztaD0e0szQ! B@qqvU diff --git a/app/src/main/res/layout/activity_set_security.xml b/app/src/main/res/layout/activity_set_security.xml index 374a0ee30..9f6fabf39 100644 --- a/app/src/main/res/layout/activity_set_security.xml +++ b/app/src/main/res/layout/activity_set_security.xml @@ -52,7 +52,6 @@ - + android:orientation="horizontal" + android:paddingLeft="12dp" + android:paddingRight="12dp" + android:paddingTop="4dp" + android:paddingBottom="4dp" + android:gravity="bottom" + style="?attr/buttonBarStyle"> - + android:textStyle="bold" + android:text="@string/reject"/> - + android:textColor="?attr/colorPrimary" + android:textStyle="bold" + android:text="@string/accept"/> - + diff --git a/app/src/main/res/layout/scene_cookie_sign_in.xml b/app/src/main/res/layout/scene_cookie_sign_in.xml index 12fb15b0d..1c205ba4a 100644 --- a/app/src/main/res/layout/scene_cookie_sign_in.xml +++ b/app/src/main/res/layout/scene_cookie_sign_in.xml @@ -87,27 +87,33 @@ android:layout_height="0dp" android:layout_weight="1"/> - + android:orientation="horizontal" + android:paddingLeft="12dp" + android:paddingRight="12dp" + android:paddingTop="4dp" + android:paddingBottom="4dp" + android:gravity="bottom" + style="?attr/buttonBarStyle"> - - + android:textColor="?attr/colorPrimary" + android:textStyle="bold" + android:text="@android:string/ok"/> - + diff --git a/app/src/main/res/layout/scene_crash.xml b/app/src/main/res/layout/scene_crash.xml index c6935dedc..4a2f36c16 100644 --- a/app/src/main/res/layout/scene_crash.xml +++ b/app/src/main/res/layout/scene_crash.xml @@ -57,33 +57,36 @@ - + android:orientation="horizontal" + android:paddingLeft="12dp" + android:paddingRight="12dp" + android:paddingTop="4dp" + android:paddingBottom="4dp" + android:gravity="bottom" + style="?attr/buttonBarStyle"> - + android:textStyle="bold" + android:text="@android:string/cancel"/> - + android:textColor="?attr/colorPrimary" + android:textStyle="bold" + android:text="@string/send"/> - + diff --git a/app/src/main/res/layout/scene_login.xml b/app/src/main/res/layout/scene_login.xml index bee388152..25a405356 100644 --- a/app/src/main/res/layout/scene_login.xml +++ b/app/src/main/res/layout/scene_login.xml @@ -83,34 +83,38 @@ android:layout_height="0dp" android:layout_weight="1"/> - + android:orientation="horizontal" + android:paddingLeft="12dp" + android:paddingRight="12dp" + android:paddingTop="4dp" + android:paddingBottom="4dp" + android:gravity="bottom" + style="?attr/buttonBarStyle"> - + android:textStyle="bold" + android:text="@string/register"/> - + android:textColor="?attr/colorPrimary" + android:textStyle="bold" + android:text="@string/sign_in"/> - + - + android:layout_gravity="center_horizontal" + app:maxWidth="@dimen/single_max_width"> - + android:layout_height="0dp" + android:layout_weight="1" + android:fillViewport="true"> - + android:orientation="vertical"> - - - - - + android:textAppearance="@style/TextAppearance.AppCompat.Title" + android:text="@string/select_scene"/> - + + + android:layout_gravity="center_horizontal" + android:layout_marginBottom="@dimen/keyline_margin"> - + - + - + - - + - + + + + + + + android:orientation="horizontal" + android:paddingLeft="12dp" + android:paddingRight="12dp" + android:paddingTop="4dp" + android:paddingBottom="4dp" + android:gravity="bottom" + style="?attr/buttonBarStyle"> - + android:textColor="?attr/colorPrimary" + android:textStyle="bold" + android:text="@android:string/ok"/> - + diff --git a/app/src/main/res/layout/scene_warning.xml b/app/src/main/res/layout/scene_warning.xml index 6150faa7d..42b0ea396 100644 --- a/app/src/main/res/layout/scene_warning.xml +++ b/app/src/main/res/layout/scene_warning.xml @@ -56,32 +56,36 @@ - + android:orientation="horizontal" + android:paddingLeft="12dp" + android:paddingRight="12dp" + android:paddingTop="4dp" + android:paddingBottom="4dp" + android:gravity="bottom" + style="?attr/buttonBarStyle"> - + android:textStyle="bold" + android:text="@string/reject"/> - + android:textColor="?attr/colorPrimary" + android:textStyle="bold" + android:text="@string/accept"/> - + diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 835fb834f..441029eca 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -74,7 +74,7 @@ 无法保存图片 非法数字 - 本应用中内容来自互联网，部分内容可能对您的生理及心理造成难以恢复的伤害。本应用作者不会对由本应用造成的后果负责。您是否愿意继续使用该应用？ + 本应用中内容来自互联网，部分内容可能对您的生理及心理造成难以恢复的伤害。本应用作者不会对由本应用造成的任何后果负责。 用户名不可为空 密码不可为空 跳过登陆 @@ -86,6 +86,8 @@ 好痛 您同意让开发者收集您的设备信息与使用情况吗？这将对开发有很大帮助。<br><br>数据统计服务由 Google Analytics 提供，其隐私政策可在 <a href="https://www.google.com/policies/privacy/">https://www.google.com/policies/privacy/</a> 查看。<br><br>若您同意参与数据统计，您的设备信息与应用使用情况将会被记录，其包括但不限于：Android API 版本、设备型号、语言所在地、本应用版本号、会话时长、应用功能使用次数。开发者承诺以下信息并不会被记录：电话号码、电子邮件地址、IMEI。<br><br>在您同意参与数据统计之前，您的信息不会被记录。<br><br>被记录的数据会由 Google Analytics 进行分析，分析报表仅可被本应用开发者访问。 知道了 + 接受 + 拒绝 发送 diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml index 1e0db93b4..c8d7b09c9 100644 --- a/app/src/main/res/values-zh-rHK/strings.xml +++ b/app/src/main/res/values-zh-rHK/strings.xml @@ -74,7 +74,7 @@ 無法保存圖片 非法數字 - 本應用中內容來自互聯網，部分內容可能對您的生理及心理造成難以恢復的傷害。本應用作者不會對由本應用造成的後果負責。您是否願意繼續使用該應用？ + 本應用中內容來自互聯網，部分內容可能對您的生理及心理造成難以恢復的傷害。本應用作者不會對由本應用造成的任何後果負責。 用户名不可為空 密碼不可為空 跳過登陸 @@ -86,6 +86,8 @@ 好痛 您同意讓開發者收集您的設備信息與使用情況嗎？這將對開發有很大幫助。<br><br>數據統計服務由 Google Analytics 提供，其隱私政策可在 <a href="https://www.google.com/policies/privacy/">https://www.google.com/policies/privacy/</a> 查看。<br><br>若您同意參與數據統計，您的設備信息與應用使用情況將會被記錄，其包括但不限於：Android API 版本、設備型號、語言所在地、本應用版本號、會話時長、應用功能使用次數。開發者承諾以下信息並不會被記錄：電話號碼、電子郵件地址、IMEI。<br><br>在您同意參與數據統計之前，您的信息不會被記錄。<br><br>被記錄的數據會由 Google Analytics 進行分析，分析報表僅可被本應用開發者訪問。 知道了 + 接受 + 拒絕 發送 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index f45e3f447..d0cc35918 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -74,7 +74,7 @@ 無法儲存圖片 非法數字 - 本應用中內容來自網際網路，部分內容可能對您的生理及心理造成難以恢復的傷害。本應用作者不會對由本應用造成的後果負責。您是否願意繼續使用該應用？ + 本應用中內容來自網際網路，部分內容可能對您的生理及心理造成難以恢復的傷害。本應用作者不會對由本應用造成的任何後果負責。 使用者名稱不可為空 密碼不可為空 跳過登陸 @@ -86,6 +86,8 @@ 好痛 您同意讓開發者收集您的裝置資訊與使用情況嗎？這將對開發有很大幫助。<br><br>資料統計服務由 Google Analytics 提供，其隱私政策可在 <a href="https://www.google.com/policies/privacy/">https://www.google.com/policies/privacy/</a> 檢視。<br><br>若您同意參與資料統計，您的裝置資訊與應用使用情況將會被記錄，其包括但不限於：Android API 版本、裝置型號、語言所在地、本應用版本號、會話時長、應用功能使用次數。開發者承諾以下資訊並不會被記錄：電話號碼、電子郵件地址、IMEI。<br><br>在您同意參與資料統計之前，您的資訊不會被記錄。<br><br>被記錄的資料會由 Google Analytics 進行分析，分析報表僅可被本應用開發者訪問。 知道了 + 接受 + 拒絕 傳送 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index ba832d720..8928af9e8 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -116,7 +116,7 @@ Can\'t save image Invalid number - The content of this application is from the Internet. Some of it may do physical or mental harm to you. You have learnt the risks above and would like to undertake them. Do you want to use this application? + The content of this application is from the Internet. Some of it may do physical or mental harm to you. You have learnt the risks above and would like to undertake them. Username cannot be an empty string Password cannot be an empty string Skip signing in @@ -128,6 +128,8 @@ It hurts Would you mind if the developer collected your device information and your usage? It will help the developer a lot.<br><br>Data analysis service is provided by Google Analytics. Its privacy policy can be found at <a href="https://www.google.com/policies/privacy/">https://www.google.com/policies/privacy/</a>.<br><br>If you agree to join data analysis, your device information and your usage will be collected, including but not limited to Android API version, equipment model, language residence, the application version, conversion time, function times. The developer promise that these information will NOT be collected, including phone number, e-mail address, IMEI.<br><br>Your information will not be collected until you agree to join data analysis.<br><br>The collected information will be analyzed by Google Analytics. The analysis report can only be viewed by the developer of this application. Got it + Accept + Reject Send