Skip to content

Commit 2020b91

Browse files
niyajaliniyajali
authored
Merge pull request #225 from skniyajali/image_decoding_bug#222
Bug Fixed - Image Decoding on Main Thread
2 parents 5399af9 + 3a6e136 commit 2020b91

File tree

12 files changed

+377
-268
lines changed

12 files changed

+377
-268
lines changed

‎core/common/src/main/java/com/niyaj/common/utils/Extensions.kt

+47
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,13 @@ import android.graphics.Canvas
77
import android.graphics.drawable.Drawable
88
import android.net.Uri
99
import android.text.format.DateUtils
10+
import kotlinx.coroutines.CoroutineDispatcher
11+
import kotlinx.coroutines.Dispatchers
12+
import kotlinx.coroutines.withContext
1013
import java.io.ByteArrayOutputStream
14+
import java.io.File
15+
import java.io.InputStream
16+
import java.io.OutputStream
1117
import java.math.RoundingMode
1218
import java.nio.ByteBuffer
1319
import java.text.DecimalFormat
@@ -490,6 +496,47 @@ fun Uri.toBitmap(context: Context): Bitmap? {
490496
return bitmap
491497
}
492498

499+
suspend fun Context.saveImageToInternalStorage(
500+
uri: Uri,
501+
fileName: String,
502+
oldFileName: String = "",
503+
dispatcher: CoroutineDispatcher = Dispatchers.IO,
504+
): Resource<String> {
505+
val contentResolver = this.contentResolver
506+
val targetFile = File(this.filesDir, fileName)
507+
508+
if (oldFileName.isNotEmpty()) {
509+
val oldFile = File(this.filesDir, oldFileName)
510+
if (oldFile.exists()) {
511+
oldFile.delete()
512+
}
513+
}
514+
515+
return withContext(dispatcher) {
516+
try {
517+
targetFile.createNewFile()
518+
contentResolver.openInputStream(uri)?.use { inputStream ->
519+
targetFile.outputStream().use { outputStream ->
520+
inputStream.copyTo(outputStream, bufferSize = 1024)
521+
}
522+
}
523+
Resource.Success(fileName)
524+
} catch (e: Exception) {
525+
Resource.Error(e.message.toString())
526+
}
527+
}
528+
}
529+
530+
private fun InputStream.copyTo(
531+
outputStream: OutputStream,
532+
bufferSize: Int = 1024
533+
) {
534+
val buffer = ByteArray(bufferSize)
535+
var bytesRead: Int
536+
while (read(buffer).also { bytesRead = it } > 0) {
537+
outputStream.write(buffer, 0, bytesRead)
538+
}
539+
}
493540

