From e72dfae99898cfa064a67790d6ca0f1d88383dec Mon Sep 17 00:00:00 2001 From: seven332 Date: Sat, 26 Mar 2016 19:20:26 +0800 Subject: [PATCH] Adjust CookieSignInScene UI --- .../com/hippo/ehviewer/ui/MainActivity.java | 12 +- .../ehviewer/ui/scene/CookieSignInScene.java | 3 - .../main/res/layout/scene_cookie_sign_in.xml | 195 ++++++++++-------- app/src/main/res/values-zh-rCN/strings.xml | 2 +- app/src/main/res/values-zh-rHK/strings.xml | 2 +- app/src/main/res/values-zh-rTW/strings.xml | 2 +- app/src/main/res/values/strings.xml | 2 +- 7 files changed, 115 insertions(+), 103 deletions(-) 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 174a87c2e..1edef5f75 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 (true || Settings.getShowWarning()) { + if (Settings.getShowWarning()) { startScene(new Announcer(WarningScene.class).setArgs(args)); break; } case CHECK_STEP_WARNING: - if (true || Settings.getAskAnalytics()) { + if (Settings.getAskAnalytics()) { startScene(new Announcer(AnalyticsScene.class).setArgs(args)); break; } case CHECK_STEP_ANALYTICS: - if (true || Crash.hasCrashFile()) { + if (Crash.hasCrashFile()) { startScene(new Announcer(CrashScene.class).setArgs(args)); break; } case CHECK_STEP_CRASH: - if (true || EhUtils.needSignedIn(this)) { + if (EhUtils.needSignedIn(this)) { startScene(new Announcer(SignInScene.class).setArgs(args)); break; } case CHECK_STEP_SIGN_IN: - if (true || Settings.getSelectSite()) { + if (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 (true || Settings.getShowWarning()) { + } else if (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/CookieSignInScene.java b/app/src/main/java/com/hippo/ehviewer/ui/scene/CookieSignInScene.java index 625622e49..604e6e3d6 100644 --- a/app/src/main/java/com/hippo/ehviewer/ui/scene/CookieSignInScene.java +++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/CookieSignInScene.java @@ -35,7 +35,6 @@ import com.hippo.ehviewer.R; import com.hippo.ehviewer.client.EhCookieStore; import com.hippo.ehviewer.client.EhUrl; import com.hippo.ehviewer.client.EhUtils; -import com.hippo.rippleold.RippleSalon; import com.hippo.yorozuya.AssertUtils; import com.hippo.yorozuya.ViewUtils; @@ -80,8 +79,6 @@ public class CookieSignInScene extends BaseScene implements EditText.OnEditorAct mOk.setOnClickListener(this); - RippleSalon.addRipple(mOk, true); - return view; } 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 1c205ba4a..fd68b1f7a 100644 --- a/app/src/main/res/layout/scene_cookie_sign_in.xml +++ b/app/src/main/res/layout/scene_cookie_sign_in.xml @@ -15,105 +15,120 @@ ~ limitations under the License. --> - + android:padding="@dimen/keyline_margin" + android:orientation="vertical"> - + + + + + + + + + + + + + + + + + + + + + + + + + + android:orientation="horizontal" + android:paddingLeft="12dp" + android:paddingRight="12dp" + android:paddingTop="4dp" + android:paddingBottom="4dp" + android:gravity="bottom" + style="?attr/buttonBarStyle"> - - - - - - - - - - - - - - - - - - + android:layout_weight="1" + android:textColor="?attr/colorPrimary" + android:textStyle="bold" + android:text="@android:string/ok"/> - - -