Merge branch 'stage'

furthemore · Feb 19, 2020 · 94cae2b · 94cae2b
2 parents ab815f3 + 3330d80
commit 94cae2b
Show file tree

Hide file tree

Showing 13 changed files with 360 additions and 122 deletions.
diff --git a/.gitignore b/.gitignore
@@ -7,3 +7,7 @@
 /build
 /captures
 .externalNativeBuild
+/.idea/*
+/dist/*
+gradle.properties
+dist.zip
diff --git a/app/build.gradle b/app/build.gradle
@@ -4,7 +4,7 @@ android {
     compileSdkVersion 26
     defaultConfig {
         applicationId "org.furthemore.apisregister"
-        minSdkVersion 15
+        minSdkVersion 22
         targetSdkVersion 26
         versionCode 1
         versionName "1.0"
@@ -34,7 +34,11 @@ dependencies {
     implementation 'com.android.support.constraint:constraint-layout:1.0.2'
     implementation 'com.android.support:support-vector-drawable:26.1.0'
     implementation 'me.pushy:sdk:1.0.32'
+
+    implementation 'me.dm7.barcodescanner:zxing:1.9'
+
     testImplementation 'junit:junit:4.12'
+
     androidTestImplementation 'com.android.support.test:runner:1.0.1'
     androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.1'
 
@@ -44,4 +48,3 @@ dependencies {
     api 'com.squareup.sdk:point-of-sale-sdk:2.0'
     api 'com.android.volley:volley:1.1.0'
 }
-
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -1,30 +1,31 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     package="org.furthemore.apisregister">
-
     <!-- Pushy Permissions -->
-
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.WAKE_LOCK" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
-
-    <!-- End Pushy Permissions -->
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.CAMERA" />
 
     <application
         android:allowBackup="true"
+        android:hardwareAccelerated="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
+        <activity android:name=".ScanActivity"></activity>
         <activity
             android:name=".FullscreenActivity"
             android:configChanges="orientation|keyboardHidden|screenSize"
             android:label="@string/app_name"
             android:theme="@style/AppTheme.NoActionBar">
-            <!--android:theme="@style/FullscreenTheme"> -->
+
+            <!-- android:theme="@style/FullscreenTheme"> -->
 
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -55,10 +56,7 @@
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
                 android:value="org.furthemore.apisregister.FullscreenActivity" />
-        </activity>
-
-        <!-- Pushy Declarations -->
-
+        </activity> <!-- Pushy Declarations -->
         <!-- Pushy Notification Receiver -->
         <!-- Incoming push notifications will invoke the following BroadcastReceiver -->
         <!--
@@ -69,30 +67,27 @@
             </intent-filter>
         </receiver>
         -->
-
-
         <!-- Pushy Update Receiver -->
         <!-- Do not modify - internal BroadcastReceiver that restarts the listener service -->
-        <receiver android:name="me.pushy.sdk.receivers.PushyUpdateReceiver" android:exported="false">
+        <receiver
+            android:name="me.pushy.sdk.receivers.PushyUpdateReceiver"
+            android:exported="false">
             <intent-filter>
                 <action android:name="android.intent.action.PACKAGE_REPLACED" />
+
                 <data android:scheme="package" />
             </intent-filter>
-        </receiver>
-
-        <!-- Pushy Boot Receiver -->
+        </receiver> <!-- Pushy Boot Receiver -->
         <!-- Do not modify - internal BroadcastReceiver that restarts the listener service -->
-        <receiver android:name="me.pushy.sdk.receivers.PushyBootReceiver" android:exported="false">
+        <receiver
+            android:name="me.pushy.sdk.receivers.PushyBootReceiver"
+            android:exported="false">
             <intent-filter>
-                <action android:name="android.intent.action.BOOT_COMPLETED"/>
+                <action android:name="android.intent.action.BOOT_COMPLETED" />
             </intent-filter>
-        </receiver>
-
-        <!-- Pushy Socket Service -->
+        </receiver> <!-- Pushy Socket Service -->
         <!-- Do not modify - internal socket service -->
-        <service android:name="me.pushy.sdk.services.PushySocketService"/>
-
-        <!-- End Pushy Declarations -->
+        <service android:name="me.pushy.sdk.services.PushySocketService" />
     </application>
 
 </manifest>