move strings in core/ui module
disable generating android resources everywhere except core/ui module replace UiR with R
This commit is contained in:
+2
-2
@@ -30,7 +30,7 @@ import java.io.FileOutputStream
|
||||
import java.net.URLDecoder
|
||||
import java.util.UUID
|
||||
|
||||
import dev.meloda.fast.ui.R as UiR
|
||||
import dev.meloda.fast.ui.R
|
||||
|
||||
interface PhotoViewViewModel {
|
||||
val screenState: StateFlow<PhotoViewScreenState>
|
||||
@@ -114,7 +114,7 @@ class PhotoViewViewModelImpl(
|
||||
viewModelScope.launch(Dispatchers.Main) {
|
||||
Toast.makeText(
|
||||
applicationContext,
|
||||
UiR.string.error_occurred,
|
||||
R.string.error_occurred,
|
||||
Toast.LENGTH_LONG
|
||||
).show()
|
||||
}
|
||||
|
||||
+6
-6
@@ -61,6 +61,7 @@ import dev.meloda.fast.photoviewer.PhotoViewViewModel
|
||||
import dev.meloda.fast.photoviewer.PhotoViewViewModelImpl
|
||||
import dev.meloda.fast.photoviewer.model.PhotoViewArguments
|
||||
import dev.meloda.fast.photoviewer.model.PhotoViewScreenState
|
||||
import dev.meloda.fast.ui.R
|
||||
import dev.meloda.fast.ui.components.FullScreenDialog
|
||||
import dev.meloda.fast.ui.components.Loader
|
||||
import dev.meloda.fast.ui.util.getImage
|
||||
@@ -69,7 +70,6 @@ import kotlinx.coroutines.launch
|
||||
import org.koin.androidx.compose.koinViewModel
|
||||
import java.net.URLEncoder
|
||||
import kotlin.math.abs
|
||||
import dev.meloda.fast.ui.R as UiR
|
||||
|
||||
@Composable
|
||||
fun PhotoViewDialog(
|
||||
@@ -136,7 +136,7 @@ private fun PhotoViewRoute(
|
||||
scope.launch(Dispatchers.Main) {
|
||||
Toast.makeText(
|
||||
context,
|
||||
UiR.string.error_occurred,
|
||||
R.string.error_occurred,
|
||||
Toast.LENGTH_LONG
|
||||
).show()
|
||||
}
|
||||
@@ -285,7 +285,7 @@ private fun TopBar(
|
||||
onShareClicked()
|
||||
},
|
||||
text = {
|
||||
Text(text = stringResource(UiR.string.action_share))
|
||||
Text(text = stringResource(R.string.action_share))
|
||||
}
|
||||
)
|
||||
DropdownMenuItem(
|
||||
@@ -294,7 +294,7 @@ private fun TopBar(
|
||||
onOpenInClicked()
|
||||
},
|
||||
text = {
|
||||
Text(text = stringResource(UiR.string.action_open_in))
|
||||
Text(text = stringResource(R.string.action_open_in))
|
||||
}
|
||||
)
|
||||
DropdownMenuItem(
|
||||
@@ -303,7 +303,7 @@ private fun TopBar(
|
||||
onCopyLinkClicked()
|
||||
},
|
||||
text = {
|
||||
Text(text = stringResource(UiR.string.action_copy_link))
|
||||
Text(text = stringResource(R.string.action_copy_link))
|
||||
}
|
||||
)
|
||||
DropdownMenuItem(
|
||||
@@ -312,7 +312,7 @@ private fun TopBar(
|
||||
onCopyClicked()
|
||||
},
|
||||
text = {
|
||||
Text(text = stringResource(UiR.string.action_copy_image))
|
||||
Text(text = stringResource(R.string.action_copy_image))
|
||||
},
|
||||
)
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user