Merge pull request #30 from SumiMakito/develop

Update: V1.2.0
sumimakito · Sep 24, 2018 · d463f13 · d463f13
2 parents bca53a3 + da95402
commit d463f13
Show file tree

Hide file tree

Showing 60 changed files with 1,687 additions and 1,270 deletions.
diff --git a/.gitignore b/.gitignore
@@ -7,4 +7,11 @@
 /build
 /captures
 .externalNativeBuild
-*.apk
+*.apk
+/base
+/apk9
+/instant-app
+/release
+/expansionpanels
+/main.zip
+README.orig_md
diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml
diff --git a/.idea/dictionaries/makito.xml b/.idea/dictionaries/makito.xml
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/.idea/modules.xml b/.idea/modules.xml
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
diff --git a/.project b/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>AwesomeQR</name>
+	<comment>Project AwesomeQR created by Buildship.</comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.buildship.core.gradleprojectbuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.buildship.core.gradleprojectnature</nature>
+	</natures>
+</projectDescription>
diff --git a/.settings/org.eclipse.buildship.core.prefs b/.settings/org.eclipse.buildship.core.prefs
@@ -0,0 +1,2 @@
+#Thu Mar 22 23:28:46 CST 2018
+connection.project.dir=