Skip to content

Commit 60ba5cd

Browse files
lyingdragonlyingdragon
committed
update javadoc and add some pictures
1 parent 396b97e commit 60ba5cd

37 files changed

Lines changed: 4843 additions & 232 deletions

‎.idea/misc.xml‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/modules.xml‎

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎QCircle-Design-Template.iml‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" type="JAVA_MODULE" version="4">
3+
<component name="FacetManager">
4+
<facet type="java-gradle" name="Java-Gradle">
5+
<configuration>
6+
<option name="BUILD_FOLDER_PATH" value="$MODULE_DIR$/build" />
7+
</configuration>
8+
</facet>
9+
</component>
10+
<component name="NewModuleRootManager" inherit-compiler-output="false">
11+
<output url="file://$MODULE_DIR$/build/classes/main" />
12+
<output-test url="file://$MODULE_DIR$/build/classes/test" />
13+
<exclude-output />
14+
<content url="file://$MODULE_DIR$">
15+
<excludeFolder url="file://$MODULE_DIR$/.gradle" />
16+
</content>
17+
<orderEntry type="inheritedJdk" />
18+
<orderEntry type="sourceFolder" forTests="false" />
19+
</component>
20+
</module>
21+

‎Sample_BeanbirdInCircle/Sample_BeanbirdInCircle.iml‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<configuration>
1111
<option name="SELECTED_BUILD_VARIANT" value="debug" />
1212
<option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
13-
<option name="COMPILE_JAVA_TASK_NAME" value="compileDebugJava" />
13+
<option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
1414
<option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugTest" />
1515
<option name="SOURCE_GEN_TASK_NAME" value="generateDebugSources" />
1616
<option name="TEST_SOURCE_GEN_TASK_NAME" value="generateDebugTestSources" />
@@ -31,11 +31,13 @@
3131
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
3232
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />
3333
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
34+
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/debug" type="java-resource" />
3435
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/test/debug" isTestSource="true" generated="true" />
3536
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/test/debug" isTestSource="true" generated="true" />
3637
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/test/debug" isTestSource="true" generated="true" />
3738
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/test/debug" isTestSource="true" generated="true" />
3839
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/test/debug" type="java-test-resource" />
40+
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/test/debug" type="java-test-resource" />
3941
<sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
4042
<sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
4143
<sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
@@ -77,6 +79,7 @@
7779
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
7880
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
7981
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
82+
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
8083
</content>
8184
<orderEntry type="jdk" jdkName="Android API 21 Platform" jdkType="Android SDK" />
8285
<orderEntry type="sourceFolder" forTests="false" />

‎Sample_BeanbirdInCircle/build.gradle‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ android {
1414
}
1515
buildTypes {
1616
release {
17-
runProguard false
1817
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
1918
}
2019
}

‎Sample_BeanbirdInCircle/src/main/java/com/lge/qcircle/template/sample/beanbirdInCircle/QCircleActivity.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,7 @@ protected void onCreate(Bundle savedInstanceState) {
9494
template.setTitle("Bean Bird In Circle");
9595
//add back button
9696
template.setBackButton();
97+
template.setBackButtonTheme(true);
9798

9899
//Register your own broadcast receiver
99100
registerReceiver(); // and then register your own broadcast receiver

‎Sample_SimpleCircle/Sample_SimpleCircle.iml‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<configuration>
1111
<option name="SELECTED_BUILD_VARIANT" value="debug" />
1212
<option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
13-
<option name="COMPILE_JAVA_TASK_NAME" value="compileDebugJava" />
13+
<option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
1414
<option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugTest" />
1515
<option name="SOURCE_GEN_TASK_NAME" value="generateDebugSources" />
1616
<option name="TEST_SOURCE_GEN_TASK_NAME" value="generateDebugTestSources" />
@@ -31,11 +31,13 @@
3131
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
3232
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />
3333
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
34+
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/debug" type="java-resource" />
3435
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/test/debug" isTestSource="true" generated="true" />
3536
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/test/debug" isTestSource="true" generated="true" />
3637
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/test/debug" isTestSource="true" generated="true" />
3738
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/test/debug" isTestSource="true" generated="true" />
3839
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/test/debug" type="java-test-resource" />
40+
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/test/debug" type="java-test-resource" />
3941
<sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
4042
<sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
4143
<sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
@@ -77,6 +79,7 @@
7779
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
7880
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
7981
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
82+
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
8083
</content>
8184
<orderEntry type="jdk" jdkName="Android API 21 Platform" jdkType="Android SDK" />
8285
<orderEntry type="sourceFolder" forTests="false" />

‎Sample_SimpleCircle/build.gradle‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ android {
1313
}
1414
buildTypes {
1515
release {
16-
runProguard false
1716
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
1817
}
1918
}

‎build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ buildscript {
55
jcenter()
66
}
77
dependencies {
8-
classpath 'com.android.tools.build:gradle:0.12.2'
8+
classpath 'com.android.tools.build:gradle:1.0.0'
99

1010
// NOTE: Do not place your application dependencies here; they belong
1111
// in the individual module build.gradle files

‎designTemplate/build.gradle‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,13 @@ android {
55
buildToolsVersion "20.0.0"
66

77
defaultConfig {
8-
applicationId "com.lge.qcircle.template"
98
minSdkVersion 19
109
targetSdkVersion 21
1110
versionCode 1
1211
versionName "1.0"
1312
}
1413
buildTypes {
1514
release {
16-
runProguard false
1715
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
1816
}
1917
}

0 commit comments

Comments
 (0)