Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/develop' into SN-2813/cut-and-pa…
Browse files Browse the repository at this point in the history 
…ste-problems-fix

# Conflicts:
#	build.gradle
  • Loading branch information
@AmadeyKuspakov
AmadeyKuspakov committed Sep 12, 2023
2 parents 9fb3779 + 6173750 commit 459860b
Show file tree
Hide file tree
Showing 29 changed files with 521 additions and 490 deletions.
2 changes: 1 addition & 1 deletion app/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ play {
serviceAccountCredentials = file(System.env.CI_PLAY_KEY ?: "../key/fake.json")
track = "internal"
releaseStatus = ReleaseStatus.DRAFT
releaseName = "3.4.0.0 - Explore Ecosystem"
releaseName = "3.4.0.1 - Explore Ecosystem"
}

dependencies {
Expand Down
8 changes: 4 additions & 4 deletions build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ buildscript {
composeCompiler : '1.4.6',
composeConstraintLayout: '1.1.0-alpha05',
uiCore : '0.1.3',
soraCard : '0.1.38',
soraCard : '0.1.40',
lazySodium : '5.0.2',
jna : '5.8.0',
accompanist : '0.30.1',
Expand All @@ -54,11 +54,11 @@ buildscript {
]

ext {
// soralution 106 3.4.0.0 2023.08.25
// soralution 107 3.4.0.1 2023.09.08
// sora dae 98 3.3.0.0 2023.08.18
// appVersionCode = Integer.valueOf(System.env.BUILD_NUMBER ?: 96)
appVersionCode = Integer.valueOf(System.env.CI_BUILD_ID ?: 106)
appVersionName = '3.4.0.0'
appVersionCode = Integer.valueOf(System.env.CI_BUILD_ID ?: 107)
appVersionName = '3.4.0.1'

compileVersion = 33
minVersion = 24
Expand Down
4 changes: 2 additions & 2 deletions common_wallet/src/main/java/jp/co/soramitsu/common_wallet/domain/model/UserPoolData.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,8 +71,8 @@ private fun printFiatInternal(basic: BasicPoolData, user: UserPoolData?): Pair<D
val f1 = basic.baseToken.calcFiat(user.basePooled)
val f2 = basic.targetToken.calcFiat(user.targetPooled)
if (f1 == null || f2 == null) return null
val change1 = basic.baseToken.fiatPriceChange ?: return null
val change2 = basic.targetToken.fiatPriceChange ?: return null
val change1 = basic.baseToken.fiatPriceChange ?: 0.0
val change2 = basic.targetToken.fiatPriceChange ?: 0.0
val price1 = basic.baseToken.fiatPrice ?: return null
val price2 = basic.targetToken.fiatPrice ?: return null
val newPoolFiat = f1 + f2
Expand Down
28 changes: 7 additions & 21 deletions ...soramitsu/feature_assets_impl/presentation/components/compose/scan/QrCodeScannerScreen.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,14 +49,14 @@ import androidx.compose.ui.graphics.Color
import androidx.compose.ui.graphics.Path
import androidx.compose.ui.graphics.PathOperation
import androidx.compose.ui.res.painterResource
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.Dp
import androidx.compose.ui.unit.dp
import androidx.constraintlayout.compose.ConstraintLayout
import androidx.constraintlayout.compose.Dimension
import jp.co.soramitsu.common.R
import jp.co.soramitsu.common.presentation.compose.uikit.tokens.ScreenStatus
import jp.co.soramitsu.common.presentation.compose.uikit.tokens.Text
import jp.co.soramitsu.common.presentation.compose.uikit.tokens.retrieveString
import jp.co.soramitsu.ui_core.component.button.BleachedButton
import jp.co.soramitsu.ui_core.component.button.FilledButton
import jp.co.soramitsu.ui_core.component.button.properties.Order
Expand All @@ -71,15 +71,6 @@ data class QRCodeScannerScreenState(
val screenStatus: ScreenStatus,
val throwable: Throwable?
) {

val toolbarTitleText: Text = Text.StringRes(id = R.string.common_scan_qr)

val uploadFromGalleryButtonText: Text = Text.StringRes(id = R.string.common_upload_from_library)

val showMyQrButtonText: Text = Text.StringRes(id = R.string.scan_qr_show_my_qr)

val isErrorTextVisible: Boolean = screenStatus === ScreenStatus.ERROR

val errorText: Text
get() = throwable?.message?.let {
Text.SimpleText(it)
Expand All @@ -88,7 +79,6 @@ data class QRCodeScannerScreenState(

@Composable
fun QrCodeScannerScreen(
state: QRCodeScannerScreenState,
onNavIconClick: () -> Unit,
onUploadFromGalleryClick: () -> Unit,
onShowUserQrClick: () -> Unit
Expand Down Expand Up @@ -122,14 +112,14 @@ fun QrCodeScannerScreen(
SoramitsuToolbar(
state = SoramitsuToolbarState(
basic = BasicToolbarState(
title = state.toolbarTitleText.retrieveString(),
title = R.string.common_scan_qr,
navIcon = R.drawable.ic_close,
),
type = SoramitsuToolbarType.SmallCentered()
),
backgroundColor = blurCameraBackground,
elevation = Dp(0f),
onNavigate = onNavIconClick
elevation = 0.dp,
onNavigate = onNavIconClick,
)
}

Expand Down Expand Up @@ -262,7 +252,7 @@ fun QrCodeScannerScreen(
),
size = Size.Large,
order = Order.SECONDARY,
text = state.uploadFromGalleryButtonText.retrieveString(),
text = stringResource(id = R.string.common_upload_from_library),
onClick = onUploadFromGalleryClick
)

Expand All @@ -283,7 +273,7 @@ fun QrCodeScannerScreen(
),
size = Size.Large,
order = Order.SECONDARY,
text = state.showMyQrButtonText.retrieveString(),
text = stringResource(id = R.string.scan_qr_show_my_qr),
onClick = onShowUserQrClick
)
}
Expand All @@ -301,10 +291,6 @@ private fun PreviewQrCodeScannerScreen() {
contentDescription = ""
)
QrCodeScannerScreen(
state = QRCodeScannerScreenState(
screenStatus = ScreenStatus.READY_TO_RENDER,
throwable = null
),
onNavIconClick = {},
onUploadFromGalleryClick = {},
onShowUserQrClick = {}
Expand Down
44 changes: 14 additions & 30 deletions ...soramitsu/feature_assets_impl/presentation/screens/fullassetlist/FullAssetListFragment.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,13 +55,14 @@ import androidx.compose.foundation.verticalScroll
import androidx.compose.material.Divider
import androidx.compose.material.MaterialTheme
import androidx.compose.material.Text
import androidx.compose.runtime.Composable
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.style.TextAlign
import androidx.compose.ui.unit.dp
import androidx.fragment.app.viewModels
import androidx.lifecycle.compose.collectAsStateWithLifecycle
import androidx.navigation.NavGraphBuilder
import androidx.navigation.NavHostController
import com.google.accompanist.navigation.animation.composable
Expand All @@ -72,10 +73,6 @@ import jp.co.soramitsu.common.base.theOnlyRoute
import jp.co.soramitsu.common.domain.BottomBarController
import jp.co.soramitsu.common_wallet.presentation.compose.components.AssetItem
import jp.co.soramitsu.feature_assets_impl.presentation.components.compose.assetslist.CommonAssetsList
import jp.co.soramitsu.ui_core.component.toolbar.BasicToolbarState
import jp.co.soramitsu.ui_core.component.toolbar.SoramitsuToolbar
import jp.co.soramitsu.ui_core.component.toolbar.SoramitsuToolbarState
import jp.co.soramitsu.ui_core.component.toolbar.SoramitsuToolbarType
import jp.co.soramitsu.ui_core.resources.Dimens
import jp.co.soramitsu.ui_core.theme.customColors
import jp.co.soramitsu.ui_core.theme.customTypography
Expand All @@ -86,6 +83,9 @@ class FullAssetListFragment : SoraBaseFragment<FullAssetListViewModel>() {
override val viewModel: FullAssetListViewModel by viewModels()
override fun backgroundColor(): Int = R.attr.baseBackgroundSecond

@Composable
override fun backgroundColorComposable() = MaterialTheme.customColors.bgSurface

override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
super.onViewCreated(view, savedInstanceState)
(activity as BottomBarController).hideBottomBar()
Expand All @@ -104,23 +104,7 @@ class FullAssetListFragment : SoraBaseFragment<FullAssetListViewModel>() {
.background(MaterialTheme.customColors.bgSurface)
.fillMaxSize()
) {
SoramitsuToolbar(
state = SoramitsuToolbarState(
basic = BasicToolbarState(
title = "",
navIcon = jp.co.soramitsu.ui_core.R.drawable.ic_cross_24,
actionLabel = R.string.common_edit,
searchValue = "",
),
type = SoramitsuToolbarType.Small(),
),
backgroundColor = MaterialTheme.customColors.bgSurface,
elevation = 0.dp,
onAction = viewModel::onAction,
onNavigate = viewModel::onNavIcon,
onSearch = viewModel::searchAssets,
)
val state = viewModel.state
val state = viewModel.state.collectAsStateWithLifecycle()
Row(
modifier = Modifier
.padding(
Expand All @@ -142,7 +126,7 @@ class FullAssetListFragment : SoraBaseFragment<FullAssetListViewModel>() {
)
Text(
modifier = Modifier.weight(1f),
text = state.fiatSum,
text = state.value.fiatSum,
textAlign = TextAlign.End,
style = MaterialTheme.customTypography.headline2,
color = MaterialTheme.customColors.fgPrimary,
Expand All @@ -154,7 +138,7 @@ class FullAssetListFragment : SoraBaseFragment<FullAssetListViewModel>() {
.fillMaxSize()
) {
androidx.compose.animation.AnimatedVisibility(
visible = state.searchMode.not(),
visible = state.value.searchMode.not(),
enter = fadeIn(),
exit = fadeOut(),
) {
Expand All @@ -164,32 +148,32 @@ class FullAssetListFragment : SoraBaseFragment<FullAssetListViewModel>() {
.verticalScroll(scrollState),
) {
CommonAssetsList(
state = state,
state = state.value,
onAssetClick = viewModel::onAssetClick,
)
}
}
androidx.compose.animation.AnimatedVisibility(
visible = state.searchMode,
visible = state.value.searchMode,
enter = fadeIn(),
exit = fadeOut(),
) {
val listState = rememberLazyListState()
LazyColumn(state = listState, modifier = Modifier.fillMaxSize()) {
items(
count = state.topList.size + state.bottomList.size + 1,
count = state.value.topList.size + state.value.bottomList.size + 1,
key = null,
contentType = { p -> if (p == state.topList.size) 0 else 1 },
contentType = { p -> if (p == state.value.topList.size) 0 else 1 },
) { position ->
if (position == state.topList.size) {
if (position == state.value.topList.size) {
Text(
text = stringResource(id = R.string.global_results).uppercase(),
style = MaterialTheme.customTypography.headline4,
color = MaterialTheme.customColors.fgSecondary,
)
} else {
val item =
if (position < state.topList.size) state.topList[position] else state.bottomList[position - state.topList.size - 1]
if (position < state.value.topList.size) state.value.topList[position] else state.value.bottomList[position - state.value.topList.size - 1]
AssetItem(
assetState = item,
testTag = "",
Expand Down
32 changes: 23 additions & 9 deletions ...oramitsu/feature_assets_impl/presentation/screens/fullassetlist/FullAssetListViewModel.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
package jp.co.soramitsu.feature_assets_impl.presentation.screens.fullassetlist

import androidx.compose.runtime.getValue
import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.setValue
import androidx.lifecycle.viewModelScope
import dagger.hilt.android.lifecycle.HiltViewModel
Expand All @@ -49,7 +48,12 @@ import jp.co.soramitsu.common_wallet.presentation.compose.states.mapAssetsToCard
import jp.co.soramitsu.feature_assets_api.domain.AssetsInteractor
import jp.co.soramitsu.feature_assets_api.presentation.AssetsRouter
import jp.co.soramitsu.feature_assets_impl.presentation.states.FullAssetListState
import jp.co.soramitsu.ui_core.R
import jp.co.soramitsu.ui_core.component.toolbar.BasicToolbarState
import jp.co.soramitsu.ui_core.component.toolbar.SoramitsuToolbarState
import jp.co.soramitsu.ui_core.component.toolbar.SoramitsuToolbarType
import kotlinx.coroutines.flow.MutableStateFlow
import kotlinx.coroutines.flow.asStateFlow
import kotlinx.coroutines.flow.catch
import kotlinx.coroutines.flow.collectLatest
import kotlinx.coroutines.flow.debounce
Expand All @@ -68,10 +72,20 @@ class FullAssetListViewModel @Inject constructor(
private val visAssets = mutableListOf<Asset>()
private val filter = MutableStateFlow("")

var state by mutableStateOf(FullAssetListState(false, "", emptyList(), emptyList()))
private set
private val _state = MutableStateFlow(FullAssetListState(false, "", emptyList(), emptyList()))
val state = _state.asStateFlow()

init {
_toolbarState.value = SoramitsuToolbarState(
basic = BasicToolbarState(
title = "",
navIcon = R.drawable.ic_cross_24,
actionLabel = jp.co.soramitsu.common.R.string.common_edit,
searchValue = "",
searchEnabled = true,
),
type = SoramitsuToolbarType.Small(),
)
viewModelScope.launch {
allAssets.addAll(assetsInteractor.getWhitelistAssets())
launch {
Expand All @@ -92,6 +106,10 @@ class FullAssetListViewModel @Inject constructor(
}
}

override fun onToolbarSearch(value: String) {
filter.value = value
}

private fun calcState(filter: String) {
val idMap = visAssets.map { t -> t.token.id }
val excluded = allAssets.filter { it.token.id !in idMap }
Expand All @@ -101,7 +119,7 @@ class FullAssetListViewModel @Inject constructor(
val group = visAssets.groupBy {
(it.fiat ?: 0.0) >= thresholdBalance
}
state = state.copy(
_state.value = _state.value.copy(
searchMode = false,
topList = mapAssetsToCardState(
group[true] ?: emptyList(),
Expand All @@ -122,7 +140,7 @@ class FullAssetListViewModel @Inject constructor(
val bottomFilter = invisibleAssets.filter { it.token.isMatchFilter(filter) }
val topSum = topFilter.fiatSum()
val bottomSum = bottomFilter.fiatSum()
state = state.copy(
_state.value = _state.value.copy(
searchMode = true,
topList = mapAssetsToCardState(topFilter, numbersFormatter),
bottomList = mapAssetsToCardState(bottomFilter, numbersFormatter),
Expand All @@ -135,10 +153,6 @@ class FullAssetListViewModel @Inject constructor(
}
}

fun searchAssets(search: String) {
filter.value = search
}

override fun onAction() {
assetsRouter.showFullAssetsSettings()
}
Expand Down
Loading

0 comments on commit 459860b

Please sign in to comment.