diff --git a/app/build.gradle b/app/build.gradle
index b07817c6..de01d870 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -92,9 +92,9 @@ dependencies {
compile 'com.jakewharton:butterknife:8.6.0'
annotationProcessor 'com.jakewharton:butterknife-compiler:8.6.0'
// Android supports
- compile 'com.android.support:appcompat-v7:25.3.0'
- compile 'com.android.support:cardview-v7:25.3.0'
- compile 'com.android.support:design:25.3.0'
+ compile 'com.android.support:appcompat-v7:25.3.1'
+ compile 'com.android.support:cardview-v7:25.3.1'
+ compile 'com.android.support:design:25.3.1'
compile 'com.android.support:multidex:1.0.1'
// Personal libraries
compile 'com.github.hyb1996:MutableTheme:0.2.2'
@@ -116,6 +116,7 @@ dependencies {
compile 'io.mattcarroll.hover:hover:0.9.7'
compile 'com.bignerdranch.android:expandablerecyclerview:3.0.0-RC1'
compile 'com.yqritc:recyclerview-flexibledivider:1.4.0'
+ compile 'com.ashokvarma.android:bottom-navigation-bar:2.0.1'
// Tasker Plugin
compile group: 'com.twofortyfouram', name: 'android-plugin-client-sdk-for-locale', version: '[4.0.2, 5.0['
compile 'com.android.volley:volley:1.0.0'
diff --git a/app/src/main/res/drawable-xxhdpi/background.jpg b/app/src/main/res/drawable-xxhdpi/background.jpg
new file mode 100644
index 00000000..077edae9
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/background.jpg differ
diff --git a/app/src/main/res/drawable/chartjs.png b/app/src/main/res/drawable/chartjs.png
new file mode 100644
index 00000000..000c7444
Binary files /dev/null and b/app/src/main/res/drawable/chartjs.png differ
diff --git a/app/src/main/res/drawable/ic_rename_gray.png b/app/src/main/res/drawable/ic_rename_gray.png
new file mode 100644
index 00000000..209b7a5f
Binary files /dev/null and b/app/src/main/res/drawable/ic_rename_gray.png differ
diff --git a/app/src/main/res/drawable/instantiation_patterns_featured.png b/app/src/main/res/drawable/instantiation_patterns_featured.png
new file mode 100644
index 00000000..39d9baf7
Binary files /dev/null and b/app/src/main/res/drawable/instantiation_patterns_featured.png differ
diff --git a/app/src/main/res/layout/script_and_folder_list_recycler_view_directory.xml b/app/src/main/res/layout/script_and_folder_list_recycler_view_directory.xml
index 4341d13c..8126d8f6 100644
--- a/app/src/main/res/layout/script_and_folder_list_recycler_view_directory.xml
+++ b/app/src/main/res/layout/script_and_folder_list_recycler_view_directory.xml
@@ -1,37 +1,115 @@
-
+
+
+
+
+
+
+
+
+
+
+
+ android:layout_height="40dp"
+ android:ellipsize="end"
+ android:maxLines="1"
+ android:paddingBottom="10dp"
+ android:paddingLeft="16dp"
+ android:paddingRight="16dp"
+ android:paddingTop="10dp"
+ android:textColor="#99000000"
+ android:textSize="14sp"
+ tools:text="正在运行的服务"/>
-
+
+
+
+
+
-
+
+
-
\ No newline at end of file
+
+
+
+
diff --git a/app/src/main/res/layout/script_and_folder_list_recycler_view_file.xml b/app/src/main/res/layout/script_and_folder_list_recycler_view_file.xml
index d537c937..4c5242cd 100644
--- a/app/src/main/res/layout/script_and_folder_list_recycler_view_file.xml
+++ b/app/src/main/res/layout/script_and_folder_list_recycler_view_file.xml
@@ -1,99 +1,94 @@
-
+
-
-
+ android:layout_height="match_parent"
+ android:orientation="vertical">
+
+
+
+ android:layout_height="34dp"
+ android:layout_gravity="right"
+ android:layout_marginBottom="2dp"
+ android:layout_marginLeft="2dp"
+ android:layout_marginRight="2dp"
+ android:orientation="horizontal">
-
+
-
+
-
+
-
-
-
-
-
+
-
-
+
+
-
-
\ No newline at end of file
diff --git a/app/src/test/java/com/stardust/scriptdroid/ExampleUnitTest.java b/app/src/test/java/com/stardust/scriptdroid/ExampleUnitTest.java
index bc10ddf7..ce0583d5 100644
--- a/app/src/test/java/com/stardust/scriptdroid/ExampleUnitTest.java
+++ b/app/src/test/java/com/stardust/scriptdroid/ExampleUnitTest.java
@@ -32,13 +32,20 @@ import static org.junit.Assert.assertTrue;
* @see Testing documentation
*/
public class ExampleUnitTest {
- // TODO: 2017/7/2 卡片式脚本
- // TODO: 2017/7/2 底部导航栏
+ //// TODO: 2017/7/4 恢复项目 一天 7.6
+ // TODO: 2017/7/4 修复 一天 7.7
+ // TODO: 2017/7/4 修复Bug,增加一点脚本,发布2.0.13Beta2 半天 7.8
+ // TODO: 2017/7/2 底部导航栏 一天 7.9
+ //// TODO: 2017/7/4 教程,服务器界面 二至三天 7.12
+ // TODO: 2017/7/4 服务器初步开发 三天 7.15
+ // TODO: 2017/7/4 细节 三天 7.18
+ // TODO: 2017/7/4 写文档 两天 7.20
+ // TODO: 2017/7/4 发布 3.0.0 Beta 7.22
@Test
public void test() {
-
+ System.out.println("SOS".hashCode());
}
@Test
diff --git a/automator/build.gradle b/automator/build.gradle
index cdb00d73..0e0b1e03 100644
--- a/automator/build.gradle
+++ b/automator/build.gradle
@@ -33,6 +33,6 @@ dependencies {
})
androidTestCompile 'com.android.support.test.uiautomator:uiautomator-v18:2.1.2'
testCompile 'junit:junit:4.12'
- compile 'com.android.support:appcompat-v7:25.3.0'
+ compile 'com.android.support:appcompat-v7:25.3.1'
compile project(path: ':common')
}
diff --git a/common/build.gradle b/common/build.gradle
index 165537d5..61823d10 100644
--- a/common/build.gradle
+++ b/common/build.gradle
@@ -26,5 +26,5 @@ dependencies {
exclude group: 'com.android.support', module: 'support-annotations'
})
testCompile 'junit:junit:4.12'
- compile 'com.android.support:support-annotations:25.3.0'
+ compile 'com.android.support:support-annotations:25.3.1'
}