major refactor

DeveloperCielo · Dec 12, 2018 · 0aac407 · 0aac407
1 parent df1bd06
commit 0aac407
Show file tree

Hide file tree

Showing 43 changed files with 458 additions and 114 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -1,21 +1,23 @@
 apply plugin: 'com.android.application'
-apply plugin: 'com.neenbedankt.android-apt'
+apply plugin: 'com.jakewharton.butterknife'
 
 android {
 
     lintOptions { abortOnError false }
 
-    compileSdkVersion 24
-    buildToolsVersion '25.0.0'
+    compileSdkVersion 28
+    buildToolsVersion "27.0.3"
     defaultConfig {
-        applicationId "cielo.ordermanager.sdk.sample"
-        minSdkVersion 22
-        targetSdkVersion 24
+        applicationId "com.cielo.ordermanager.sdk.sample"
+        minSdkVersion 23
+        targetSdkVersion 27
         versionCode 1
         versionName "2.0"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        resValue "string", "google_maps_key", (project.findProperty("AIzaSyBrTySDqv6gSChEfUUvkxsBhCRy_RfvpJ0") ?: "")
     }
 
+
     lintOptions{
         abortOnError false
     }
@@ -35,19 +37,38 @@ android {
         exclude 'META-INF/NOTICE'
     }
 
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+
+}
+
+configurations.all {
+    exclude group: 'com.android.support', module: 'support-v4'
+
 }
 
+
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
 
     // ------------- DEPENDENCIAS NECESSÁRIAS PRO ORDER MANAGER SDK ------------x-  //
     compile 'com.cielo.lio:order-manager:0.19.1'
     // --------------------------------------------------------------------------- //
 
-    compile 'com.jakewharton:butterknife:8.4.0'
-    compile 'com.android.support:appcompat-v7:24.2.0'
-    compile 'com.android.support:design:24.2.1'
+    implementation ('com.mapbox.mapboxsdk:mapbox-android-sdk:6.7.1') {
+        exclude group: 'com.android.support'
+        exclude module: 'appcompat-v7'
+        exclude module: 'support-v4'
+    }
+    compile 'com.journeyapps:zxing-android-embedded:3.5.0'
+
+    implementation 'com.jakewharton:butterknife:9.0.0-rc2'
+    annotationProcessor 'com.jakewharton:butterknife-compiler:9.0.0-rc2'
+
+    implementation 'com.android.support:appcompat-v7:28.0.0'
+    compile 'com.android.support:design:28.0.0'
     compile 'com.android.support.constraint:constraint-layout:1.0.2'
     testCompile 'junit:junit:4.12'
-    apt 'com.jakewharton:butterknife-compiler:8.4.0'
 }
diff --git a/app/libs/datumandroidlib.jar b/app/libs/datumandroidlib.jar
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="cielo.ordermanager.sdk">
+    package="com.com.cielo.ordermanager.sdk">
 
     <uses-permission android:name="android.permission.INTERNET"/>
+    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
+    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
 
     <application
+        android:name=".MyApplication"
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
@@ -26,13 +29,16 @@
         <activity android:name=".sample.CancelPaymentActivity" />
         <activity android:name=".sample.CancellationOrderList" />
         <activity android:name=".sample.PrintSampleActivity"></activity>
+        <activity android:name=".sample.LocationSampleActivity"></activity>
+        <activity android:name=".sample.QrCodeActivity"></activity>
 
         <receiver android:name=".receiver.LIOCancelationBroadcastReceiver">
             <intent-filter>
                 <action android:name="cielo.action.NOTIFY_TRANSACTION_CANCEL">
                 </action>
             </intent-filter>
         </receiver>
+
     </application>
 
 </manifest>
diff --git a/app/src/main/java/com/cielo/ordermanager/sdk/MyApplication.java b/app/src/main/java/com/cielo/ordermanager/sdk/MyApplication.java
@@ -0,0 +1,15 @@
+package com.cielo.ordermanager.sdk;
+
+import android.app.Application;
+
+import com.mapbox.mapboxsdk.Mapbox;
+
+public class MyApplication extends Application {
+
+    @Override
+    public void onCreate() {
+        super.onCreate();
+
+        Mapbox.getInstance(getApplicationContext(), getString(R.string.mapbox_access_token));
+    }
+}
diff --git a/...manager/sdk/RecyclerViewEmptySupport.java → ...manager/sdk/RecyclerViewEmptySupport.java b/...manager/sdk/RecyclerViewEmptySupport.java → ...manager/sdk/RecyclerViewEmptySupport.java
@@ -1,4 +1,4 @@
-package cielo.ordermanager.sdk;
+package com.cielo.ordermanager.sdk;
 
 import android.content.Context;
 import android.support.v7.widget.RecyclerView;

