Browse Source

Imageviewer. Fix "./gradlew build"

pull/52/head
Igor Demin 4 years ago
parent
commit
3f31864f34
  1. 2
      examples/imageviewer/common/src/androidMain/AndroidManifest.xml
  2. 9
      examples/imageviewer/common/src/androidMain/kotlin/example/imageviewer/model/ContentState.kt
  3. 2
      examples/imageviewer/common/src/androidMain/kotlin/example/imageviewer/style/Decoration.kt
  4. 3
      examples/imageviewer/common/src/androidMain/kotlin/example/imageviewer/view/MainScreen.kt

2
examples/imageviewer/common/src/androidMain/AndroidManifest.xml

@ -1,2 +1,2 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest package="example.imageviewer"/>
<manifest package="example.imageviewer.common"/>

9
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
@ -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)
}
}

2
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)

3
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

Loading…
Cancel
Save