commit 6b3c1464ea68d3d31d17e2c967f9539bb9b90475 parent 009bf7f6077ce602418564ebafb693de742f0ab5 Author: fsb2 <benjamin.fehrensen@bfh.ch> Date: Sun, 13 Apr 2025 17:20:29 +0200 Small design changes Diffstat:
6 files changed, 31 insertions(+), 6 deletions(-)
diff --git a/wallee-c2ec/.idea/inspectionProfiles/Project_Default.xml b/wallee-c2ec/.idea/inspectionProfiles/Project_Default.xml @@ -1,6 +1,30 @@ <component name="InspectionProjectProfileManager"> <profile version="1.0"> <option name="myName" value="Project Default" /> + <inspection_tool class="ComposePreviewDimensionRespectsLimit" enabled="true" level="WARNING" enabled_by_default="true"> + <option name="composableFile" value="true" /> + </inspection_tool> + <inspection_tool class="ComposePreviewMustBeTopLevelFunction" enabled="true" level="ERROR" enabled_by_default="true"> + <option name="composableFile" value="true" /> + </inspection_tool> + <inspection_tool class="ComposePreviewNeedsComposableAnnotation" enabled="true" level="ERROR" enabled_by_default="true"> + <option name="composableFile" value="true" /> + </inspection_tool> + <inspection_tool class="ComposePreviewNotSupportedInUnitTestFiles" enabled="true" level="ERROR" enabled_by_default="true"> + <option name="composableFile" value="true" /> + </inspection_tool> + <inspection_tool class="GlancePreviewDimensionRespectsLimit" enabled="true" level="WARNING" enabled_by_default="true"> + <option name="composableFile" value="true" /> + </inspection_tool> + <inspection_tool class="GlancePreviewMustBeTopLevelFunction" enabled="true" level="ERROR" enabled_by_default="true"> + <option name="composableFile" value="true" /> + </inspection_tool> + <inspection_tool class="GlancePreviewNeedsComposableAnnotation" enabled="true" level="ERROR" enabled_by_default="true"> + <option name="composableFile" value="true" /> + </inspection_tool> + <inspection_tool class="GlancePreviewNotSupportedInUnitTestFiles" enabled="true" level="ERROR" enabled_by_default="true"> + <option name="composableFile" value="true" /> + </inspection_tool> <inspection_tool class="PreviewAnnotationInFunctionWithParameters" enabled="true" level="ERROR" enabled_by_default="true"> <option name="composableFile" value="true" /> <option name="previewFile" value="true" /> @@ -9,6 +33,9 @@ <option name="composableFile" value="true" /> <option name="previewFile" value="true" /> </inspection_tool> + <inspection_tool class="PreviewDeviceShouldUseNewSpec" enabled="true" level="WEAK WARNING" enabled_by_default="true"> + <option name="composableFile" value="true" /> + </inspection_tool> <inspection_tool class="PreviewDimensionRespectsLimit" enabled="true" level="WARNING" enabled_by_default="true"> <option name="composableFile" value="true" /> <option name="previewFile" value="true" /> diff --git a/wallee-c2ec/app/src/main/java/ch/bfh/habej2/wallee_c2ec/withdrawal/AmountScreen.kt b/wallee-c2ec/app/src/main/java/ch/bfh/habej2/wallee_c2ec/withdrawal/AmountScreen.kt @@ -86,6 +86,6 @@ fun AmountScreen( enableExpr = {model.validAmount(uiState.amountStr) && uiState.withdrawalFees.currency != ""} ) - TalerButton(text = "Exit", onClick = { model.withdrawalOperationFailed(activity) }) + TalerButton(text = "Stop", onClick = { model.withdrawalOperationFailed(activity) }) } } diff --git a/wallee-c2ec/app/src/main/java/ch/bfh/habej2/wallee_c2ec/withdrawal/AuthorizePaymentScreen.kt b/wallee-c2ec/app/src/main/java/ch/bfh/habej2/wallee_c2ec/withdrawal/AuthorizePaymentScreen.kt @@ -24,7 +24,6 @@ import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Spacer import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.size -import androidx.compose.foundation.layout.width import androidx.compose.material.icons.Icons import androidx.compose.material.icons.filled.DoneAll import androidx.compose.material.icons.filled.Warning @@ -37,7 +36,6 @@ import androidx.compose.runtime.collectAsState import androidx.compose.runtime.getValue import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier -import androidx.compose.ui.platform.LocalConfiguration import androidx.compose.ui.res.colorResource import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.style.TextAlign diff --git a/wallee-c2ec/app/src/main/java/ch/bfh/habej2/wallee_c2ec/withdrawal/RegisterParametersScreen.kt b/wallee-c2ec/app/src/main/java/ch/bfh/habej2/wallee_c2ec/withdrawal/RegisterParametersScreen.kt @@ -91,7 +91,7 @@ fun RegisterParametersScreen( TalerButton( - text = "Exit", + text = "Stop", onClick = { model.withdrawalOperationFailed(activity) }) } } diff --git a/wallee-c2ec/app/src/main/java/ch/bfh/habej2/wallee_c2ec/withdrawal/TalerLogo.kt b/wallee-c2ec/app/src/main/java/ch/bfh/habej2/wallee_c2ec/withdrawal/TalerLogo.kt @@ -13,5 +13,5 @@ fun TalerLogo(paddingBottom: Dp =30.dp) = Image( painter = painterResource(id = R.drawable.gnutaler), contentDescription = "Taler logo", modifier = androidx.compose.ui.Modifier - .padding(start = 30.dp, end = 30.dp, top = 15.dp, bottom = paddingBottom) + .padding(start = 40.dp, end = 40.dp, top = 25.dp, bottom = paddingBottom) ) diff --git a/wallee-c2ec/app/src/main/res/values/strings.xml b/wallee-c2ec/app/src/main/res/values/strings.xml @@ -8,7 +8,7 @@ <string name="no_complete_reply">No valid transaction completion reply.</string> <string name="not_compatible">SDK is not compatible.</string> <string name="no_authorization">No authorization received.</string> - <string name="wallee_custom_text">Pay %s %s to top-up your Taler Wallet.</string> + <string name="wallee_custom_text">Pay %s %s to top-up your Taler Wallet by holding your card next to the terminal or by scanning the QR code below with your Twint app.</string> <string name="aborted">Withdrawal aborted</string> <string name="max_reties_exceeded">Maximal retries exceeded</string> <string name="timeout">Operation timed out. Please retry.</string>