git.iko.soy/parseable-android
on master help sign in
Display Parseable logo on LoginScreen and AboutScreen (#23)
382a6d7iko
app/src/main/java/com/parseable/android/ui/screens/about/AboutScreen.kt+7−5
compare with master
unifiedsplit
@@ -2,6 +2,7 @@ package com.parseable.android.ui.screens.about
2
2
3import android.content.Intent
3import android.content.Intent
4import android.net.Uri
4import android.net.Uri
5+import androidx.compose.foundation.Image
5import androidx.compose.foundation.layout.*
6import androidx.compose.foundation.layout.*
6import androidx.compose.foundation.rememberScrollState
7import androidx.compose.foundation.rememberScrollState
7import androidx.compose.foundation.verticalScroll
8import androidx.compose.foundation.verticalScroll
@@ -13,9 +14,11 @@ import androidx.compose.runtime.Composable
13import androidx.compose.ui.Alignment
14import androidx.compose.ui.Alignment
14import androidx.compose.ui.Modifier
15import androidx.compose.ui.Modifier
15import androidx.compose.ui.platform.LocalContext
16import androidx.compose.ui.platform.LocalContext
17+import androidx.compose.ui.res.painterResource
16import androidx.compose.ui.text.font.FontWeight
18import androidx.compose.ui.text.font.FontWeight
17import androidx.compose.ui.unit.dp
19import androidx.compose.ui.unit.dp
18import com.parseable.android.BuildConfig
20import com.parseable.android.BuildConfig
21+import com.parseable.android.R
19
22
20private const val GITHUB_REPO_URL = "https://github.com/parseablehq/parseable-android"
23private const val GITHUB_REPO_URL = "https://github.com/parseablehq/parseable-android"
21private const val PARSEABLE_WEBSITE_URL = "https://www.parseable.com"
24private const val PARSEABLE_WEBSITE_URL = "https://www.parseable.com"
@@ -58,11 +61,10 @@ fun AboutScreen(
58 .padding(24.dp),
61 .padding(24.dp),
59 horizontalAlignment = Alignment.CenterHorizontally,
62 horizontalAlignment = Alignment.CenterHorizontally,
60 ) {
63 ) {
61− Icon(
64+ Image(
62− Icons.Filled.Terminal,
65+ painter = painterResource(id = R.drawable.ic_launcher_foreground),
63− contentDescription = null,
66+ contentDescription = "Parseable logo",
64− modifier = Modifier.size(48.dp),
67+ modifier = Modifier.size(80.dp),
65− tint = MaterialTheme.colorScheme.primary,
66 )
68 )
67 Spacer(modifier = Modifier.height(12.dp))
69 Spacer(modifier = Modifier.height(12.dp))
68 Text(
70 Text(
app/src/main/java/com/parseable/android/ui/screens/login/LoginScreen.kt+9
@@ -1,5 +1,6 @@
1package com.parseable.android.ui.screens.login
1package com.parseable.android.ui.screens.login
2
2
3+import androidx.compose.foundation.Image
3import androidx.compose.foundation.layout.*
4import androidx.compose.foundation.layout.*
4import androidx.compose.foundation.rememberScrollState
5import androidx.compose.foundation.rememberScrollState
5import androidx.compose.foundation.text.KeyboardActions
6import androidx.compose.foundation.text.KeyboardActions
@@ -15,7 +16,9 @@ import androidx.compose.ui.Alignment
15import androidx.compose.ui.Modifier
16import androidx.compose.ui.Modifier
16import androidx.compose.ui.focus.FocusDirection
17import androidx.compose.ui.focus.FocusDirection
17import androidx.compose.ui.platform.LocalFocusManager
18import androidx.compose.ui.platform.LocalFocusManager
19+import androidx.compose.ui.res.painterResource
18import androidx.compose.ui.text.font.FontWeight
20import androidx.compose.ui.text.font.FontWeight
21+import com.parseable.android.R
19import com.parseable.android.ui.LocalErrorHandler
22import com.parseable.android.ui.LocalErrorHandler
20import androidx.compose.ui.text.input.ImeAction
23import androidx.compose.ui.text.input.ImeAction
21import androidx.compose.ui.text.input.KeyboardType
24import androidx.compose.ui.text.input.KeyboardType
@@ -59,6 +62,12 @@ fun LoginScreen(
59 horizontalAlignment = Alignment.CenterHorizontally,
62 horizontalAlignment = Alignment.CenterHorizontally,
60 verticalArrangement = Arrangement.Center,
63 verticalArrangement = Arrangement.Center,
61 ) {
64 ) {
65+ Image(
66+ painter = painterResource(id = R.drawable.ic_launcher_foreground),
67+ contentDescription = "Parseable logo",
68+ modifier = Modifier.size(120.dp),
69+ )
70+
62 Text(
71 Text(
63 text = "Parseable",
72 text = "Parseable",
64 style = MaterialTheme.typography.headlineLarge,
73 style = MaterialTheme.typography.headlineLarge,