Merge pull request #31 from gini/develop

Release version 1.4.1
gini · Sep 22, 2021 · 5c7f021 · 5c7f021
2 parents 12465eb + 2d55f64
commit 5c7f021
Show file tree

Hide file tree

Showing 13 changed files with 33 additions and 36 deletions.
diff --git a/ginicapture/src/doc/source/getting-started.rst b/ginicapture/src/doc/source/getting-started.rst
@@ -38,7 +38,7 @@ Now you can add the Gini Capture SDK to your app's dependencies:
 .. code:: groovy
 
     dependencies {
-        implementation 'net.gini:gini-capture-sdk:1.4.0'
+        implementation 'net.gini:gini-capture-sdk:1.4.1'
     }
 
 After syncing Gradle you can start integrating the Gini Capture SDK.
diff --git a/ginicapture/src/doc/source/integration.rst b/ginicapture/src/doc/source/integration.rst
@@ -120,7 +120,7 @@ To use it add the ``gini-capture-network-lib`` dependency to your app's ``build.
 
     dependencies {
         ...
-        implementation 'net.gini:gini-capture-network-lib:1.4.0'
+        implementation 'net.gini:gini-capture-network-lib:1.4.1'
     }
 
 For the Gini Capture SDK to be aware of the default implementations create the instances and pass

diff --git a/ginicapture/src/main/res/layout-sw600dp-land/gc_activity_photo_tips.xml b/ginicapture/src/main/res/layout-sw600dp-land/gc_activity_photo_tips.xml
@@ -171,15 +171,13 @@
 
     <Button
         android:id="@+id/gc_button_photo_tips_camera"
+        style="@style/GiniCaptureTheme.Button"
         android:layout_width="wrap_content"
         android:layout_height="@dimen/gc_photo_tips_bottom_button_height"
         android:layout_alignParentBottom="true"
         android:layout_centerHorizontal="true"
         android:layout_margin="@dimen/gc_photo_tips_bottom_button_margin"
-        android:background="@color/gc_accent"
         android:text="@string/gc_photo_tips_camera_button"
-        android:width="@dimen/gc_photo_tips_bottom_button_max_width"
-        android:textColor="@color/gc_photo_tips_button_text" />
-
+        android:width="@dimen/gc_photo_tips_bottom_button_max_width"/>
 
 </RelativeLayout>
diff --git a/ginicapture/src/main/res/layout-sw600dp-land/gc_activity_photo_tips_with_multipage.xml b/ginicapture/src/main/res/layout-sw600dp-land/gc_activity_photo_tips_with_multipage.xml
@@ -203,15 +203,13 @@
 
     <Button
         android:id="@+id/gc_button_photo_tips_camera"
+        style="@style/GiniCaptureTheme.Button"
         android:layout_width="wrap_content"
         android:layout_height="@dimen/gc_photo_tips_bottom_button_height"
         android:layout_alignParentBottom="true"
         android:layout_centerHorizontal="true"
         android:layout_margin="@dimen/gc_photo_tips_bottom_button_margin"
-        android:background="@color/gc_accent"
         android:text="@string/gc_photo_tips_camera_button"
-        android:width="@dimen/gc_photo_tips_bottom_button_max_width"
-        android:textColor="@color/gc_photo_tips_button_text" />
-
+        android:width="@dimen/gc_photo_tips_bottom_button_max_width" />
 
 </RelativeLayout>
diff --git a/ginicapture/src/main/res/layout-sw600dp-land/gc_fragment_noresults.xml b/ginicapture/src/main/res/layout-sw600dp-land/gc_fragment_noresults.xml
@@ -191,15 +191,13 @@
 
     <Button
         android:id="@+id/gc_button_no_results_back"
+        style="@style/GiniCaptureTheme.Button"
         android:layout_width="wrap_content"
         android:layout_height="@dimen/gc_noresults_bottom_button_height"
         android:layout_alignParentBottom="true"
         android:layout_centerHorizontal="true"
         android:layout_margin="@dimen/gc_noresults_bottom_button_margin"
-        android:background="@color/gc_noresults_button"
         android:text="@string/gc_noresults_back_button"
-        android:width="@dimen/gc_noresults_bottom_button_max_width"
-        android:textColor="@color/gc_noresults_button_text" />
-
+        android:width="@dimen/gc_noresults_bottom_button_max_width" />
 
 </RelativeLayout>
diff --git a/ginicapture/src/main/res/layout-sw600dp/gc_activity_photo_tips.xml b/ginicapture/src/main/res/layout-sw600dp/gc_activity_photo_tips.xml
@@ -146,14 +146,13 @@
 
     <Button
         android:id="@+id/gc_button_photo_tips_camera"
+        style="@style/GiniCaptureTheme.Button"
         android:layout_width="wrap_content"
         android:layout_height="@dimen/gc_photo_tips_bottom_button_height"
         android:layout_alignParentBottom="true"
         android:layout_centerHorizontal="true"
         android:layout_margin="@dimen/gc_photo_tips_bottom_button_margin"
-        android:background="@color/gc_accent"
         android:text="@string/gc_photo_tips_camera_button"
-        android:width="@dimen/gc_photo_tips_bottom_button_max_width"
-        android:textColor="@color/gc_photo_tips_button_text" />
+        android:width="@dimen/gc_photo_tips_bottom_button_max_width"/>
 
 </RelativeLayout>
diff --git a/ginicapture/src/main/res/layout-sw600dp/gc_activity_photo_tips_with_multipage.xml b/ginicapture/src/main/res/layout-sw600dp/gc_activity_photo_tips_with_multipage.xml
@@ -173,14 +173,13 @@
 
     <Button
         android:id="@+id/gc_button_photo_tips_camera"
