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 00000000..ec66e65e Binary files /dev/null and b/app/src/main/res/drawable/autojs.png differ diff --git a/app/src/main/res/drawable/skip_circle_bg.xml b/app/src/main/res/drawable/skip_circle_bg.xml index c198aa58..57e57d7d 100644 --- a/app/src/main/res/drawable/skip_circle_bg.xml +++ b/app/src/main/res/drawable/skip_circle_bg.xml @@ -7,16 +7,12 @@ + 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 -