reworked vector options builder alexzhirkevich#21

Jamalzahid · Mar 10, 2023 · 2a9fd23 · 2a9fd23
1 parent 1cfb4de
commit 2a9fd23
Show file tree

Hide file tree

Showing 22 changed files with 96 additions and 65 deletions.
diff --git a/...qr_generator/src/main/java/com/github/alexzhirkevich/customqrgenerator/QrCodeGenerator.kt b/...qr_generator/src/main/java/com/github/alexzhirkevich/customqrgenerator/QrCodeGenerator.kt
@@ -1,3 +1,5 @@
+@file:Suppress("DEPRECATION", "UNUSED")
+
 package com.github.alexzhirkevich.customqrgenerator
 
 import android.content.Context

diff --git a/...enerator/src/main/java/com/github/alexzhirkevich/customqrgenerator/QrCodeGeneratorImpl.kt b/...enerator/src/main/java/com/github/alexzhirkevich/customqrgenerator/QrCodeGeneratorImpl.kt
@@ -1,3 +1,5 @@
+@file:Suppress("DEPRECATION")
+
 package com.github.alexzhirkevich.customqrgenerator
 
 import android.content.Context

diff --git a/custom_qr_generator/src/main/java/com/github/alexzhirkevich/customqrgenerator/QrData.kt b/custom_qr_generator/src/main/java/com/github/alexzhirkevich/customqrgenerator/QrData.kt
@@ -1,5 +1,8 @@
+@file:Suppress("UNUSED")
+
 package com.github.alexzhirkevich.customqrgenerator
 
+import kotlinx.serialization.ExperimentalSerializationApi
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.modules.SerializersModule
 import kotlinx.serialization.modules.polymorphic
@@ -306,6 +309,7 @@ fun interface QrData {
         override fun encode(): String = "{{{market://details?id=%$appPackage}}}"
     }
 
