From af2e27b64787e22db244d93138cac9e3451bc439 Mon Sep 17 00:00:00 2001 From: Amina Date: Thu, 27 May 2021 00:21:08 +0300 Subject: [PATCH 1/5] Add FancyPicture class --- .../fancywork/fancyLib/FancyPicture.kt | 23 +++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 app/src/main/java/com/example/fancywork/fancyLib/FancyPicture.kt diff --git a/app/src/main/java/com/example/fancywork/fancyLib/FancyPicture.kt b/app/src/main/java/com/example/fancywork/fancyLib/FancyPicture.kt new file mode 100644 index 0000000..e59fe0c --- /dev/null +++ b/app/src/main/java/com/example/fancywork/fancyLib/FancyPicture.kt @@ -0,0 +1,23 @@ +package com.example.fancywork.fancyLib + +import android.graphics.Bitmap + +class FancyPicture (pair: Pair>> , title: String, id: String){ + + //todo id generator + + var image: Bitmap = pair.first + var colors: Array> = pair.second + + var title: String = title + var id: String = id + + var width: Int + var length: Int + + init { + width = colors.size + length = colors[0].size + } + +} \ No newline at end of file From 4da9378549b8c44f03bfe6f1cc37e826055e41aa Mon Sep 17 00:00:00 2001 From: stop-upiter <56906962+stop-upiter@users.noreply.github.com> Date: Thu, 27 May 2021 00:33:59 +0300 Subject: [PATCH 2/5] Update FancyPicture.kt --- .../java/com/example/fancywork/fancyLib/FancyPicture.kt | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/com/example/fancywork/fancyLib/FancyPicture.kt b/app/src/main/java/com/example/fancywork/fancyLib/FancyPicture.kt index e59fe0c..12cf0d4 100644 --- a/app/src/main/java/com/example/fancywork/fancyLib/FancyPicture.kt +++ b/app/src/main/java/com/example/fancywork/fancyLib/FancyPicture.kt @@ -2,9 +2,9 @@ package com.example.fancywork.fancyLib import android.graphics.Bitmap -class FancyPicture (pair: Pair>> , title: String, id: String){ +class FancyPicture(pair: Pair>>, title: String, id: String) { - //todo id generator + // todo id generator var image: Bitmap = pair.first var colors: Array> = pair.second @@ -19,5 +19,4 @@ class FancyPicture (pair: Pair>> , title: String, i width = colors.size length = colors[0].size } - -} \ No newline at end of file +} From 2da3984b6ef16ef4e55ec23037b0abad9f79bda8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BC=D0=B8=D0=BD=D0=B0=20=D0=9D=D0=BE=D1=83=D1=82?= =?UTF-8?q?=D0=B1=D1=83=D0=BA=20=D1=81=20=D0=9F=D0=B0=D0=BD=D0=B4=D0=B0?= =?UTF-8?q?=D0=BC=D0=B8?= Date: Fri, 28 May 2021 11:42:49 +0300 Subject: [PATCH 3/5] =?UTF-8?q?=D0=A3=D1=87=D0=B8=D1=82=D1=8B=D0=B2=D0=B0?= =?UTF-8?q?=D0=B5=D0=BC=20=D0=B7=D0=B0=D0=BC=D0=B5=D1=87=D0=B0=D0=BD=D0=B8?= =?UTF-8?q?=D1=8F=20=D0=B8=20=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D1=8F?= =?UTF-8?q?=D0=B5=D0=BC=20=D0=BE=D0=BF=D1=86=D0=B8=D0=BE=D0=BD=D0=B0=D0=BB?= =?UTF-8?q?=D1=8C=D0=BD=D1=8B=D0=B5=20=D0=BF=D0=B0=D1=80=D0=B0=D0=BC=D0=B5?= =?UTF-8?q?=D1=82=D1=80=D1=8B=20=D0=B0=D0=B2=D1=82=D0=BE=D1=80=D0=B0=20?= =?UTF-8?q?=D0=B8=20=D1=81=D0=BB=D0=BE=D0=B6=D0=BD=D0=BE=D1=81=D1=82=D0=B8?= =?UTF-8?q?=20=D0=B2=20=D0=BA=D0=BB=D0=B0=D1=81=D1=81=20=D0=B2=D1=8B=D1=88?= =?UTF-8?q?=D0=B8=D0=B2=D0=BA=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../example/fancywork/fancyLib/Difficulty.kt | 5 +++ .../fancywork/fancyLib/FancyPicture.kt | 36 +++++++++++++------ 2 files changed, 30 insertions(+), 11 deletions(-) create mode 100644 app/src/main/java/com/example/fancywork/fancyLib/Difficulty.kt diff --git a/app/src/main/java/com/example/fancywork/fancyLib/Difficulty.kt b/app/src/main/java/com/example/fancywork/fancyLib/Difficulty.kt new file mode 100644 index 0000000..21035ea --- /dev/null +++ b/app/src/main/java/com/example/fancywork/fancyLib/Difficulty.kt @@ -0,0 +1,5 @@ +package com.example.fancywork.fancyLib + +enum class Difficulty { + UNDEFINED, EASY, MEDIUM, HARD, EXTREMELY_HARD +} \ No newline at end of file diff --git a/app/src/main/java/com/example/fancywork/fancyLib/FancyPicture.kt b/app/src/main/java/com/example/fancywork/fancyLib/FancyPicture.kt index 12cf0d4..de755db 100644 --- a/app/src/main/java/com/example/fancywork/fancyLib/FancyPicture.kt +++ b/app/src/main/java/com/example/fancywork/fancyLib/FancyPicture.kt @@ -2,21 +2,35 @@ package com.example.fancywork.fancyLib import android.graphics.Bitmap -class FancyPicture(pair: Pair>>, title: String, id: String) { - +data class FancyPicture( + val id: String, + val title: String, + val image: Bitmap, + val colors: List> +) { // todo id generator + // todo difficulty definer - var image: Bitmap = pair.first - var colors: Array> = pair.second + var author: String = "unknown" + var difficulty: Difficulty = Difficulty.UNDEFINED - var title: String = title - var id: String = id + constructor( + id: String, + title: String, + image: Bitmap, + colors: List>, + author: String, + difficulty: Difficulty + ) : this(id, title, image, colors) { + this.author = author + this.difficulty = difficulty + } - var width: Int - var length: Int + fun getProportions() : Pair? { + if (colors.isEmpty() || colors[0].isEmpty()) { + return null + } - init { - width = colors.size - length = colors[0].size + return Pair(colors.size, colors[0].size) } } From e7b4e6305507e6c923981467d340bec3337d3964 Mon Sep 17 00:00:00 2001 From: stop-upiter <56906962+stop-upiter@users.noreply.github.com> Date: Fri, 28 May 2021 11:45:30 +0300 Subject: [PATCH 4/5] Update Difficulty.kt --- app/src/main/java/com/example/fancywork/fancyLib/Difficulty.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/com/example/fancywork/fancyLib/Difficulty.kt b/app/src/main/java/com/example/fancywork/fancyLib/Difficulty.kt index 21035ea..5ecc0a3 100644 --- a/app/src/main/java/com/example/fancywork/fancyLib/Difficulty.kt +++ b/app/src/main/java/com/example/fancywork/fancyLib/Difficulty.kt @@ -2,4 +2,4 @@ package com.example.fancywork.fancyLib enum class Difficulty { UNDEFINED, EASY, MEDIUM, HARD, EXTREMELY_HARD -} \ No newline at end of file +} From 21534a1f3e89a29da87be5402fb1808120066518 Mon Sep 17 00:00:00 2001 From: stop-upiter <56906962+stop-upiter@users.noreply.github.com> Date: Fri, 28 May 2021 11:47:06 +0300 Subject: [PATCH 5/5] Update FancyPicture.kt --- .../main/java/com/example/fancywork/fancyLib/FancyPicture.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/example/fancywork/fancyLib/FancyPicture.kt b/app/src/main/java/com/example/fancywork/fancyLib/FancyPicture.kt index de755db..90e4e28 100644 --- a/app/src/main/java/com/example/fancywork/fancyLib/FancyPicture.kt +++ b/app/src/main/java/com/example/fancywork/fancyLib/FancyPicture.kt @@ -21,12 +21,12 @@ data class FancyPicture( colors: List>, author: String, difficulty: Difficulty - ) : this(id, title, image, colors) { + ) : this(id, title, image, colors) { this.author = author this.difficulty = difficulty } - fun getProportions() : Pair? { + fun getProportions(): Pair? { if (colors.isEmpty() || colors[0].isEmpty()) { return null }