diff --git a/...sdk/adapter/OrderRecyclerViewAdapter.java → ...sdk/adapter/OrderRecyclerViewAdapter.java b/...sdk/adapter/OrderRecyclerViewAdapter.java → ...sdk/adapter/OrderRecyclerViewAdapter.java
@@ -1,4 +1,4 @@
-package cielo.ordermanager.sdk.adapter;
+package com.cielo.ordermanager.sdk.adapter;
 
 import android.support.v7.widget.RecyclerView;
 import android.view.LayoutInflater;
@@ -8,7 +8,7 @@
 
 import java.util.List;
 
-import cielo.ordermanager.sdk.R;
+import com.cielo.ordermanager.sdk.R;
 import cielo.orders.domain.Order;
 
 public class OrderRecyclerViewAdapter extends RecyclerView.Adapter<OrderRecyclerViewAdapter.OrderViewHolder> {

diff --git a/...dk/adapter/PaymentCodeSpinnerAdapter.java → ...dk/adapter/PaymentCodeSpinnerAdapter.java b/...dk/adapter/PaymentCodeSpinnerAdapter.java → ...dk/adapter/PaymentCodeSpinnerAdapter.java
@@ -1,4 +1,4 @@
-package cielo.ordermanager.sdk.adapter;
+package com.cielo.ordermanager.sdk.adapter;
 
 import android.content.Context;
 import android.view.LayoutInflater;
@@ -10,8 +10,7 @@
 import java.util.Arrays;
 import java.util.List;
 
-import cielo.ordermanager.sdk.R;
-import cielo.orders.domain.product.PrimaryProduct;
+import com.cielo.ordermanager.sdk.R;
 import cielo.sdk.order.payment.PaymentCode;
 
 public class PaymentCodeSpinnerAdapter extends ArrayAdapter<PaymentCode> {

diff --git a/...k/adapter/PaymentRecyclerViewAdapter.java → ...k/adapter/PaymentRecyclerViewAdapter.java b/...k/adapter/PaymentRecyclerViewAdapter.java → ...k/adapter/PaymentRecyclerViewAdapter.java
@@ -1,4 +1,4 @@
-package cielo.ordermanager.sdk.adapter;
+package com.cielo.ordermanager.sdk.adapter;
 
 import android.support.v7.widget.RecyclerView;
 import android.view.LayoutInflater;
@@ -8,8 +8,8 @@
 
 import java.util.List;
 
-import cielo.ordermanager.sdk.R;
-import cielo.ordermanager.sdk.sample.Util;
+import com.cielo.ordermanager.sdk.R;
+import com.cielo.ordermanager.sdk.sample.Util;
 import cielo.sdk.order.payment.Payment;
 
 public class PaymentRecyclerViewAdapter extends RecyclerView.Adapter<PaymentRecyclerViewAdapter.OrderViewHolder> {

diff --git a/...er/sdk/adapter/PrimarySpinnerAdapter.java → ...er/sdk/adapter/PrimarySpinnerAdapter.java b/...er/sdk/adapter/PrimarySpinnerAdapter.java → ...er/sdk/adapter/PrimarySpinnerAdapter.java
@@ -1,4 +1,4 @@
-package cielo.ordermanager.sdk.adapter;
+package com.cielo.ordermanager.sdk.adapter;
 
 import android.content.Context;
 import android.view.LayoutInflater;
@@ -9,7 +9,7 @@
 
 import java.util.List;
 
-import cielo.ordermanager.sdk.R;
+import com.cielo.ordermanager.sdk.R;
 import cielo.orders.domain.product.PrimaryProduct;
 
 public class PrimarySpinnerAdapter extends ArrayAdapter<PrimaryProduct> {

diff --git a/.../sdk/adapter/SecondarySpinnerAdapter.java → .../sdk/adapter/SecondarySpinnerAdapter.java b/.../sdk/adapter/SecondarySpinnerAdapter.java → .../sdk/adapter/SecondarySpinnerAdapter.java
@@ -1,4 +1,4 @@
-package cielo.ordermanager.sdk.adapter;
+package com.cielo.ordermanager.sdk.adapter;
 
 import android.content.Context;
 import android.view.LayoutInflater;
@@ -9,7 +9,7 @@
 
 import java.util.List;
 
-import cielo.ordermanager.sdk.R;
+import com.cielo.ordermanager.sdk.R;
 import cielo.orders.domain.product.SecondaryProduct;
 
 public class SecondarySpinnerAdapter extends ArrayAdapter<SecondaryProduct> {

diff --git a/...k/listener/RecyclerItemClickListener.java → ...k/listener/RecyclerItemClickListener.java b/...k/listener/RecyclerItemClickListener.java → ...k/listener/RecyclerItemClickListener.java
@@ -1,4 +1,4 @@
-package cielo.ordermanager.sdk.listener;
+package com.cielo.ordermanager.sdk.listener;
 
 import android.content.Context;
 import android.support.v7.widget.RecyclerView;

diff --git a/...iver/LIOCancelationBroadcastReceiver.java → ...iver/LIOCancelationBroadcastReceiver.java b/...iver/LIOCancelationBroadcastReceiver.java → ...iver/LIOCancelationBroadcastReceiver.java
@@ -1,4 +1,4 @@
-package cielo.ordermanager.sdk.receiver;
+package com.cielo.ordermanager.sdk.receiver;
 
 
 import android.content.BroadcastReceiver;

diff --git a/...nager/sdk/sample/BasePaymentActivity.java → ...nager/sdk/sample/BasePaymentActivity.java b/...nager/sdk/sample/BasePaymentActivity.java → ...nager/sdk/sample/BasePaymentActivity.java
@@ -1,9 +1,8 @@
-package cielo.ordermanager.sdk.sample;
+package com.cielo.ordermanager.sdk.sample;
 
 
 import android.os.Bundle;
 import android.support.v7.app.AppCompatActivity;
-import android.util.Log;
 import android.view.MenuItem;
 import android.view.View;
 import android.widget.Button;
@@ -15,10 +14,10 @@
 import butterknife.BindView;
 import butterknife.ButterKnife;
 import butterknife.OnClick;
-import cielo.ordermanager.sdk.R;
-import cielo.ordermanager.sdk.adapter.PaymentCodeSpinnerAdapter;
-import cielo.ordermanager.sdk.adapter.PrimarySpinnerAdapter;
-import cielo.ordermanager.sdk.adapter.SecondarySpinnerAdapter;
+import com.cielo.ordermanager.sdk.R;
+import com.cielo.ordermanager.sdk.adapter.PaymentCodeSpinnerAdapter;
+import com.cielo.ordermanager.sdk.adapter.PrimarySpinnerAdapter;
+import com.cielo.ordermanager.sdk.adapter.SecondarySpinnerAdapter;
 import cielo.orders.domain.Credentials;
 import cielo.orders.domain.Item;
 import cielo.orders.domain.Order;
@@ -84,7 +83,7 @@ public abstract class BasePaymentActivity extends AppCompatActivity {
 
     public Order order;
 
-    final long itemValue = 1200;
+    final long itemValue = 100;
     public String sku = "0000";
 
     public String productName = "";
@@ -112,7 +111,7 @@ public boolean onOptionsItemSelected(MenuItem item) {
     }
 
     protected void configSDK() {
-        Credentials credentials = new Credentials("<<Seu client id aqui>>", "<<Seu access token aqui>>");
+        Credentials credentials = new Credentials( "na1bu1sW08FQ","bI8QDRCkhSKE");
         orderManager = new OrderManager(credentials, this);
         orderManager.bind(this, new ServiceBindListener() {
 
@@ -128,7 +127,7 @@ public void onServiceBoundError(Throwable throwable) {
             @Override
             public void onServiceBound() {
                 orderManagerServiceBinded = true;
-                orderManager.createDraftOrder("teste");
+                orderManager.createDraftOrder("REFERENCIA DA ORDEM");
             }
 
             @Override

diff --git a/...ger/sdk/sample/CancelPaymentActivity.java → ...ger/sdk/sample/CancelPaymentActivity.java b/...ger/sdk/sample/CancelPaymentActivity.java → ...ger/sdk/sample/CancelPaymentActivity.java
@@ -1,4 +1,4 @@
-package cielo.ordermanager.sdk.sample;
+package com.cielo.ordermanager.sdk.sample;
 
 import android.os.Bundle;
 import android.support.v7.app.AppCompatActivity;
@@ -15,9 +15,10 @@
 import butterknife.BindView;
 import butterknife.ButterKnife;
 import butterknife.OnClick;
-import cielo.ordermanager.sdk.R;
-import cielo.ordermanager.sdk.adapter.PaymentRecyclerViewAdapter;
-import cielo.ordermanager.sdk.listener.RecyclerItemClickListener;
+import com.cielo.ordermanager.sdk.R;
+
+import com.cielo.ordermanager.sdk.adapter.PaymentRecyclerViewAdapter;
+import com.cielo.ordermanager.sdk.listener.RecyclerItemClickListener;
 import cielo.orders.domain.Credentials;
 import cielo.orders.domain.Order;
 import cielo.sdk.order.OrderManager;
@@ -139,7 +140,7 @@ private void resetUI() {
     }
 
     private void configSDK() {
-        Credentials credentials = new Credentials("<<Seu client id aqui>>", "<<Seu access token aqui>>");
+        Credentials credentials = new Credentials("rSAqNPGvFPJI", "XZevoUYKmkVr");
         orderManager = new OrderManager(credentials, this);
         orderManager.bind(this, null);
     }

diff --git a/...ger/sdk/sample/CancellationOrderList.java → ...ger/sdk/sample/CancellationOrderList.java b/...ger/sdk/sample/CancellationOrderList.java → ...ger/sdk/sample/CancellationOrderList.java
@@ -1,4 +1,4 @@
-package cielo.ordermanager.sdk.sample;
+package com.cielo.ordermanager.sdk.sample;
 
 import android.content.Intent;
 import android.os.Bundle;
@@ -14,10 +14,11 @@
 
 import butterknife.BindView;
 import butterknife.ButterKnife;
-import cielo.ordermanager.sdk.R;
-import cielo.ordermanager.sdk.RecyclerViewEmptySupport;
-import cielo.ordermanager.sdk.adapter.OrderRecyclerViewAdapter;
-import cielo.ordermanager.sdk.listener.RecyclerItemClickListener;
+import com.cielo.ordermanager.sdk.R;
+import com.cielo.ordermanager.sdk.RecyclerViewEmptySupport;
+import com.cielo.ordermanager.sdk.adapter.OrderRecyclerViewAdapter;
+
+import com.cielo.ordermanager.sdk.listener.RecyclerItemClickListener;
 import cielo.orders.domain.Credentials;
 import cielo.orders.domain.Order;
 import cielo.orders.domain.ResultOrders;
@@ -119,7 +120,7 @@ public void onLongItemClick(View view, int position) {
 
 
     private void configSDK() {
-        Credentials credentials = new Credentials("<<Seu client id aqui>>", "<<Seu access token aqui>>");
+        Credentials credentials = new Credentials("rSAqNPGvFPJI", "XZevoUYKmkVr");
         orderManager = new OrderManager(credentials, this);
         orderManager.bind(this, new ServiceBindListener() {
 

diff --git a/app/src/main/java/com/cielo/ordermanager/sdk/sample/DautumActivityt.java b/app/src/main/java/com/cielo/ordermanager/sdk/sample/DautumActivityt.java
@@ -0,0 +1,31 @@
+package com.cielo.ordermanager.sdk.sample;
+
+import android.os.Bundle;
+import android.support.v7.app.AppCompatActivity;
+import android.widget.TextView;
+
+import com.cielo.ordermanager.sdk.R;
+import com.journeyapps.barcodescanner.DecoratedBarcodeView;
+
+
+/**
+ * Created by eduardovianna on 04/12/18.
+ */
+
+public class DautumActivityt extends AppCompatActivity {
+
+
+    DecoratedBarcodeView barcodeView;
+    TextView resultText;
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_qr_code);
+
+        barcodeView = findViewById(R.id.zxing_barcode_scanner);
+        resultText = findViewById(R.id.text_result);
+
+
+    }
+}