Merge pull request #317 from gini/develop

Release version 4.1.0

README.md

@@ -148,7 +148,7 @@ app/build.gradle:
 
 ```
 dependencies {
-    implementation 'net.gini:gini-vision-lib:4.0.1'
+    implementation 'net.gini:gini-vision-lib:4.1.0'
 }
 ```
 

ginivision-accounting-network/README.md

@@ -50,8 +50,8 @@ app/build.gradle:
 
 ```
 dependencies {
-    implementation 'net.gini:gini-vision-lib:4.0.1'
-    implementation 'net.gini:gini-vision-accounting-network-lib:4.0.1'
+    implementation 'net.gini:gini-vision-lib:4.1.0'
+    implementation 'net.gini:gini-vision-accounting-network-lib:4.1.0'
 }
 ```
 

ginivision-network/README.md

@@ -48,8 +48,8 @@ app/build.gradle:
 
 ```
 dependencies {
-    implementation 'net.gini:gini-vision-lib:4.0.1'
-    implementation 'net.gini:gini-vision-network-lib:4.0.1'
+    implementation 'net.gini:gini-vision-lib:4.1.0'
+    implementation 'net.gini:gini-vision-network-lib:4.1.0'
 }
 ```
 

ginivision/src/androidTest/java/net/gini/android/vision/camera/CameraScreenTest.java

@@ -57,6 +57,7 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.ArgumentMatcher;
+import org.mockito.ArgumentMatchers;
 import org.mockito.Mockito;
 
 import java.io.IOException;
@@ -665,7 +666,8 @@ public void should_hideAndShowPaymentDataDetectedPopup_whenNewPaymentData_wasDet
                 cameraActivityFake.getCameraFragmentImplFake();
         Thread.sleep(CameraFragmentImpl.DEFAULT_ANIMATION_DURATION + 100);
         Mockito.verify(cameraFragmentImplFake, times(2))
-                .showQRCodeDetectedPopup(anyLong());
+                .mPaymentQRCodePopup.show(ArgumentMatchers.<PaymentQRCodeData>any(),
+                anyLong());
     }
 
     @Test

ginivision/src/doc/requirements.txt

@@ -1,4 +1,4 @@
-Jinja2==2.10.1
+Jinja2==2.11.3
 MarkupSafe==0.23
 Pygments==2.0.1
 Sphinx==1.2.3

ginivision/src/doc/source/customization-guide.rst

@@ -430,9 +430,12 @@ All Action Bar customizations except the title are global to all Activities.
 
 .. _camera-8:
 
-8. Document Import Hint
+8. Hints
 ^^^^
 
+8.1 Document Import Hint
+~~~~
+
 - **Background Color**
 
   Via the color resource named ``gv_document_import_hint_background``.
@@ -458,6 +461,34 @@ All Action Bar customizations except the title are global to all Activities.
     parent style ``Root.GiniVisionTheme.Camera.DocumentImportHint.TextStyle``) and setting an
     item named ``gvCustomFont`` with the path to the font file in your assets folder.
 
+8.2 QR Code Scanner Hint
+~~~~
+
+- **Background Color**
+
+  Via the color resource named ``gv_document_import_hint_background``.
+
+- **Close Icon Color**
+
+  Via the color resource name ``gv_hint_close``.
+
+- **Message**
+
+  - **Text**
+
+    Via the string resource named ``gv_qr_code_scanner_hint_text``.
+
+  - **Text Style**
+
+    Via overriding the style named ``GiniVisionTheme.Camera.DocumentImportHint.TextStyle`` (with
+    parent style ``Root.GiniVisionTheme.Camera.DocumentImportHint.TextStyle``).
+
+  - **Font**
+
+    Via overriding the style named ``GiniVisionTheme.Camera.DocumentImportHint.TextStyle`` (with
+    parent style ``Root.GiniVisionTheme.Camera.DocumentImportHint.TextStyle``) and setting an
+    item named ``gvCustomFont`` with the path to the font file in your assets folder.
+
 :ref:`Back to screenshots. <camera>`
 
 .. _camera-9:
@@ -513,31 +544,66 @@ All Action Bar customizations except the title are global to all Activities.
 
 - **Background Color**
 
-  Via the color resource named ``gv_qrcode_detected_popup_background``.
+  - **Payable QRCode**
+
+    Via the color resource named ``gv_qrcode_detected_popup_background``.
+
+  - **Unsupported QRCode**
+
+    Via the color resource named ``gv_unsupported_qrcode_detected_popup_background``.
 
 - **Message**
 
   - **Text**
 
