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

Commit b8f9ae6

Browse files
javiergm1983javiergm1983
authored
Merge pull request #29 from meganz/release/2.0.8
release/2.0.8
2 parents 9e93335 + eece388 commit b8f9ae6

14 files changed

Lines changed: 57 additions & 42 deletions

File tree

‎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 = 14
4-
versionName = "2.0.7"
3+
versionCode = 15
4+
versionName = "2.0.8"
55
compileSdkVersion = 29
66
minSdkVersion = 21
77
group = "com.github.meganz"

‎documentscanner/src/main/java/nz/mega/documentscanner/crop/CropFragment.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ class CropFragment : Fragment() {
4949
private fun setupView() {
5050
binding.btnBack.setOnClickListener { findNavController().popBackStack() }
5151
binding.btnDone.setOnClickListener { saveCrop() }
52-
binding.cropView.setPointColor(ContextCompat.getColor(requireContext(), R.color.secondaryColor))
52+
binding.cropView.setPointColor(ContextCompat.getColor(requireContext(), R.color.teal_200))
5353
binding.cropView.setValidShapeListener { binding.btnDone.isEnabled = it }
5454
}
5555

‎documentscanner/src/main/java/nz/mega/documentscanner/openCV/PolygonView.kt‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,8 @@ class PolygonView
4646
private val midPointer24 = getPointView(0, height / 2)
4747
private var magnifier: Magnifier? = null
4848
private var validShapeListener: ((Boolean) -> Unit)? = null
49+
private val accentColor: Int by lazy { ContextCompat.getColor(context, R.color.teal_200) }
50+
private val errorColor: Int by lazy { ContextCompat.getColor(context, R.color.red_900) }
4951

5052
init {
5153
pointer1.setOnTouchListener(EdgePointTouchListener())
@@ -66,7 +68,7 @@ class PolygonView
6668
addView(pointer4)
6769

6870
paint = Paint().apply {
69-
color = ContextCompat.getColor(context, R.color.secondaryColor)
71+
color = accentColor
7072
strokeWidth = resources.getDimension(R.dimen.polygon_line_width)
7173
isAntiAlias = true
7274
}
@@ -263,9 +265,9 @@ class PolygonView
263265

264266
validShapeListener?.invoke(isValidShape)
265267
paint.color = if (isValidShape) {
266-
ContextCompat.getColor(context, R.color.secondaryColor)
268+
accentColor
267269
} else {
268-
ContextCompat.getColor(context, R.color.errorColor)
270+
errorColor
269271
}
270272

271273
dismissMag()
@@ -324,9 +326,9 @@ class PolygonView
324326

325327
validShapeListener?.invoke(isValidShape)
326328
paint.color = if (isValidShape) {
327-
ContextCompat.getColor(context, R.color.secondaryColor)
329+
accentColor
328330
} else {
329-
ContextCompat.getColor(context, R.color.errorColor)
331+
errorColor
330332
}
331333

332334
dismissMag()

‎documentscanner/src/main/java/nz/mega/documentscanner/view/OverlayView.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ class OverlayView
1717

1818
private val paint: Paint = Paint().apply {
1919
style = Paint.Style.STROKE
20-
color = ContextCompat.getColor(context, R.color.secondaryColor)
20+
color = ContextCompat.getColor(context, R.color.teal_200)
2121
strokeWidth = resources.getDimension(R.dimen.scan_overlay_stroke_width)
2222
}
2323

‎documentscanner/src/main/res/color-night/chip_bg.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<selector xmlns:android="http://schemas.android.com/apk/res/android">
3-
<item android:color="#FFFFFF" android:state_checked="true" />
4-
<item android:color="#26FFFFFF" />
3+
<item android:color="@color/white" android:state_checked="true" />
4+
<item android:color="@color/white_alpha_015" />
55
</selector>

‎documentscanner/src/main/res/color-night/chip_text.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<selector xmlns:android="http://schemas.android.com/apk/res/android">
3-
<item android:color="#121212" android:state_checked="true" />
4-
<item android:color="#888A89" />
3+
<item android:color="@color/dark_grey" android:state_checked="true" />
4+
<item android:color="@color/grey_400" />
55
</selector>

‎documentscanner/src/main/res/color/chip_bg.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<selector xmlns:android="http://schemas.android.com/apk/res/android">
3-
<item android:color="#6C6C6C" android:state_checked="true" />
4-
<item android:color="#EEEEEE" />
3+
<item android:color="@color/grey_600" android:state_checked="true" />
4+
<item android:color="@color/grey_050" />
55
</selector>

‎documentscanner/src/main/res/color/chip_text.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<selector xmlns:android="http://schemas.android.com/apk/res/android">
3-
<item android:color="#FFFFFF" android:state_checked="true" />
4-
<item android:color="#61000000" />
3+
<item android:color="@color/white" android:state_checked="true" />
4+
<item android:color="@color/grey_alpha_038" />
55
</selector>

‎documentscanner/src/main/res/drawable/ic_docscanner_highlight.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,5 @@
88

99
<stroke
1010
android:width="@dimen/polygon_line_width"
11-
android:color="@color/secondaryColor" />
11+
android:color="?colorSecondary" />
1212
</shape>

‎documentscanner/src/main/res/drawable/ic_docscanner_replay_24.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
android:width="24dp"
33
android:height="24dp"
44
android:autoMirrored="true"
5-
android:tint="#FFFFFF"
5+
android:tint="@color/white"
66
android:viewportWidth="24"
77
android:viewportHeight="24">
88
<path

0 commit comments

Comments
 (0)