Skip to content

Commit b7c2fcb

Browse files
owantowant
committed
update the examples
1 parent 6e811df commit b7c2fcb

File tree

6 files changed

+25
-25
lines changed

6 files changed

+25
-25
lines changed

‎.DS_Store‎

0 Bytes
Binary file not shown.

‎ThinkMap.iml‎

Lines changed: 19 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -41,20 +41,20 @@
4141
<sourceFolder url="file://$MODULE_DIR$/src/run_debugDebug/java" isTestSource="false" />
4242
<sourceFolder url="file://$MODULE_DIR$/src/run_debugDebug/rs" isTestSource="false" />
4343
<sourceFolder url="file://$MODULE_DIR$/src/run_debugDebug/shaders" isTestSource="false" />
44-
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/run_debug/debug" isTestSource="true" generated="true" />
45-
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/run_debug/debug" isTestSource="true" generated="true" />
46-
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/run_debug/debug" isTestSource="true" generated="true" />
47-
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/run_debug/debug" isTestSource="true" generated="true" />
48-
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/androidTest/run_debug/debug" isTestSource="true" generated="true" />
49-
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/run_debug/debug" type="java-test-resource" />
50-
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/run_debug/debug" type="java-test-resource" />
5144
<sourceFolder url="file://$MODULE_DIR$/src/testRun_debugDebug/res" type="java-test-resource" />
5245
<sourceFolder url="file://$MODULE_DIR$/src/testRun_debugDebug/resources" type="java-test-resource" />
5346
<sourceFolder url="file://$MODULE_DIR$/src/testRun_debugDebug/assets" type="java-test-resource" />
5447
<sourceFolder url="file://$MODULE_DIR$/src/testRun_debugDebug/aidl" isTestSource="true" />
5548
<sourceFolder url="file://$MODULE_DIR$/src/testRun_debugDebug/java" isTestSource="true" />
5649
<sourceFolder url="file://$MODULE_DIR$/src/testRun_debugDebug/rs" isTestSource="true" />
5750
<sourceFolder url="file://$MODULE_DIR$/src/testRun_debugDebug/shaders" isTestSource="true" />
51+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/run_debug/debug" isTestSource="true" generated="true" />
52+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/run_debug/debug" isTestSource="true" generated="true" />
53+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/run_debug/debug" isTestSource="true" generated="true" />
54+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/run_debug/debug" isTestSource="true" generated="true" />
55+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/androidTest/run_debug/debug" isTestSource="true" generated="true" />
56+
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/run_debug/debug" type="java-test-resource" />
57+
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/run_debug/debug" type="java-test-resource" />
5858
<sourceFolder url="file://$MODULE_DIR$/src/run_debug/res" type="java-resource" />
5959
<sourceFolder url="file://$MODULE_DIR$/src/run_debug/resources" type="java-resource" />
6060
<sourceFolder url="file://$MODULE_DIR$/src/run_debug/assets" type="java-resource" />
@@ -97,44 +97,40 @@
9797
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
9898
<sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
9999
<sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
100-
<sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
101-
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
102-
<sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
103-
<sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
104-
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
105-
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
106-
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
107100
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
108101
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
109102
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
110103
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
111104
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
112105
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
113106
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
107+
<sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
108+
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
109+
<sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
110+
<sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
111+
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
112+
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
113+
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
114114
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
115115
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
116116
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
117117
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
118-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-classes" />
119-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-runtime-classes" />
120118
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-safeguard" />
121-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-verifier" />
122-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-resources" />
123-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-support" />
124119
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
125120
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
126-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/reload-dex" />
121+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
122+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/proguard-rules" />
127123
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
128-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/restart-dex" />
129124
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
130125
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
131-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/split-apk" />
132126
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
133127
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
134128
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
129+
<excludeFolder url="file://$MODULE_DIR$/build/reports" />
130+
<excludeFolder url="file://$MODULE_DIR$/build/test-results" />
135131
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
136132
</content>
137-
<orderEntry type="jdk" jdkName="Android API 25 Platform" jdkType="Android SDK" />
133+
<orderEntry type="jdk" jdkName="Android API 25 Platform (1)" jdkType="Android SDK" />
138134
<orderEntry type="sourceFolder" forTests="false" />
139135
<orderEntry type="library" exported="" scope="TEST" name="runner-0.5" level="project" />
140136
<orderEntry type="library" exported="" scope="TEST" name="espresso-idling-resource-2.2.2" level="project" />

‎src/main/java/com/owant/thinkmap/ui/workspace/WorkSpaceActivity.java‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
import com.owant.thinkmap.base.BaseActivity;
3434
import com.owant.thinkmap.line.EaseCubicInterpolator;
3535
import com.owant.thinkmap.model.CurrentFileModel;
36+
import com.owant.thinkmap.test.ExampleCreator;
3637
import com.owant.thinkmap.ui.about.AboutUsActivity;
3738
import com.owant.thinkmap.ui.editmap.EditMapActivity;
3839
import com.owant.thinkmap.util.AndroidUtil;
@@ -85,6 +86,10 @@ protected void onBaseBindView() {
8586
setSupportActionBar(toolBar);
8687

8788

89+
// ExampleCreator.createExampleMapVersion();
90+
// ExampleCreator.createExampleHowToUse();
91+
92+
8893
initListViewAnim();
8994

9095
//RecycleView的样式设置

‎src/main/java/com/owant/thinkmap/ui/workspace/WorkSpacePresenter.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,6 @@ public void run() {
127127
saveExamplesPath,
128128
mView.getOwantDefaultPath());
129129

130-
131130
mView.changeExampleVersion(mView.getExampleVersion());
132131

133132
onLoadOwantData();

‎src/main/res/raw/examples.zip‎

-88 Bytes
Binary file not shown.

‎src/main/res/values-w820dp/dimens.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<resources>
2-
<!-- Example customization of dimensions originally defined in res/values/dimens.xml
2+
<!-- examples customization of dimensions originally defined in res/values/dimens.xml
33
(such as screen margins) for screens with more than 820dp of available width. This
44
would include 7" and 10" devices in landscape (~960dp and ~1280dp respectively). -->
55
<dimen name="activity_horizontal_margin">64dp</dimen>

0 commit comments

Comments
 (0)