From e9bc0a14f2237ac4ebc0ab0d8e1d61e8cd7b0331 Mon Sep 17 00:00:00 2001 From: tibbi Date: Tue, 7 Nov 2017 20:29:38 +0100 Subject: [PATCH] move a couple classes to the new Models folder --- app/src/main/kotlin/com/simplemobiletools/draw/MyCanvas.kt | 2 ++ .../com/simplemobiletools/draw/activities/MainActivity.kt | 2 +- .../com/simplemobiletools/draw/dialogs/SaveImageDialog.kt | 2 +- .../kotlin/com/simplemobiletools/draw/{ => models}/MyPath.kt | 3 ++- .../com/simplemobiletools/draw/{ => models}/PaintOptions.kt | 2 +- .../kotlin/com/simplemobiletools/draw/{ => models}/Svg.kt | 4 +++- 6 files changed, 10 insertions(+), 5 deletions(-) rename app/src/main/kotlin/com/simplemobiletools/draw/{ => models}/MyPath.kt (96%) rename app/src/main/kotlin/com/simplemobiletools/draw/{ => models}/PaintOptions.kt (85%) rename app/src/main/kotlin/com/simplemobiletools/draw/{ => models}/Svg.kt (97%) diff --git a/app/src/main/kotlin/com/simplemobiletools/draw/MyCanvas.kt b/app/src/main/kotlin/com/simplemobiletools/draw/MyCanvas.kt index 0b0bf7d..bff7f71 100644 --- a/app/src/main/kotlin/com/simplemobiletools/draw/MyCanvas.kt +++ b/app/src/main/kotlin/com/simplemobiletools/draw/MyCanvas.kt @@ -13,6 +13,8 @@ import com.bumptech.glide.load.DecodeFormat import com.bumptech.glide.request.RequestOptions import com.simplemobiletools.commons.extensions.getContrastColor import com.simplemobiletools.commons.extensions.toast +import com.simplemobiletools.draw.models.MyPath +import com.simplemobiletools.draw.models.PaintOptions import java.util.* import java.util.concurrent.ExecutionException diff --git a/app/src/main/kotlin/com/simplemobiletools/draw/activities/MainActivity.kt b/app/src/main/kotlin/com/simplemobiletools/draw/activities/MainActivity.kt index 80f57cc..22c0764 100644 --- a/app/src/main/kotlin/com/simplemobiletools/draw/activities/MainActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/draw/activities/MainActivity.kt @@ -21,7 +21,7 @@ import com.simplemobiletools.commons.models.Release import com.simplemobiletools.draw.BuildConfig import com.simplemobiletools.draw.MyCanvas import com.simplemobiletools.draw.R -import com.simplemobiletools.draw.Svg +import com.simplemobiletools.draw.models.Svg import com.simplemobiletools.draw.dialogs.SaveImageDialog import com.simplemobiletools.draw.extensions.config import com.simplemobiletools.draw.helpers.JPG diff --git a/app/src/main/kotlin/com/simplemobiletools/draw/dialogs/SaveImageDialog.kt b/app/src/main/kotlin/com/simplemobiletools/draw/dialogs/SaveImageDialog.kt index 24d26f4..ab4a8ec 100644 --- a/app/src/main/kotlin/com/simplemobiletools/draw/dialogs/SaveImageDialog.kt +++ b/app/src/main/kotlin/com/simplemobiletools/draw/dialogs/SaveImageDialog.kt @@ -6,7 +6,7 @@ import com.simplemobiletools.commons.dialogs.FilePickerDialog import com.simplemobiletools.commons.extensions.* import com.simplemobiletools.draw.MyCanvas import com.simplemobiletools.draw.R -import com.simplemobiletools.draw.Svg +import com.simplemobiletools.draw.models.Svg import com.simplemobiletools.draw.activities.SimpleActivity import com.simplemobiletools.draw.helpers.JPG import com.simplemobiletools.draw.helpers.PNG diff --git a/app/src/main/kotlin/com/simplemobiletools/draw/MyPath.kt b/app/src/main/kotlin/com/simplemobiletools/draw/models/MyPath.kt similarity index 96% rename from app/src/main/kotlin/com/simplemobiletools/draw/MyPath.kt rename to app/src/main/kotlin/com/simplemobiletools/draw/models/MyPath.kt index dbad8b0..3c8766e 100644 --- a/app/src/main/kotlin/com/simplemobiletools/draw/MyPath.kt +++ b/app/src/main/kotlin/com/simplemobiletools/draw/models/MyPath.kt @@ -1,8 +1,9 @@ -package com.simplemobiletools.draw +package com.simplemobiletools.draw.models import android.app.Activity import android.graphics.Path import com.simplemobiletools.commons.extensions.toast +import com.simplemobiletools.draw.R import com.simplemobiletools.draw.actions.Action import com.simplemobiletools.draw.actions.Line import com.simplemobiletools.draw.actions.Move diff --git a/app/src/main/kotlin/com/simplemobiletools/draw/PaintOptions.kt b/app/src/main/kotlin/com/simplemobiletools/draw/models/PaintOptions.kt similarity index 85% rename from app/src/main/kotlin/com/simplemobiletools/draw/PaintOptions.kt rename to app/src/main/kotlin/com/simplemobiletools/draw/models/PaintOptions.kt index 82953f5..81d5096 100644 --- a/app/src/main/kotlin/com/simplemobiletools/draw/PaintOptions.kt +++ b/app/src/main/kotlin/com/simplemobiletools/draw/models/PaintOptions.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.draw +package com.simplemobiletools.draw.models import android.graphics.Color diff --git a/app/src/main/kotlin/com/simplemobiletools/draw/Svg.kt b/app/src/main/kotlin/com/simplemobiletools/draw/models/Svg.kt similarity index 97% rename from app/src/main/kotlin/com/simplemobiletools/draw/Svg.kt rename to app/src/main/kotlin/com/simplemobiletools/draw/models/Svg.kt index 51c99d5..f7a7c40 100644 --- a/app/src/main/kotlin/com/simplemobiletools/draw/Svg.kt +++ b/app/src/main/kotlin/com/simplemobiletools/draw/models/Svg.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.draw +package com.simplemobiletools.draw.models import android.graphics.Color import android.graphics.drawable.ColorDrawable @@ -7,6 +7,8 @@ import android.sax.RootElement import android.util.Xml import com.simplemobiletools.commons.extensions.getFileOutputStream import com.simplemobiletools.commons.extensions.toast +import com.simplemobiletools.draw.MyCanvas +import com.simplemobiletools.draw.R import com.simplemobiletools.draw.activities.MainActivity import com.simplemobiletools.draw.activities.SimpleActivity import java.io.*