-    Via the string resources named ``gv_qrcode_detected_popup_message_1`` and
-    ``gv_qrcode_detected_popup_message_2``.
+    - **Payable QRCode**
+
+      Via the string resources named ``gv_qrcode_detected_popup_message_1`` and
+      ``gv_qrcode_detected_popup_message_2``.
+
+    - **Unsupported QRCode**
+
+      Via the string resources named ``gv_unsupported_qrcode_detected_popup_message_1`` and
+      ``gv_unsupported_qrcode_detected_popup_message_2``.
 
   - **Text Style**
 
-    Via overriding the styles named
-    ``GiniVisionTheme.Camera.QRCodeDetectedPopup.Message1.TextStyle`` (with parent style
-    ``Root.GiniVisionTheme.Camera.QRCodeDetectedPopup.Message1.TextStyle``) and
-    ``GiniVisionTheme.Camera.QRCodeDetectedPopup.Message2.TextStyle`` (with parent style
-    ``Root.GiniVisionTheme.Camera.QRCodeDetectedPopup.Message2.TextStyle``).
+    - **Payable QRCode**
+
+      Via overriding the styles named
+      ``GiniVisionTheme.Camera.QRCodeDetectedPopup.Message1.TextStyle`` (with parent style
+      ``Root.GiniVisionTheme.Camera.QRCodeDetectedPopup.Message1.TextStyle``) and
+      ``GiniVisionTheme.Camera.QRCodeDetectedPopup.Message2.TextStyle`` (with parent style
+      ``Root.GiniVisionTheme.Camera.QRCodeDetectedPopup.Message2.TextStyle``).
+
+    - **Unsupported QRCode**
+
+      Via overriding the styles named
+      ``GiniVisionTheme.Camera.QRCodeDetectedPopup.UnsupportedMessage1.TextStyle`` (with parent style
+      ``Root.GiniVisionTheme.Camera.QRCodeDetectedPopup.UnsupportedMessage1.TextStyle``) and
+      ``GiniVisionTheme.Camera.QRCodeDetectedPopup.UnsupportedMessage2.TextStyle`` (with parent style
+      ``Root.GiniVisionTheme.Camera.QRCodeDetectedPopup.UnsupportedMessage2.TextStyle``).
+
 
   - **Font**
 
-    Via overriding the styles named
-    ``GiniVisionTheme.Camera.QRCodeDetectedPopup.Message1.TextStyle`` (with parent style
-    ``Root.GiniVisionTheme.Camera.QRCodeDetectedPopup.Message1.TextStyle``) and
-    ``GiniVisionTheme.Camera.QRCodeDetectedPopup.Message2.TextStyle`` (with parent style
-    ``Root.GiniVisionTheme.Camera.QRCodeDetectedPopup.Message2.TextStyle``). and setting an
-    item named ``gvCustomFont`` with the path to the font file in your assets folder.
+    - **Payable QRCode**
+
+      Via overriding the styles named
+      ``GiniVisionTheme.Camera.QRCodeDetectedPopup.Message1.TextStyle`` (with parent style
+      ``Root.GiniVisionTheme.Camera.QRCodeDetectedPopup.Message1.TextStyle``) and
+      ``GiniVisionTheme.Camera.QRCodeDetectedPopup.Message2.TextStyle`` (with parent style
+      ``Root.GiniVisionTheme.Camera.QRCodeDetectedPopup.Message2.TextStyle``). and setting an
+      item named ``gvCustomFont`` with the path to the font file in your assets folder.
+
+    - **Unsupported QRCode**
+
+      Via overriding the styles named
+      ``GiniVisionTheme.Camera.QRCodeDetectedPopup.UnsupportedMessage1.TextStyle`` (with parent style
+      ``Root.GiniVisionTheme.Camera.QRCodeDetectedPopup.UnsupportedMessage1.TextStyle``) and
+      ``GiniVisionTheme.Camera.QRCodeDetectedPopup.UnsupportedMessage2.TextStyle`` (with parent style
+      ``Root.GiniVisionTheme.Camera.QRCodeDetectedPopup.UnsupportedMessage2.TextStyle``). and setting an
+      item named ``gvCustomFont`` with the path to the font file in your assets folder.
 
 :ref:`Back to screenshots. <camera>`