+    @OptIn(ExperimentalSerializationApi::class)
     companion object : SerializationProvider {
         override val defaultSerializersModule by lazy(LazyThreadSafetyMode.NONE) {
             SerializersModule {

diff --git a/...rator/src/main/java/com/github/alexzhirkevich/customqrgenerator/QrErrorCorrectionLevel.kt b/...rator/src/main/java/com/github/alexzhirkevich/customqrgenerator/QrErrorCorrectionLevel.kt
@@ -1,3 +1,5 @@
+@file:Suppress("UNUSED")
+
 package com.github.alexzhirkevich.customqrgenerator
 
 import com.google.zxing.qrcode.decoder.ErrorCorrectionLevel

diff --git a/custom_qr_generator/src/main/java/com/github/alexzhirkevich/customqrgenerator/QrOptions.kt b/custom_qr_generator/src/main/java/com/github/alexzhirkevich/customqrgenerator/QrOptions.kt
@@ -29,16 +29,16 @@ data class QrOptions(
     class Builder(
         @IntRange(from = 0) val width: Int,
         @IntRange(from = 0) val height: Int = width
-    ) : QrLogoBuilder, QrOffsetBuilder {
-
-        var padding = .125f
-        override var offset = QrOffset.Zero
-        var colors = QrColors()
-        override var logo = QrLogo()
-        var background = QrBackground()
-        var elementsShapes = QrElementsShapes()
-        var codeShape: QrShape = QrShape.Default
-        var errorCorrectionLevel: QrErrorCorrectionLevel = QrErrorCorrectionLevel.Auto
+    )  {
+
+        internal var padding = .125f
+        internal var offset = QrOffset.Zero
+        internal var colors = QrColors()
+        internal var logo = QrLogo()
+        internal var background = QrBackground()
+        internal var elementsShapes = QrElementsShapes()
+        internal var codeShape: QrShape = QrShape.Default
+        internal var errorCorrectionLevel: QrErrorCorrectionLevel = QrErrorCorrectionLevel.Auto
 
         fun build(): QrOptions = QrOptions(
             width,height, padding, offset, colors, logo, background,

diff --git a/...enerator/src/main/java/com/github/alexzhirkevich/customqrgenerator/QrSerializersModule.kt b/...enerator/src/main/java/com/github/alexzhirkevich/customqrgenerator/QrSerializersModule.kt
@@ -1,3 +1,5 @@
+@file:Suppress("UNUSED")
+
 package com.github.alexzhirkevich.customqrgenerator
 
 import com.github.alexzhirkevich.customqrgenerator.vector.QrVectorOptions

diff --git a/..._generator/src/main/java/com/github/alexzhirkevich/customqrgenerator/dsl/DslExtensions.kt b/..._generator/src/main/java/com/github/alexzhirkevich/customqrgenerator/dsl/DslExtensions.kt
@@ -1,3 +1,5 @@
+@file:Suppress("DEPRECATION")
+
 package com.github.alexzhirkevich.customqrgenerator.dsl
 
 import android.graphics.Canvas
@@ -73,7 +75,7 @@ inline fun <reified T : QrShapeModifier> QrElementsShapesBuilderScope.pathShape(
 /**
  * @see [pathShape]
  * */
-@Suppress("unchecked_cast", "deprecation")
+@Suppress("unchecked_cast")
 fun <T : QrShapeModifier> QrElementsShapesBuilderScope.pathShape(
     clazz: KClass<T>,
     efficiency: Efficiency = Efficiency.Time,
@@ -100,7 +102,6 @@ inline fun <reified T : QrShapeModifier> QrLogoBuilderScope.pathShape(
     noinline builder: Path.(size: Int) -> Unit
 ): T = pathShape(T::class, efficiency, builder)
 
-@Suppress("deprecation")
 fun <T : QrShapeModifier> QrLogoBuilderScope.pathShape(
     clazz: KClass<T>,
     efficiency: Efficiency = Efficiency.Time,
@@ -124,7 +125,6 @@ fun <T : QrShapeModifier> QrLogoBuilderScope.pathShape(
     ReplaceWith("pathShape"),
     level = DeprecationLevel.WARNING
 )
-@Suppress("deprecation")
 inline fun <reified T : QrShapeModifier> QrElementsShapesBuilderScope.drawShape(
     noinline draw : Canvas.(drawPaint : Paint, erasePaint : Paint) -> Unit
 ): T = drawShape(T::class, draw)

diff --git a/...src/main/java/com/github/alexzhirkevich/customqrgenerator/dsl/QrBackgroundBuilderScope.kt b/...src/main/java/com/github/alexzhirkevich/customqrgenerator/dsl/QrBackgroundBuilderScope.kt
@@ -1,3 +1,5 @@
+@file:Suppress("DEPRECATION")
+
 package com.github.alexzhirkevich.customqrgenerator.dsl
 
 import com.github.alexzhirkevich.customqrgenerator.QrOptions

diff --git a/...tor/src/main/java/com/github/alexzhirkevich/customqrgenerator/dsl/QrColorsBuilderScope.kt b/...tor/src/main/java/com/github/alexzhirkevich/customqrgenerator/dsl/QrColorsBuilderScope.kt
@@ -1,3 +1,5 @@
+@file:Suppress("DEPRECATION")
+
 package com.github.alexzhirkevich.customqrgenerator.dsl
 
 import com.github.alexzhirkevich.customqrgenerator.QrOptions

diff --git a/...main/java/com/github/alexzhirkevich/customqrgenerator/dsl/QrElementsShapesBuilderScope.kt b/...main/java/com/github/alexzhirkevich/customqrgenerator/dsl/QrElementsShapesBuilderScope.kt
@@ -1,3 +1,5 @@
+@file:Suppress("DEPRECATION")
+
 package com.github.alexzhirkevich.customqrgenerator.dsl
 
 import com.github.alexzhirkevich.customqrgenerator.QrOptions

diff --git a/...rator/src/main/java/com/github/alexzhirkevich/customqrgenerator/dsl/QrLogoBuilderScope.kt b/...rator/src/main/java/com/github/alexzhirkevich/customqrgenerator/dsl/QrLogoBuilderScope.kt
@@ -1,3 +1,5 @@
+@file:Suppress("DEPRECATION")
+
 package com.github.alexzhirkevich.customqrgenerator.dsl
 
 import com.github.alexzhirkevich.customqrgenerator.QrOptions
@@ -18,7 +20,7 @@ sealed interface QrLogoBuilderScope : IQRLogo {
 }
 
 internal class InternalQrLogoBuilderScope(
-     val builder: QrLogoBuilder,
+     val builder: QrOptions.Builder,
      val width : Int,
      val height : Int,
      val codePadding : Float = -1f

diff --git a/...tor/src/main/java/com/github/alexzhirkevich/customqrgenerator/dsl/QrOffsetBuilderScope.kt b/...tor/src/main/java/com/github/alexzhirkevich/customqrgenerator/dsl/QrOffsetBuilderScope.kt
@@ -1,8 +1,10 @@
+@file:Suppress("DEPRECATION")
+
 package com.github.alexzhirkevich.customqrgenerator.dsl
 
+import com.github.alexzhirkevich.customqrgenerator.QrOptions
 import com.github.alexzhirkevich.customqrgenerator.style.IQrOffset
 import com.github.alexzhirkevich.customqrgenerator.style.QrOffset
-import com.github.alexzhirkevich.customqrgenerator.style.QrOffsetBuilder
 
 /**
  * @see QrOffset
@@ -13,7 +15,7 @@ sealed interface QrOffsetBuilderScope : IQrOffset {
 }
 
 internal class InternalQrOffsetBuilderScope(
-    private val builder: QrOffsetBuilder
+    private val builder: QrOptions.Builder
 ) : QrOffsetBuilderScope {
 
     override var x: Float

diff --git a/...or/src/main/java/com/github/alexzhirkevich/customqrgenerator/dsl/QrOptionsBuilderScope.kt b/...or/src/main/java/com/github/alexzhirkevich/customqrgenerator/dsl/QrOptionsBuilderScope.kt
@@ -1,3 +1,5 @@
+@file:Suppress("DEPRECATION")
+
 package com.github.alexzhirkevich.customqrgenerator.dsl
 
 import com.github.alexzhirkevich.customqrgenerator.QrErrorCorrectionLevel

diff --git a/..._qr_generator/src/main/java/com/github/alexzhirkevich/customqrgenerator/style/QrOffset.kt b/..._qr_generator/src/main/java/com/github/alexzhirkevich/customqrgenerator/style/QrOffset.kt
@@ -24,7 +24,3 @@ data class QrOffset(
         val Zero = QrOffset(0f,0f)
     }
 }
-
-interface QrOffsetBuilder {
-    var offset : QrOffset
-}
diff --git a/...rator/src/main/java/com/github/alexzhirkevich/customqrgenerator/vector/QrVectorOptions.kt b/...rator/src/main/java/com/github/alexzhirkevich/customqrgenerator/vector/QrVectorOptions.kt
@@ -5,7 +5,6 @@ import com.github.alexzhirkevich.customqrgenerator.QrErrorCorrectionLevel
 import com.github.alexzhirkevich.customqrgenerator.SerializationProvider
 import com.github.alexzhirkevich.customqrgenerator.SerializersModuleFromProviders
 import com.github.alexzhirkevich.customqrgenerator.style.QrOffset
-import com.github.alexzhirkevich.customqrgenerator.style.QrOffsetBuilder
 import com.github.alexzhirkevich.customqrgenerator.style.QrShape
 import com.github.alexzhirkevich.customqrgenerator.vector.dsl.InternalQrVectorOptionsBuilderScope
 import com.github.alexzhirkevich.customqrgenerator.vector.dsl.QrVectorOptionsBuilderScope
@@ -27,48 +26,56 @@ data class QrVectorOptions(
     val errorCorrectionLevel: QrErrorCorrectionLevel,
     val fourthEyeEnabled : Boolean,
 )  {
-    class Builder : QrOffsetBuilder, QrVectorLogoBuilder {
+    class Builder {
 
         @FloatRange(from = .0, to = .5)
         var padding : Float = 0f
-        override var offset: QrOffset = QrOffset(0f,0f)
+        private set
+        var offset: QrOffset = QrOffset(0f,0f)
+        private set
         var shapes: QrVectorShapes = QrVectorShapes()
+        private set
         var shape : QrShape = QrShape.Default
+        private set
         var colors : QrVectorColors = QrVectorColors()
-        override var logo : QrVectorLogo = QrVectorLogo()
+        private set
+        var logo : QrVectorLogo = QrVectorLogo()
+        private set
         var background: QrVectorBackground = QrVectorBackground()
+        private set
         var errorCorrectionLevel: QrErrorCorrectionLevel = QrErrorCorrectionLevel.Auto
+        private set
         var fourthEyeEnabled : Boolean = false
-
-        fun padding(@FloatRange(from = .0, to = .5) padding: Float) = apply {
+        private set
+        fun setPaddding(@FloatRange(from = .0, to = .5) padding: Float) = apply {
             this.padding = padding
         }
 
-        fun offset(offset: QrOffset) = apply {
+        fun setOffset(offset: QrOffset) = apply {
             this.offset = offset
         }
 
-        fun shapes(shapes: QrVectorShapes) = apply {
+        fun setShapes(shapes: QrVectorShapes) = apply {
             this.shapes = shapes
         }
 
-        fun colors(colors: QrVectorColors) = apply {
+        fun setColors(colors: QrVectorColors) = apply {
             this.colors = colors
         }
 
-        fun codeShape(shape: QrShape) = apply{
+        fun setCodeShape(shape: QrShape) = apply{
             this.shape = shape
         }
 
-        fun logo(logo: QrVectorLogo) = apply {
+        fun setLogo(logo: QrVectorLogo) = apply {
             this.logo = logo
         }
 
-        fun background(background: QrVectorBackground) = apply {
+        fun setBackground(background: QrVectorBackground) = apply {
             this.background = background
         }
 
-        fun errorCorrectionLevel(errorCorrectionLevel: QrErrorCorrectionLevel) = apply {
+        fun setErrorCorrectionLevel(errorCorrectionLevel: QrErrorCorrectionLevel) = apply {
             this.errorCorrectionLevel = errorCorrectionLevel
         }
 

diff --git a/...hub/alexzhirkevich/customqrgenerator/vector/dsl/InternalQrVectorBackgroundBuilderScope.kt b/...hub/alexzhirkevich/customqrgenerator/vector/dsl/InternalQrVectorBackgroundBuilderScope.kt
@@ -12,16 +12,16 @@ internal class InternalQrVectorBackgroundBuilderScope(
     override var drawable: DrawableSource
         get() = builder.background.drawable
         set(value) = with(builder){
-            background(background.copy(drawable = value))
+            setBackground(background.copy(drawable = value))
         }
     override var scale: BitmapScale
         get() = builder.background.scale
         set(value) = with(builder){
-            background(background.copy(scale = value))
+            setBackground(background.copy(scale = value))
         }
     override var color: QrVectorColor
         get() = builder.background.color
         set(value) = with(builder) {
-            background(background.copy(color = value))
+            setBackground(background.copy(color = value))
         }
 }
diff --git a/.../github/alexzhirkevich/customqrgenerator/vector/dsl/InternalQrVectorColorsBuilderScope.kt b/.../github/alexzhirkevich/customqrgenerator/vector/dsl/InternalQrVectorColorsBuilderScope.kt
@@ -9,30 +9,30 @@ internal class InternalQrVectorColorsBuilderScope(
     override var dark: QrVectorColor
         get() = builder.colors.dark
         set(value) = with(builder){
-            colors(colors.copy(
+            setColors(colors.copy(
                 dark = value
             ))
         }
 
     override var light: QrVectorColor
         get() = builder.colors.light
         set(value) = with(builder){
-            colors(colors.copy(
+            setColors(colors.copy(
                 light = value
             ))
         }
 
     override var ball: QrVectorColor
         get() = builder.colors.ball
         set(value) = with(builder){
-            colors(colors.copy(
+            setColors(colors.copy(
                 ball = value
             ))
         }
     override var frame: QrVectorColor
         get() = builder.colors.frame
         set(value) = with(builder){
-            colors(colors.copy(
+            setColors(colors.copy(
                 frame = value
             ))
         }

diff --git a/...om/github/alexzhirkevich/customqrgenerator/vector/dsl/InternalQrVectorLogoBuilderScope.kt b/...om/github/alexzhirkevich/customqrgenerator/vector/dsl/InternalQrVectorLogoBuilderScope.kt
@@ -1,42 +1,43 @@
 package com.github.alexzhirkevich.customqrgenerator.vector.dsl
 
 import com.github.alexzhirkevich.customqrgenerator.style.*
+import com.github.alexzhirkevich.customqrgenerator.vector.QrVectorOptions
 import com.github.alexzhirkevich.customqrgenerator.vector.style.*
 
 internal class InternalQrVectorLogoBuilderScope(
-    val builder: QrVectorLogoBuilder,
+    val builder: QrVectorOptions.Builder,
 ) : QrVectorLogoBuilderScope {
 
     override var drawable: DrawableSource
         get() = builder.logo.drawable
         set(value) = with(builder) {
-            logo = logo.copy(drawable = value)
+            setLogo(logo.copy(drawable = value))
         }
     override var size: Float
         get() = builder.logo.size
         set(value) = with(builder) {
-            logo = logo.copy(size = value)
+            setLogo(logo.copy(size = value))
         }
 
     override var padding: QrVectorLogoPadding
         get() = builder.logo.padding
         set(value) = with(builder) {
-            logo =logo.copy(padding = value)
+            setLogo(logo.copy(padding = value))
         }
     override var shape: QrVectorLogoShape
         get() = builder.logo.shape
         set(value) = with(builder) {
-            logo = logo.copy(shape = value)
+            setLogo(logo.copy(shape = value))
         }
 
     override var scale: BitmapScale
         get() = builder.logo.scale
         set(value) = with(builder) {
-            logo = logo.copy(scale = value)
+            setLogo(logo.copy(scale = value))
         }
     override var backgroundColor: QrVectorColor
         get() = builder.logo.backgroundColor
         set(value) = with(builder) {
-            logo = logo.copy(backgroundColor = value)
+            setLogo(logo.copy(backgroundColor = value))
         }
 }
diff --git a/...github/alexzhirkevich/customqrgenerator/vector/dsl/InternalQrVectorOptionsBuilderScope.kt b/...github/alexzhirkevich/customqrgenerator/vector/dsl/InternalQrVectorOptionsBuilderScope.kt
@@ -1,8 +1,7 @@
 package com.github.alexzhirkevich.customqrgenerator.vector.dsl
 
 import com.github.alexzhirkevich.customqrgenerator.QrErrorCorrectionLevel
-import com.github.alexzhirkevich.customqrgenerator.dsl.InternalQrOffsetBuilderScope
-import com.github.alexzhirkevich.customqrgenerator.dsl.QrOffsetBuilderScope
+import com.github.alexzhirkevich.customqrgenerator.style.QrOffset
 import com.github.alexzhirkevich.customqrgenerator.style.QrShape
 import com.github.alexzhirkevich.customqrgenerator.vector.QrVectorOptions
 
@@ -14,21 +13,29 @@ internal class InternalQrVectorOptionsBuilderScope(
     override var padding: Float
         get() = builder.padding
         set(value) {
-            builder.padding(value)
+            builder.setPaddding(value)
         }
 
     override var errorCorrectionLevel: QrErrorCorrectionLevel
         get() = builder.errorCorrectionLevel
         set(value) {
-            builder.errorCorrectionLevel(value)
+            builder.setErrorCorrectionLevel(value)
         }
 
-    override var codeShape: QrShape by builder::shape
+    override var codeShape: QrShape
+    get() = builder.shape
+    set(value){
+        builder.setCodeShape(value)
+    }
 
-    override var fourthEyeEnabled: Boolean by builder::fourthEyeEnabled
+    override var fourthEyeEnabled: Boolean
+    get() = builder.fourthEyeEnabled
+    set(value) {
+        builder.setFourthEyeEnabled(value)
+    }
 
-    override fun offset(block: QrOffsetBuilderScope.() -> Unit) {
-        InternalQrOffsetBuilderScope(builder).apply(block)
+    override fun offset(x : Float, y : Float) {
+        builder.setOffset(QrOffset(x,y))
     }
 
     override fun shapes(