diff --git a/.idea/.name b/.idea/.name index f577dfd..83863ce 100644 --- a/.idea/.name +++ b/.idea/.name @@ -1 +1 @@ -trunk \ No newline at end of file +barcode-scanner \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml index 96cc43e..9a8b7e5 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -1,22 +1,22 @@ + \ No newline at end of file diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml index e7bedf3..c7d1c5a 100644 --- a/.idea/copyright/profiles_settings.xml +++ b/.idea/copyright/profiles_settings.xml @@ -1,3 +1,3 @@ - - + + \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 0000000..97626ba --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml index 288ea0b..747f24e 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -1,18 +1,17 @@ \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index 1a3eaff..51f2a68 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,46 +1,43 @@ - - - - + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml index ba02ba5..44749fa 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -1,8 +1,8 @@ - + \ No newline at end of file diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 5654cf3..d94324f 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -1,67 +1,67 @@ + android:targetSdkVersion="23"/> diff --git a/barcode-scanner.iml b/barcode-scanner.iml new file mode 100644 index 0000000..d68ab80 --- /dev/null +++ b/barcode-scanner.iml @@ -0,0 +1,92 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/build.gradle b/build.gradle index fb497d9..92f7b5a 100644 --- a/build.gradle +++ b/build.gradle @@ -1,53 +1,53 @@ buildscript { repositories { mavenCentral() } dependencies { classpath 'com.android.tools.build:gradle:1.3.0' } } apply plugin: 'com.android.application' android { - compileSdkVersion 21 - buildToolsVersion '21.1.2' + compileSdkVersion 23 + buildToolsVersion '23.0.2' compileOptions { sourceCompatibility JavaVersion.VERSION_1_7 targetCompatibility JavaVersion.VERSION_1_7 } packagingOptions { exclude 'META-INF/LICENSE.txt' exclude 'META-INF/NOTICE.txt' } sourceSets { main { manifest.srcFile 'AndroidManifest.xml' java.srcDirs = ['src'] resources.srcDirs = ['src'] aidl.srcDirs = ['src'] renderscript.srcDirs = ['src'] res.srcDirs = ['res'] assets.srcDirs = ['assets'] } } lintOptions { abortOnError false } repositories { mavenCentral() mavenLocal() } dependencies { compile 'com.android.support:support-v4:21.0.+' compile 'com.android.support:appcompat-v7:21.0.+' compile 'com.melnykov:floatingactionbutton:1.1.0' } } \ No newline at end of file diff --git a/res/drawable-xxxhdpi/qrcode_button_custom.xml b/res/drawable-xxxhdpi/qrcode_button_custom.xml new file mode 100644 index 0000000..54623ff --- /dev/null +++ b/res/drawable-xxxhdpi/qrcode_button_custom.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/res/drawable-xxxhdpi/qrcode_button_default.png b/res/drawable-xxxhdpi/qrcode_button_default.png new file mode 100644 index 0000000..96524f4 Binary files /dev/null and b/res/drawable-xxxhdpi/qrcode_button_default.png differ diff --git a/res/drawable-xxxhdpi/qrcode_button_pressed.png b/res/drawable-xxxhdpi/qrcode_button_pressed.png new file mode 100644 index 0000000..9fb8a84 Binary files /dev/null and b/res/drawable-xxxhdpi/qrcode_button_pressed.png differ diff --git a/res/layout/activity_main.xml b/res/layout/activity_main.xml index 6ffda3f..cc0d7a3 100644 --- a/res/layout/activity_main.xml +++ b/res/layout/activity_main.xml @@ -1,179 +1,193 @@ + + +