Skip to content

Commit c202df2

Browse files
PX-1140 Release 3.1.0 (#15)
1 parent cf6167c commit c202df2

File tree

7 files changed

+16
-18
lines changed

7 files changed

+16
-18
lines changed

app/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,5 +71,5 @@ dependencies {
7171
implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:$json_serialization_version"
7272
implementation "com.jakewharton.retrofit:retrofit2-kotlinx-serialization-converter:$retrofit2_kotlinx_serialization"
7373

74-
implementation "com.truelayer.payments:ui:3.0.1"
74+
implementation "com.truelayer.payments:ui:3.1.0"
7575
}

app/src/main/java/com/truelayer/demo/MainActivity.kt

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,7 @@ import androidx.compose.foundation.layout.fillMaxWidth
1212
import androidx.compose.foundation.layout.padding
1313
import androidx.compose.foundation.lazy.LazyColumn
1414
import androidx.compose.foundation.lazy.items
15-
import androidx.compose.material3.Divider
16-
import androidx.compose.material3.ExperimentalMaterial3Api
15+
import androidx.compose.material3.HorizontalDivider
1716
import androidx.compose.material3.Scaffold
1817
import androidx.compose.material3.Text
1918
import androidx.compose.material3.TextField
@@ -44,7 +43,6 @@ import com.truelayer.payments.core.domain.configuration.Environment
4443
*/
4544
class MainActivity : AppCompatActivity() {
4645

47-
@OptIn(ExperimentalMaterial3Api::class)
4846
override fun onCreate(savedInstanceState: Bundle?) {
4947
super.onCreate(savedInstanceState)
5048

@@ -102,7 +100,7 @@ class MainActivity : AppCompatActivity() {
102100
TextWithDropdownMenu(
103101
modifier = Modifier.weight(1f),
104102
label = paymentType.name,
105-
dropdownItems = PaymentType.values().map { it.name to it },
103+
dropdownItems = PaymentType.entries.map { it.name to it },
106104
onClick = {
107105
paymentType = it
108106
PrefUtils.setPaymentType(it, this@MainActivity)
@@ -112,7 +110,7 @@ class MainActivity : AppCompatActivity() {
112110
TextWithDropdownMenu(
113111
modifier = Modifier.weight(1f),
114112
label = env.name,
115-
dropdownItems = Environment.values().map { it.name to it },
113+
dropdownItems = Environment.entries.map { it.name to it },
116114
onClick = {
117115
env = it
118116
PrefUtils.setEnvironment(it, this@MainActivity)
@@ -140,7 +138,10 @@ class MainActivity : AppCompatActivity() {
140138
}
141139
}
142140
)
143-
Divider(modifier = Modifier.padding(all = 4.dp), color = Color.Transparent)
141+
HorizontalDivider(
142+
modifier = Modifier.padding(all = 4.dp),
143+
color = Color.Transparent
144+
)
144145
}
145146
}
146147
}

app/src/main/java/com/truelayer/demo/integrations/ComposeIntegrationActivity.kt

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -64,10 +64,6 @@ class ComposeIntegrationActivity : AppCompatActivity() {
6464
primary = Primary,
6565
error = Secondary
6666
),
67-
darkPalette = DarkColorDefaults.copy(
68-
primary = PrimaryDark,
69-
error = Secondary
70-
),
7167
typography = TypographyDefaults
7268
)
7369

app/src/main/java/com/truelayer/demo/integrations/components/TextWithDropdownMenu.kt

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,9 @@ import androidx.compose.foundation.layout.Column
77
import androidx.compose.foundation.layout.defaultMinSize
88
import androidx.compose.foundation.layout.fillMaxSize
99
import androidx.compose.foundation.layout.padding
10-
import androidx.compose.material3.Divider
1110
import androidx.compose.material3.DropdownMenu
11+
import androidx.compose.material3.HorizontalDivider
12+
import androidx.compose.material3.MaterialTheme
1213
import androidx.compose.material3.Text
1314
import androidx.compose.material3.TextButton
1415
import androidx.compose.runtime.Composable
@@ -38,7 +39,7 @@ fun <T> TextWithDropdownMenu(
3839
border = BorderStroke(1.dp, Color.Gray),
3940
onClick = { dropdownExpanded = true }
4041
) {
41-
Text(text = label)
42+
Text(text = label, color = MaterialTheme.colorScheme.onSurface)
4243
DropdownMenu(
4344
expanded = dropdownExpanded,
4445
onDismissRequest = { dropdownExpanded = false },
@@ -61,7 +62,7 @@ fun <T> TextWithDropdownMenu(
6162
textAlign = TextAlign.Center
6263
)
6364
}
64-
Divider()
65+
HorizontalDivider()
6566
}
6667
}
6768
}

app/src/main/java/com/truelayer/demo/utils/PrefUtils.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ object PrefUtils {
2525
@JvmStatic
2626
fun getQuickstartUrl(context: Context): String {
2727
val sharedPreferences = context.getSharedPreferences("Settings", Context.MODE_PRIVATE)
28-
return sharedPreferences.getString("quickstartUrl", null) ?: ""
28+
return sharedPreferences.getString("quickstartUrl", null) ?: "http://"
2929
}
3030

3131
@JvmStatic

build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ buildscript {
1515
}
1616
}// Top-level build file where you can add configuration options common to all sub-projects/modules.
1717
plugins {
18-
id 'com.android.application' version '8.2.2' apply false
19-
id 'com.android.library' version '8.2.2' apply false
18+
id 'com.android.application' version '8.3.1' apply false
19+
id 'com.android.library' version '8.3.1' apply false
2020
id 'org.jetbrains.kotlin.android' version "$kotlin_version" apply false
2121
}
2222

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#Wed Jul 13 09:51:06 BST 2022
22
distributionBase=GRADLE_USER_HOME
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
44
distributionPath=wrapper/dists
55
zipStorePath=wrapper/dists
66
zipStoreBase=GRADLE_USER_HOME

0 commit comments

Comments
 (0)