+        style="@style/GiniCaptureTheme.Button"
         android:layout_width="wrap_content"
         android:layout_height="@dimen/gc_photo_tips_bottom_button_height"
         android:layout_alignParentBottom="true"
         android:layout_centerHorizontal="true"
         android:layout_margin="@dimen/gc_photo_tips_bottom_button_margin"
-        android:background="@color/gc_accent"
         android:text="@string/gc_photo_tips_camera_button"
-        android:width="@dimen/gc_photo_tips_bottom_button_max_width"
-        android:textColor="@color/gc_photo_tips_button_text" />
+        android:width="@dimen/gc_photo_tips_bottom_button_max_width" />
 
 </RelativeLayout>
diff --git a/ginicapture/src/main/res/layout-sw600dp/gc_fragment_noresults.xml b/ginicapture/src/main/res/layout-sw600dp/gc_fragment_noresults.xml
@@ -165,15 +165,14 @@
 
     <Button
         android:id="@+id/gc_button_no_results_back"
+        style="@style/GiniCaptureTheme.Button"
         android:layout_width="wrap_content"
         android:layout_height="@dimen/gc_noresults_bottom_button_height"
         android:layout_alignParentBottom="true"
         android:layout_centerHorizontal="true"
         android:layout_margin="@dimen/gc_noresults_bottom_button_margin"
-        android:background="@color/gc_noresults_button"
         android:text="@string/gc_noresults_back_button"
-        android:width="@dimen/gc_noresults_bottom_button_max_width"
-        android:textColor="@color/gc_noresults_button_text" />
+        android:width="@dimen/gc_noresults_bottom_button_max_width" />
 
 
 </RelativeLayout>
diff --git a/ginicapture/src/main/res/layout/gc_activity_photo_tips.xml b/ginicapture/src/main/res/layout/gc_activity_photo_tips.xml
@@ -146,13 +146,11 @@
 
     <Button
         android:id="@+id/gc_button_photo_tips_camera"
+        style="@style/GiniCaptureTheme.Button"
         android:layout_width="match_parent"
         android:layout_height="@dimen/gc_photo_tips_bottom_button_height"
         android:layout_alignParentBottom="true"
         android:layout_margin="@dimen/gc_photo_tips_bottom_button_margin"
-        android:background="@color/gc_photo_tips_button"
-        android:text="@string/gc_photo_tips_camera_button"
-        android:textColor="@color/gc_photo_tips_button_text" />
-
+        android:text="@string/gc_photo_tips_camera_button" />
 
 </RelativeLayout>
diff --git a/ginicapture/src/main/res/layout/gc_activity_photo_tips_with_multipage.xml b/ginicapture/src/main/res/layout/gc_activity_photo_tips_with_multipage.xml
@@ -173,13 +173,11 @@
 
     <Button
         android:id="@+id/gc_button_photo_tips_camera"
+        style="@style/GiniCaptureTheme.Button"
         android:layout_width="match_parent"
         android:layout_height="@dimen/gc_photo_tips_bottom_button_height"
         android:layout_alignParentBottom="true"
         android:layout_margin="@dimen/gc_photo_tips_bottom_button_margin"
-        android:background="@color/gc_photo_tips_button"
-        android:text="@string/gc_photo_tips_camera_button"
-        android:textColor="@color/gc_photo_tips_button_text" />
-
+        android:text="@string/gc_photo_tips_camera_button"/>
 
 </RelativeLayout>
diff --git a/ginicapture/src/main/res/layout/gc_fragment_noresults.xml b/ginicapture/src/main/res/layout/gc_fragment_noresults.xml
@@ -165,13 +165,11 @@
 
     <Button
         android:id="@+id/gc_button_no_results_back"
+        style="@style/GiniCaptureTheme.Button"
         android:layout_width="match_parent"
         android:layout_height="@dimen/gc_noresults_bottom_button_height"
         android:layout_alignParentBottom="true"
         android:layout_margin="@dimen/gc_noresults_bottom_button_margin"
-        android:background="@color/gc_noresults_button"
-        android:text="@string/gc_noresults_back_button"
-        android:textColor="@color/gc_noresults_button_text" />
-
+        android:text="@string/gc_noresults_back_button" />
 
 </RelativeLayout>
diff --git a/ginicapture/src/main/res/values/styles.xml b/ginicapture/src/main/res/values/styles.xml
@@ -321,5 +321,17 @@
 
     <style name="GiniCaptureTheme.Review.MultiPage.PageIndicator.TextStyle" parent="Root.GiniCaptureTheme.Review.MultiPage.PageIndicator.TextStyle" />
 
+    <!-- Root widget styles -->
+
+    <style name="Root.GiniCaptureTheme.Button" parent="Widget.MaterialComponents.Button">
+        <item name="android:textColor">@color/gc_photo_tips_button_text</item>
+        <item name="backgroundTint">@color/gc_photo_tips_button</item>
+        <item name="android:insetTop">0dp</item>
+        <item name="android:insetBottom">0dp</item>
+    </style>
+
+    <!-- Widget styles used in the layouts which are overridable for customization -->
+
+    <style name="GiniCaptureTheme.Button" parent="Root.GiniCaptureTheme.Button" />
 
 </resources>
diff --git a/gradle.properties b/gradle.properties
@@ -22,7 +22,7 @@ org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m
 # mavenReleasesRepoUrl=https://repo.i.gini.net/nexus/content/repositories/releases
 # mavenOpenRepoUrl=https://repo.i.gini.net/nexus/content/repositories/open
 groupId=net.gini
-version=1.4.0
+version=1.4.1
 
 android.useAndroidX=true
 android.enableJetifier=true