[Bug fix] Can initiate scan from SupportFragment

b1zantine · Mar 11, 2016 · f9ba617 · f9ba617
1 parent 7bb787c
commit f9ba617
Show file tree

Hide file tree

Showing 3 changed files with 43 additions and 18 deletions.
diff --git a/README.md b/README.md
@@ -13,7 +13,7 @@ An Android Library based on [ZXing Library](https://github.com/zxing/zxing) with
 1. Provide the gradle dependency
 
     ```gradle
-    compile 'me.sudar:zxing-orient:2.1.0@aar'
+    compile 'me.sudar:zxing-orient:2.1.1@aar'
     ```
 
 2. Start the Scanner

diff --git a/zxing-orient/publish.gradle b/zxing-orient/publish.gradle
@@ -20,7 +20,7 @@ artifacts {
 }
 
 group = 'me.sudar'
-version = '2.1.0'
+version = '2.1.1'
 Properties properties = new Properties()
 properties.load(project.rootProject.file('local.properties').newDataInputStream())
 
@@ -32,9 +32,9 @@ bintray {
         name = 'ZXing-Orient'
 
         version {
-            name = '2.1.0'
+            name = '2.1.1'
             released  = new Date()
-            vcsTag = 'v2.1.0'
+            vcsTag = 'v2.1.1'
         }
 
         licenses = ['Apache-2.0']

diff --git a/zxing-orient/src/main/java/me/sudar/zxingorient/ZxingOrient.java b/zxing-orient/src/main/java/me/sudar/zxingorient/ZxingOrient.java
@@ -5,7 +5,6 @@
 import java.util.Map;
 
 import android.app.Activity;
-import android.app.Fragment;
 import android.content.Intent;
 import android.graphics.Color;
 import android.os.Bundle;
@@ -20,31 +19,53 @@ public class ZxingOrient {
     private static final String BS_PACKAGE = "me.sudar.zxing";
 
     private final Activity activity;
-    private final Fragment fragment;
+    private final android.app.Fragment fragment;
+    private final android.support.v4.app.Fragment supportFragment;
 
 //    private boolean autoFocus = true;
 //    private boolean flash = false;
 
-    private boolean vibrate = false;
-    private boolean playBeep = true;
+    private boolean vibrate;
+    private boolean playBeep;
 
-    private Integer iconID = null;
-    private Integer toolbarColor = null;
-    private Integer infoBoxColor = null;
-    private Boolean infoBoxVisibility = null;
-    private String info = null;
+    private Integer iconID;
+    private Integer toolbarColor;
+    private Integer infoBoxColor;
+    private Boolean infoBoxVisibility;
+    private String info;
 
     private final Map<String,Object> moreExtras = new HashMap<String,Object>(3);
 
 
     public ZxingOrient(Activity activity) {
         this.activity = activity;
         this.fragment = null;
+        this.supportFragment = null;
+        initialize();
     }
 
-    public ZxingOrient(Fragment fragment) {
+    public ZxingOrient(android.app.Fragment fragment) {
         this.activity = fragment.getActivity();
         this.fragment = fragment;
+        this.supportFragment = null;
+        initialize();
+    }
+
+    public ZxingOrient(android.support.v4.app.Fragment supportFragment) {
+        this.activity = supportFragment.getActivity();
+        this.fragment = null;
+        this.supportFragment = supportFragment;
+        initialize();
+    }
+
+    private void initialize(){
+        vibrate = false;
+        playBeep = true;
+        iconID = null;
+        toolbarColor = null;
+        infoBoxColor = null;
+        infoBoxVisibility = null;
+        info = null;
     }
 
 //    public ZxingOrient setAutoFocus(boolean setting){
@@ -155,10 +176,12 @@ public final void initiateScan(Collection<String> desiredBarcodeFormats, int cam
     }
 
     protected void startActivityForResult(Intent intent, int code) {
-        if (fragment == null) {
+        if (fragment == null && supportFragment == null) {
             activity.startActivityForResult(intent, code);
-        } else {
+        } else if(supportFragment == null){
             fragment.startActivityForResult(intent, code);
+        } else if(fragment == null){
+            supportFragment.startActivityForResult(intent, code);
         }
     }
 
@@ -199,10 +222,12 @@ public final void shareText(CharSequence text, CharSequence type) {
         intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
         intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET);
         attachMoreExtras(intent);
-        if (fragment == null) {
+        if (fragment == null && supportFragment == null) {
             activity.startActivity(intent);
-        } else {
+        } else if(supportFragment == null){
             fragment.startActivity(intent);
+        } else if(fragment == null){
+            supportFragment.startActivity(intent);
         }
     }