From 3f31864f34b74290abbf0872a12a415738f1af97 Mon Sep 17 00:00:00 2001
From: Igor Demin <igor.demin@jetbrains.com>
Date: Thu, 5 Nov 2020 10:27:43 +0300
Subject: [PATCH] Imageviewer. Fix "./gradlew build"

---
 .../common/src/androidMain/AndroidManifest.xml        |  2 +-
 .../kotlin/example/imageviewer/model/ContentState.kt  | 11 ++++-------
 .../kotlin/example/imageviewer/style/Decoration.kt    |  2 +-
 .../kotlin/example/imageviewer/view/MainScreen.kt     |  5 ++---
 4 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/examples/imageviewer/common/src/androidMain/AndroidManifest.xml b/examples/imageviewer/common/src/androidMain/AndroidManifest.xml
index 69c7572d0f..7a302a744c 100755
--- a/examples/imageviewer/common/src/androidMain/AndroidManifest.xml
+++ b/examples/imageviewer/common/src/androidMain/AndroidManifest.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest package="example.imageviewer"/>
\ No newline at end of file
+<manifest package="example.imageviewer.common"/>
\ No newline at end of file
diff --git a/examples/imageviewer/common/src/androidMain/kotlin/example/imageviewer/model/ContentState.kt b/examples/imageviewer/common/src/androidMain/kotlin/example/imageviewer/model/ContentState.kt
index bc321fb46e..95d38a2094 100755
--- a/examples/imageviewer/common/src/androidMain/kotlin/example/imageviewer/model/ContentState.kt
+++ b/examples/imageviewer/common/src/androidMain/kotlin/example/imageviewer/model/ContentState.kt
@@ -4,17 +4,14 @@ import android.content.Context
 import android.graphics.*
 import android.os.Handler
 import android.os.Looper
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.remember
 import androidx.compose.runtime.MutableState
 import androidx.compose.runtime.mutableStateOf
+import example.imageviewer.common.R
 import example.imageviewer.core.FilterType
 import example.imageviewer.model.filtration.FiltersManager
 import example.imageviewer.utils.clearCache
 import example.imageviewer.utils.isInternetAvailable
 import example.imageviewer.view.showPopUpMessage
-import example.imageviewer.R
-import java.io.File
 import java.util.concurrent.ExecutorService
 import java.util.concurrent.Executors
 
@@ -29,7 +26,7 @@ object ContentState {
         if (this::uriRepository.isInitialized && this.uriRepository == uriRepository) {
             return this
         }
-        
+
         this.context = context
         this.uriRepository = uriRepository
         repository = ImageRepository(uriRepository)
@@ -196,7 +193,7 @@ object ContentState {
                     handler.post {
                         showPopUpMessage(
                             getString(R.string.no_internet),
-                                context
+                            context
                         )
                         isAppUIReady.value = true
                     }
@@ -364,7 +361,7 @@ private object MainImageWrapper {
         return filtersSet
     }
 
-    private fun copy(bitmap: Bitmap) : Bitmap {
+    private fun copy(bitmap: Bitmap): Bitmap {
         return bitmap.copy(bitmap.config, false)
     }
 }
\ No newline at end of file
diff --git a/examples/imageviewer/common/src/androidMain/kotlin/example/imageviewer/style/Decoration.kt b/examples/imageviewer/common/src/androidMain/kotlin/example/imageviewer/style/Decoration.kt
index 304741acbe..cea4f364b6 100755
--- a/examples/imageviewer/common/src/androidMain/kotlin/example/imageviewer/style/Decoration.kt
+++ b/examples/imageviewer/common/src/androidMain/kotlin/example/imageviewer/style/Decoration.kt
@@ -3,7 +3,7 @@ package example.imageviewer.style
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.graphics.ImageAsset
 import androidx.compose.ui.res.imageResource
-import example.imageviewer.R
+import example.imageviewer.common.R
 
 @Composable
 fun icEmpty(): ImageAsset = imageResource(R.raw.empty)
diff --git a/examples/imageviewer/common/src/androidMain/kotlin/example/imageviewer/view/MainScreen.kt b/examples/imageviewer/common/src/androidMain/kotlin/example/imageviewer/view/MainScreen.kt
index 49c32681ab..c2b4cb005b 100755
--- a/examples/imageviewer/common/src/androidMain/kotlin/example/imageviewer/view/MainScreen.kt
+++ b/examples/imageviewer/common/src/androidMain/kotlin/example/imageviewer/view/MainScreen.kt
@@ -10,7 +10,6 @@ import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
-import androidx.compose.foundation.layout.Stack
 import androidx.compose.foundation.layout.preferredHeight
 import androidx.compose.foundation.layout.preferredWidth
 import androidx.compose.foundation.layout.preferredSize
@@ -31,6 +30,7 @@ import androidx.compose.ui.graphics.RectangleShape
 import androidx.compose.ui.graphics.asImageAsset
 import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.unit.dp
+import example.imageviewer.common.R
 import example.imageviewer.model.AppState
 import example.imageviewer.model.Picture
 import example.imageviewer.model.ScreenType
@@ -44,7 +44,6 @@ import example.imageviewer.style.LightGray
 import example.imageviewer.style.icRefresh
 import example.imageviewer.style.icEmpty
 import example.imageviewer.style.icDots
-import example.imageviewer.R
 
 
 @Composable
@@ -193,7 +192,7 @@ fun setMiniatureUI(
                 modifier = Modifier.weight(1f).align(Alignment.CenterVertically).padding(start = 16.dp),
                 style = MaterialTheme.typography.body1
             )
-                
+
             Clickable(
                 modifier = Modifier.preferredHeight(70.dp)
                         .preferredWidth(30.dp),