Skip to content
This repository was archived by the owner on Feb 11, 2025. It is now read-only.

Commit d2b7393

Browse files
javiergm1983javiergm1983
committed
Merge branch 'release/2.0.9' into 'master'
Release 2.0.9 See merge request mobile/android/AndroidDocumentScanner!34
2 parents b8f9ae6 + 62e2322 commit d2b7393

6 files changed

Lines changed: 35 additions & 22 deletions

File tree

‎app/src/main/res/layout/activity_main.xml‎

Lines changed: 16 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,24 @@
11
<?xml version="1.0" encoding="utf-8"?>
22

3-
4-
<RelativeLayout
5-
xmlns:android="http://schemas.android.com/apk/res/android"
6-
xmlns:tools="http://schemas.android.com/tools"
7-
android:layout_width="match_parent"
8-
android:layout_height="match_parent"
9-
tools:context="com.example.documentscanner.MainActivity">
3+
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
4+
xmlns:tools="http://schemas.android.com/tools"
5+
android:layout_width="match_parent"
6+
android:layout_height="match_parent"
7+
tools:context="com.example.documentscanner.MainActivity">
108

119
<Button
12-
android:id="@+id/btnPick"
13-
android:layout_width="wrap_content"
14-
android:layout_height="wrap_content"
15-
android:text="Pick an Image"
16-
android:padding="50dp"
17-
android:layout_centerInParent="true"/>
10+
android:id="@+id/btnPick"
11+
android:layout_width="wrap_content"
12+
android:layout_height="wrap_content"
13+
android:layout_centerInParent="true"
14+
android:padding="50dp"
15+
android:text="Pick an Image"
16+
android:textAllCaps="false" />
1817

1918
<ImageView
20-
android:id="@+id/imgBitmap"
21-
android:layout_width="match_parent" android:layout_height="match_parent"
22-
android:visibility="gone"
23-
/>
19+
android:id="@+id/imgBitmap"
20+
android:layout_width="match_parent"
21+
android:layout_height="match_parent"
22+
android:visibility="gone" />
2423

2524
</RelativeLayout>

‎build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
buildscript {
22
ext {
3-
versionCode = 15
4-
versionName = "2.0.8"
3+
versionCode = 16
4+
versionName = "2.0.9"
55
compileSdkVersion = 29
66
minSdkVersion = 21
77
group = "com.github.meganz"

‎documentscanner/src/main/res/layout/fragment_crop.xml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@
3939
android:layout_height="wrap_content"
4040
android:layout_marginStart="32dp"
4141
android:text="@string/scan_title_crop"
42-
android:textAllCaps="true"
4342
android:textAppearance="?textAppearanceHeadline6"
4443
app:layout_constraintBottom_toBottomOf="@id/btn_back"
4544
app:layout_constraintStart_toEndOf="@id/btn_back"

‎documentscanner/src/main/res/layout/fragment_save.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
android:layout_height="wrap_content"
2424
android:layout_marginStart="32dp"
2525
android:text="@string/scan_title_save_scan"
26-
android:textAllCaps="true"
2726
android:textAppearance="?textAppearanceHeadline6"
2827
android:textColor="?colorOnSurface"
2928
app:layout_constraintBottom_toBottomOf="@id/btn_back"
@@ -292,6 +291,7 @@
292291
android:layout_height="wrap_content"
293292
android:layout_margin="16dp"
294293
android:text="@string/scan_action_save"
294+
android:textAllCaps="false"
295295
app:layout_constraintBottom_toBottomOf="parent"
296296
app:layout_constraintEnd_toEndOf="parent"
297297
app:layout_constraintStart_toStartOf="parent" />

‎documentscanner/src/main/res/values/styles.xml‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,4 +42,19 @@
4242
<style name="Widget.DocumentScanner.SnackBar" parent="Widget.MaterialComponents.Snackbar">
4343
<item name="backgroundTint">?colorOnSurface</item>
4444
</style>
45+
46+
<style name="Widget.DocumentScanner.MaterialAlertDialog" parent="ThemeOverlay.MaterialComponents.MaterialAlertDialog">
47+
<item name="buttonBarNegativeButtonStyle">@style/Widget.DocumentScanner.NegativeButton.Dialog</item>
48+
<item name="buttonBarPositiveButtonStyle">@style/Widget.DocumentScanner.PositiveButton.Dialog</item>
49+
</style>
50+
51+
<style name="Widget.DocumentScanner.NegativeButton.Dialog" parent="Widget.MaterialComponents.Button.TextButton.Dialog">
52+
<item name="android:textColor">?attr/colorSecondary</item>
53+
<item name="android:textAllCaps">false</item>
54+
</style>
55+
56+
<style name="Widget.DocumentScanner.PositiveButton.Dialog" parent="Widget.MaterialComponents.Button.TextButton.Dialog">
57+
<item name="android:textColor">?attr/colorSecondary</item>
58+
<item name="android:textAllCaps">false</item>
59+
</style>
4560
</resources>

‎documentscanner/src/main/res/values/themes.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<item name="chipStyle">@style/Widget.DocumentScanner.Chip</item>
1818
<item name="textInputStyle">@style/Widget.DocumentScanner.TextInputLayout</item>
1919
<item name="editTextStyle">@style/Widget.DocumentScanner.TextInputEditText</item>
20-
<item name="materialAlertDialogTheme">@style/ThemeOverlay.DocumentScanner.MaterialAlertDialog</item>
20+
<item name="materialAlertDialogTheme">@style/Widget.DocumentScanner.MaterialAlertDialog</item>
2121
<item name="circularProgressIndicatorStyle">@style/Widget.DocumentScanner.CircularProgressIndicator</item>
2222
<item name="materialButtonStyle">@style/Widget.DocumentScanner.Button</item>
2323
<item name="snackbarStyle">@style/Widget.DocumentScanner.SnackBar</item>

0 commit comments

Comments
 (0)