From 10fd45b6c2d1d57b70f439c2a14227d6068f53a9 Mon Sep 17 00:00:00 2001 From: hyb1996 <946994919@qq.com> Date: Sat, 8 Jul 2017 20:14:43 +0800 Subject: [PATCH] imporve splash display, make floating window and side menu scrollable --- .idea/misc.xml | 2 +- .../scriptdroid/ui/splash/SplashActivity.java | 2 +- app/src/main/res/drawable/autojs.png | Bin 0 -> 4604 bytes app/src/main/res/drawable/skip_circle_bg.xml | 28 +- app/src/main/res/layout/activity_splash.xml | 63 ++-- .../res/layout/floating_window_main_menu.xml | 167 ++++----- .../res/layout/floating_window_record.xml | 283 ++++++++------- .../res/layout/fragment_edit_side_menu.xml | 91 ----- .../main/res/layout/fragment_side_menu.xml | 337 +++++++++--------- app/src/main/res/values/styles.xml | 3 +- 10 files changed, 460 insertions(+), 516 deletions(-) create mode 100644 app/src/main/res/drawable/autojs.png delete mode 100644 app/src/main/res/layout/fragment_edit_side_menu.xml diff --git a/.idea/misc.xml b/.idea/misc.xml index 274735b3..c69e71bb 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -48,7 +48,7 @@ - + diff --git a/app/src/main/java/com/stardust/scriptdroid/ui/splash/SplashActivity.java b/app/src/main/java/com/stardust/scriptdroid/ui/splash/SplashActivity.java index 68095211..460dcd44 100644 --- a/app/src/main/java/com/stardust/scriptdroid/ui/splash/SplashActivity.java +++ b/app/src/main/java/com/stardust/scriptdroid/ui/splash/SplashActivity.java @@ -134,6 +134,6 @@ public class SplashActivity extends BaseActivity { public void onADTick(long l) { mSkipView.setText(String.format(Locale.getDefault(), getString(R.string.format_skip), Math.round(l / 1000f))); } - }, 4000); + }, 0); } } diff --git a/app/src/main/res/drawable/autojs.png b/app/src/main/res/drawable/autojs.png new file mode 100644 index 0000000000000000000000000000000000000000..ec66e65e9d5eb712263f2a18fb29063661a25051 GIT binary patch literal 4604 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 + android:bottom="3dp" + android:left="12dp" + android:right="12dp" + android:top="3dp"/> - + @@ -27,16 +23,12 @@ + android:bottom="3dp" + android:left="12dp" + android:right="12dp" + android:top="3dp"/> - + diff --git a/app/src/main/res/layout/activity_splash.xml b/app/src/main/res/layout/activity_splash.xml index a4eff12d..abd54e05 100644 --- a/app/src/main/res/layout/activity_splash.xml +++ b/app/src/main/res/layout/activity_splash.xml @@ -1,30 +1,24 @@ - + - - - + android:layout_height="0dp" + android:layout_weight="1"> + android:layout_height="match_parent" + android:animateLayoutChanges="true"/> + tools:text="跳过 4" + tools:visibility="visible"/> - \ No newline at end of file + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/floating_window_main_menu.xml b/app/src/main/res/layout/floating_window_main_menu.xml index f44114c9..4925c8a6 100644 --- a/app/src/main/res/layout/floating_window_main_menu.xml +++ b/app/src/main/res/layout/floating_window_main_menu.xml @@ -1,95 +1,102 @@ - + - + android:orientation="vertical"> - + - + - + - + - + - + - + - + - + - + - - \ No newline at end of file + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/floating_window_record.xml b/app/src/main/res/layout/floating_window_record.xml index 731981cf..957bcba4 100644 --- a/app/src/main/res/layout/floating_window_record.xml +++ b/app/src/main/res/layout/floating_window_record.xml @@ -1,151 +1,158 @@ - - - - - - - - - - - - - - - - - - - - - - - - - + - - + android:orientation="vertical"> + android:textSize="20sp"/> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_edit_side_menu.xml b/app/src/main/res/layout/fragment_edit_side_menu.xml deleted file mode 100644 index 47971f4a..00000000 --- a/app/src/main/res/layout/fragment_edit_side_menu.xml +++ /dev/null @@ -1,91 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_side_menu.xml b/app/src/main/res/layout/fragment_side_menu.xml index e90d3b9f..a8f5d598 100644 --- a/app/src/main/res/layout/fragment_side_menu.xml +++ b/app/src/main/res/layout/fragment_side_menu.xml @@ -1,174 +1,181 @@ - + + android:layout_height="wrap_content" + android:orientation="vertical"> - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 07486379..d74580ff 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -14,11 +14,10 @@ false -