diff --git a/app/src/main/java/chat/revolt/screens/login/LoginScreen.kt b/app/src/main/java/chat/revolt/screens/login/LoginScreen.kt
index ebe969a6..c8f9b793 100644
--- a/app/src/main/java/chat/revolt/screens/login/LoginScreen.kt
+++ b/app/src/main/java/chat/revolt/screens/login/LoginScreen.kt
@@ -2,6 +2,7 @@ package chat.revolt.screens.login
import android.util.Log
import androidx.compose.foundation.Image
+import androidx.compose.foundation.clickable
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Row
@@ -212,7 +213,13 @@ fun LoginScreen(navController: NavController, viewModel: LoginViewModel = hiltVi
},
onClick = { navController.popBackStack() }
)
- Text(text = "Register")
+ Text(
+ modifier = Modifier.clickable {
+ navController.popBackStack()
+ navController.navigate("register/details")
+ },
+ text = "Register"
+ )
}
},
)
diff --git a/app/src/main/java/chat/revolt/screens/register/RegisterDetailsScreen.kt b/app/src/main/java/chat/revolt/screens/register/RegisterDetailsScreen.kt
index bd0ab8d0..4af3b24b 100644
--- a/app/src/main/java/chat/revolt/screens/register/RegisterDetailsScreen.kt
+++ b/app/src/main/java/chat/revolt/screens/register/RegisterDetailsScreen.kt
@@ -2,6 +2,7 @@ package chat.revolt.screens.register
import android.content.Context
import androidx.compose.foundation.Image
+import androidx.compose.foundation.clickable
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Row
@@ -129,7 +130,8 @@ fun RegisterDetailsScreen(
topBar = {
Column {
TopAppBar(
- modifier = Modifier.fillMaxWidth()
+ modifier = Modifier
+ .fillMaxWidth()
.padding(horizontal = 16.dp),
title = {},
actions = {
@@ -147,7 +149,13 @@ fun RegisterDetailsScreen(
},
onClick = { navController.popBackStack() }
)
- Text(text = stringResource(R.string.login))
+ Text(
+ modifier = Modifier.clickable {
+ navController.popBackStack()
+ navController.navigate("login/login")
+ },
+ text = stringResource(R.string.login)
+ )
}
},
)
@@ -168,7 +176,7 @@ fun RegisterDetailsScreen(
Image(
modifier = Modifier
.size(120.dp),
- painter = painterResource(R.drawable.login_charachter_img),
+ painter = painterResource(R.drawable.register_happy_img),
contentDescription = "Login character"
)
Spacer(modifier = Modifier.height(4.dp))
@@ -212,7 +220,9 @@ fun RegisterDetailsScreen(
label = stringResource(R.string.register_email),
type = KeyboardType.Email,
action = ImeAction.Next,
- modifier = Modifier.fillMaxWidth().semantics { contentType = ContentType.EmailAddress }
+ modifier = Modifier
+ .fillMaxWidth()
+ .semantics { contentType = ContentType.EmailAddress }
)
Spacer(modifier = Modifier.height(16.dp))
FormTextField(
@@ -221,7 +231,9 @@ fun RegisterDetailsScreen(
label = stringResource(R.string.register_password),
type = KeyboardType.Email,
action = ImeAction.Next,
- modifier = Modifier.fillMaxWidth().semantics { contentType = ContentType.EmailAddress }
+ modifier = Modifier
+ .fillMaxWidth()
+ .semantics { contentType = ContentType.EmailAddress }
)
Spacer(modifier = Modifier.height(32.dp))
diff --git a/app/src/main/res/drawable/register_happy_img.xml b/app/src/main/res/drawable/register_happy_img.xml
new file mode 100644
index 00000000..9c39d4ba
--- /dev/null
+++ b/app/src/main/res/drawable/register_happy_img.xml
@@ -0,0 +1,213 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/src/main/res/drawable/set_username_character_img.xml b/app/src/main/res/drawable/set_username_character_img.xml
new file mode 100644
index 00000000..3061118c
--- /dev/null
+++ b/app/src/main/res/drawable/set_username_character_img.xml
@@ -0,0 +1,165 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 9bc0ef07..755735af 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -16,8 +16,8 @@
Privacy Policy
Community Guidelines
- Find your community, connect with the world.
- Revolt is one of the best ways to stay connected with your friends and community, anywhere, anytime.
+ Welcome to PepChat!
+ Join endless chats and connections; PepChat is your place to vibe with friends!
Email
Password