update the examples

owant · Jul 26, 2017 · b7c2fcb · b7c2fcb
1 parent 6e811df
commit b7c2fcb
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 25 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/ThinkMap.iml b/ThinkMap.iml
@@ -41,20 +41,20 @@
       <sourceFolder url="file://$MODULE_DIR$/src/run_debugDebug/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/run_debugDebug/rs" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/run_debugDebug/shaders" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/run_debug/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/run_debug/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/run_debug/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/run_debug/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/androidTest/run_debug/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/run_debug/debug" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/run_debug/debug" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/testRun_debugDebug/res" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/testRun_debugDebug/resources" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/testRun_debugDebug/assets" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/testRun_debugDebug/aidl" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/testRun_debugDebug/java" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/testRun_debugDebug/rs" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/testRun_debugDebug/shaders" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/run_debug/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/run_debug/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/run_debug/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/run_debug/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/androidTest/run_debug/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/run_debug/debug" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/run_debug/debug" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/run_debug/res" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/run_debug/resources" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/run_debug/assets" type="java-resource" />
@@ -97,44 +97,40 @@
       <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-classes" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-runtime-classes" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-safeguard" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-verifier" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-resources" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-support" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/reload-dex" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/proguard-rules" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/restart-dex" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/split-apk" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
       <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
+      <excludeFolder url="file://$MODULE_DIR$/build/reports" />
+      <excludeFolder url="file://$MODULE_DIR$/build/test-results" />
       <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
     </content>
-    <orderEntry type="jdk" jdkName="Android API 25 Platform" jdkType="Android SDK" />
+    <orderEntry type="jdk" jdkName="Android API 25 Platform (1)" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" exported="" scope="TEST" name="runner-0.5" level="project" />
     <orderEntry type="library" exported="" scope="TEST" name="espresso-idling-resource-2.2.2" level="project" />

diff --git a/src/main/java/com/owant/thinkmap/ui/workspace/WorkSpaceActivity.java b/src/main/java/com/owant/thinkmap/ui/workspace/WorkSpaceActivity.java
@@ -33,6 +33,7 @@
 import com.owant.thinkmap.base.BaseActivity;
 import com.owant.thinkmap.line.EaseCubicInterpolator;
 import com.owant.thinkmap.model.CurrentFileModel;
+import com.owant.thinkmap.test.ExampleCreator;
 import com.owant.thinkmap.ui.about.AboutUsActivity;
 import com.owant.thinkmap.ui.editmap.EditMapActivity;
 import com.owant.thinkmap.util.AndroidUtil;
@@ -85,6 +86,10 @@ protected void onBaseBindView() {
         setSupportActionBar(toolBar);
 
 
+//        ExampleCreator.createExampleMapVersion();
+//        ExampleCreator.createExampleHowToUse();
+
+
         initListViewAnim();
 
         //RecycleView的样式设置

diff --git a/src/main/java/com/owant/thinkmap/ui/workspace/WorkSpacePresenter.java b/src/main/java/com/owant/thinkmap/ui/workspace/WorkSpacePresenter.java
@@ -127,7 +127,6 @@ public void run() {
                             saveExamplesPath,
                             mView.getOwantDefaultPath());
 
-
                     mView.changeExampleVersion(mView.getExampleVersion());
 
                     onLoadOwantData();

diff --git a/src/main/res/raw/examples.zip b/src/main/res/raw/examples.zip
diff --git a/src/main/res/values-w820dp/dimens.xml b/src/main/res/values-w820dp/dimens.xml
@@ -1,5 +1,5 @@
 <resources>
-    <!-- Example customization of dimensions originally defined in res/values/dimens.xml
+    <!-- examples customization of dimensions originally defined in res/values/dimens.xml
          (such as screen margins) for screens with more than 820dp of available width. This
          would include 7" and 10" devices in landscape (~960dp and ~1280dp respectively). -->
     <dimen name="activity_horizontal_margin">64dp</dimen>