494541
fun drawableToByteArray(context: Context, imageRes: Int): ByteArray {
495542
// Get the drawable from the resources

‎core/model/src/main/java/com/niyaj/model/RestaurantInfo.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,8 @@ const val RESTAURANT_ADDRESS =
6565
const val RESTAURANT_PAYMENT_QR_DATA =
6666
"upi://pay?pa=paytmqr281005050101zry6uqipmngr@paytm&pn=Paytm%20Merchant&paytmqr=281005050101ZRY6UQIPMNGR"
6767

68-
const val RESTAURANT_LOGO_NAME = "reslogo.png"
69-
const val RESTAURANT_PRINT_LOGO_NAME = "printlogo.png"
68+
const val RESTAURANT_LOGO_NAME = "reslogo"
69+
const val RESTAURANT_PRINT_LOGO_NAME = "printlogo"
7070

7171
val RESTAURANT_LOGO = R.drawable.logo_new.toString()
7272
val PRINT_LOGO = R.drawable.reslogo.toString()

‎feature/profile/build.gradle.kts

+4
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,8 @@ android {
1717
dependencies {
1818
implementation(libs.accompanist.permissions)
1919
implementation(libs.zxing.core)
20+
21+
implementation(libs.coil.kt)
22+
implementation(libs.coil.kt.compose)
23+
2024
}

‎feature/profile/src/main/java/com/niyaj/feature/profile/ProfileEvent.kt

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
package com.niyaj.feature.profile
22

3+
import android.net.Uri
4+
35
sealed class ProfileEvent {
46

57
data class NameChanged(val name: String) : ProfileEvent()
@@ -20,9 +22,9 @@ sealed class ProfileEvent {
2022

2123
data object StartScanning : ProfileEvent()
2224

23-
data object LogoChanged : ProfileEvent()
25+
data class LogoChanged(val uri: Uri) : ProfileEvent()
2426

25-
data object PrintLogoChanged : ProfileEvent()
27+
data class PrintLogoChanged(val uri: Uri) : ProfileEvent()
2628

2729
data object SetProfileInfo: ProfileEvent()
2830

‎feature/profile/src/main/java/com/niyaj/feature/profile/ProfileScreen.kt

+33-66
Original file line numberDiff line numberDiff line change
@@ -31,23 +31,18 @@ import androidx.compose.runtime.rememberCoroutineScope
3131
import androidx.compose.runtime.saveable.rememberSaveable
3232
import androidx.compose.runtime.setValue
3333
import androidx.compose.ui.Modifier
34-
import androidx.compose.ui.platform.LocalContext
3534
import androidx.compose.ui.unit.dp
3635
import androidx.hilt.navigation.compose.hiltViewModel
3736
import androidx.lifecycle.compose.collectAsStateWithLifecycle
3837
import androidx.navigation.NavController
3938
import com.google.accompanist.permissions.ExperimentalPermissionsApi
4039
import com.google.accompanist.permissions.rememberMultiplePermissionsState
4140
import com.niyaj.common.tags.ProfileTestTags.PROFILE_SCREEN
42-
import com.niyaj.common.utils.ImageStorageManager
43-
import com.niyaj.common.utils.toBitmap
4441
import com.niyaj.designsystem.theme.LightColor6
4542
import com.niyaj.designsystem.theme.SpaceSmall
4643
import com.niyaj.feature.profile.components.AccountInfo
4744
import com.niyaj.feature.profile.components.RestaurantCard
4845
import com.niyaj.feature.profile.destinations.UpdateProfileScreenDestination
49-
import com.niyaj.model.RESTAURANT_LOGO_NAME
50-
import com.niyaj.model.RESTAURANT_PRINT_LOGO_NAME
5146
import com.niyaj.ui.components.SettingsCard
5247
import com.niyaj.ui.event.UiEvent
5348
import com.niyaj.ui.util.Screens
@@ -73,46 +68,12 @@ fun ProfileScreen(
7368
viewModel: ProfileViewModel = hiltViewModel(),
7469
resultRecipient: ResultRecipient<UpdateProfileScreenDestination, String>
7570
) {
76-
val context = LocalContext.current
7771
val lazyListState = rememberLazyListState()
7872
val scope = rememberCoroutineScope()
7973

8074
val info = viewModel.info.collectAsStateWithLifecycle().value
8175
val accountInfo = viewModel.accountInfo.collectAsStateWithLifecycle().value
8276

83-
val resLogo = info.getRestaurantLogo(context)
84-
val printLogo = info.getRestaurantPrintLogo(context)
85-
86-
LaunchedEffect(key1 = true) {
87-
viewModel.eventFlow.collect { event ->
88-
when (event) {
89-
is UiEvent.Success -> {
90-
scaffoldState.snackbarHostState.showSnackbar(
91-
message = event.successMessage
92-
)
93-
}
94-
95-
is UiEvent.Error -> {
96-
scaffoldState.snackbarHostState.showSnackbar(
97-
message = event.errorMessage
98-
)
99-
}
100-
101-
}
102-
}
103-
}
104-
105-
resultRecipient.onNavResult { result ->
106-
when (result) {
107-
is NavResult.Canceled -> {}
108-
is NavResult.Value -> {
109-
scope.launch {
110-
scaffoldState.snackbarHostState.showSnackbar(result.value)
111-
}
112-
}
113-
}
114-
}
115-
11677
val permissionState = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
11778
rememberMultiplePermissionsState(
11879
permissions = listOf(
@@ -134,6 +95,10 @@ fun ProfileScreen(
13495
}
13596
}
13697

98+
LaunchedEffect(key1 = Unit) {
99+
checkForMediaPermission()
100+
}
101+
137102
var showPrintLogo by rememberSaveable {
138103
mutableStateOf(false)
139104
}
@@ -142,39 +107,43 @@ fun ProfileScreen(
142107
contract = ActivityResultContracts.PickVisualMedia()
143108
) { uri ->
144109
uri?.let {
145-
val result = ImageStorageManager.saveToInternalStorage(
146-
context,
147-
uri.toBitmap(context),
148-
RESTAURANT_LOGO_NAME
149-
)
150-
151-
scope.launch {
152-
if (result) {
153-
scaffoldState.snackbarHostState.showSnackbar("Profile image saved successfully.")
154-
viewModel.onEvent(ProfileEvent.LogoChanged)
155-
} else {
156-
scaffoldState.snackbarHostState.showSnackbar("Unable save image into storage.")
157-
}
158-
}
110+
viewModel.onEvent(ProfileEvent.LogoChanged(uri = it))
159111
}
160112
}
161113

162114
val printLogoLauncher = rememberLauncherForActivityResult(
163115
contract = ActivityResultContracts.PickVisualMedia()
164116
) { uri ->
165117
uri?.let {
166-
val result = ImageStorageManager.saveToInternalStorage(
167-
context,
168-
uri.toBitmap(context),
169-
RESTAURANT_PRINT_LOGO_NAME
170-
)
118+
viewModel.onEvent(ProfileEvent.PrintLogoChanged(uri = it))
119+
}
120+
}
121+
122+
LaunchedEffect(key1 = true) {
123+
viewModel.eventFlow.collect { event ->
124+
when (event) {
125+
is UiEvent.Success -> {
126+
scaffoldState.snackbarHostState.showSnackbar(
127+
message = event.successMessage
128+
)
129+
}
171130

172-
scope.launch {
173-
if (result) {
174-
scaffoldState.snackbarHostState.showSnackbar("Print Image saved successfully.")
175-
viewModel.onEvent(ProfileEvent.PrintLogoChanged)
176-
} else {
177-
scaffoldState.snackbarHostState.showSnackbar("Unable save print image into storage.")
131+
is UiEvent.Error -> {
132+
scaffoldState.snackbarHostState.showSnackbar(
133+
message = event.errorMessage
134+
)
135+
}
136+
137+
}
138+
}
139+
}
140+
141+
resultRecipient.onNavResult { result ->
142+
when (result) {
143+
is NavResult.Canceled -> {}
144+
is NavResult.Value -> {
145+
scope.launch {
146+
scaffoldState.snackbarHostState.showSnackbar(result.value)
178147
}
179148
}
180149
}
@@ -224,8 +193,6 @@ fun ProfileScreen(
224193
item("Restaurant Info") {
225194
RestaurantCard(
226195
info = info,
227-
resLogo = resLogo,
228-
printLogo = printLogo,
229196
showPrintLogo = showPrintLogo,
230197
onClickEdit = {
231198
checkForMediaPermission()

‎feature/profile/src/main/java/com/niyaj/feature/profile/ProfileViewModel.kt

+65-16
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,16 @@
11
package com.niyaj.feature.profile
22

3+
import android.app.Application
34
import android.graphics.Bitmap
45
import androidx.compose.runtime.getValue
56
import androidx.compose.runtime.mutableStateOf
67
import androidx.compose.runtime.setValue
78
import androidx.lifecycle.ViewModel
89
import androidx.lifecycle.viewModelScope
10+
import com.niyaj.common.network.Dispatcher
11+
import com.niyaj.common.network.PoposDispatchers
912
import com.niyaj.common.utils.Resource
13+
import com.niyaj.common.utils.saveImageToInternalStorage
1014
import com.niyaj.data.repository.AccountRepository
1115
import com.niyaj.data.repository.QRCodeScanner
1216
import com.niyaj.data.repository.RestaurantInfoRepository
@@ -19,6 +23,8 @@ import com.niyaj.model.RestaurantInfo
1923
import com.niyaj.ui.event.UiEvent
2024
import com.niyaj.ui.util.QRCodeEncoder
2125
import dagger.hilt.android.lifecycle.HiltViewModel
26+
import kotlinx.coroutines.CoroutineDispatcher
27+
import kotlinx.coroutines.Dispatchers
2228
import kotlinx.coroutines.flow.MutableSharedFlow
2329
import kotlinx.coroutines.flow.MutableStateFlow
2430
import kotlinx.coroutines.flow.SharingStarted
@@ -27,14 +33,18 @@ import kotlinx.coroutines.flow.asStateFlow
2733
import kotlinx.coroutines.flow.collectLatest
2834
import kotlinx.coroutines.flow.stateIn
2935
import kotlinx.coroutines.launch
36+
import kotlinx.coroutines.withContext
3037
import javax.inject.Inject
3138

3239
@HiltViewModel
3340
class ProfileViewModel @Inject constructor(
34-
private val repository : RestaurantInfoRepository,
35-
private val validation : RestaurantInfoValidationRepository,
36-
private val accountRepository : AccountRepository,
37-
private val scanner : QRCodeScanner
41+
private val repository: RestaurantInfoRepository,
42+
private val validation: RestaurantInfoValidationRepository,
43+
private val accountRepository: AccountRepository,
44+
private val scanner: QRCodeScanner,
45+
private val application: Application,
46+
@Dispatcher(PoposDispatchers.IO)
47+
private val dispatcher: CoroutineDispatcher = Dispatchers.IO
3848
) : ViewModel() {
3949

4050
var updateState by mutableStateOf(UpdateProfileState())
@@ -57,8 +67,7 @@ class ProfileViewModel @Inject constructor(
5767
initialValue = Account()
5868
)
5969

60-
61-
fun onEvent(event : ProfileEvent) {
70+
fun onEvent(event: ProfileEvent) {
6271
when (event) {
6372
is ProfileEvent.NameChanged -> {
6473
updateState = updateState.copy(
@@ -118,25 +127,65 @@ class ProfileViewModel @Inject constructor(
118127

119128
is ProfileEvent.LogoChanged -> {
120129
viewModelScope.launch {
121-
when (repository.updateRestaurantLogo(RESTAURANT_LOGO_NAME)) {
122-
is Resource.Success -> {
123-
_eventFlow.emit(UiEvent.Success("Profile photo has been updated"))
124-
}
130+
val fileName = "$RESTAURANT_LOGO_NAME-${System.currentTimeMillis()}.png"
131+
132+
val result = withContext(dispatcher) {
133+
application.saveImageToInternalStorage(
134+
event.uri,
135+
fileName,
136+
info.value.logo,
137+
dispatcher
138+
)
139+
}
140+
141+
when (result) {
125142
is Resource.Error -> {
126-
_eventFlow.emit(UiEvent.Error("Unable to update profile photo"))
143+
_eventFlow.emit(UiEvent.Error("Unable to save logo into device"))
144+
}
145+
146+
is Resource.Success -> {
147+
when (repository.updateRestaurantLogo(fileName)) {
148+
is Resource.Success -> {
149+
_eventFlow.emit(UiEvent.Success("Profile photo has been updated"))
150+
}
151+
152+
is Resource.Error -> {
153+
_eventFlow.emit(UiEvent.Error("Unable to update profile photo"))
154+
}
155+
}
127156
}
128157
}
129158
}
130159
}
131160

132161
is ProfileEvent.PrintLogoChanged -> {
133162
viewModelScope.launch {
134-
when (repository.updatePrintLogo(RESTAURANT_PRINT_LOGO_NAME)) {
135-
is Resource.Success -> {
136-
_eventFlow.emit(UiEvent.Success("Print photo has been updated"))
137-
}
163+
val fileName = "$RESTAURANT_PRINT_LOGO_NAME-${System.currentTimeMillis()}.png"
164+
165+
val result = withContext(dispatcher) {
166+
application.saveImageToInternalStorage(
167+
event.uri,
168+
fileName,
169+
info.value.printLogo,
170+
dispatcher
171+
)
172+
}
173+
174+
when (result) {
138175
is Resource.Error -> {
139-
_eventFlow.emit(UiEvent.Error("Unable to update print photo"))
176+
_eventFlow.emit(UiEvent.Error("Unable to save print image into device"))
177+
}
178+
179+
is Resource.Success -> {
180+
when (repository.updatePrintLogo(fileName)) {
181+
is Resource.Success -> {
182+
_eventFlow.emit(UiEvent.Success("Print photo has been updated"))
183+
}
184+
185+
is Resource.Error -> {
186+
_eventFlow.emit(UiEvent.Error("Unable to update print photo"))
187+
}
188+
}
140189
}
141190
}
142191
}

0 commit comments

Comments
 (0)