Registration

app/build.gradle.kts

@@ -51,6 +51,7 @@ dependencies {
     implementation(libs.androidx.material3)
     implementation(libs.androidx.navigation.fragment.ktx)
     implementation(libs.androidx.navigation.ui.ktx)
+    implementation(libs.androidx.ui)
     implementation(libs.material)
     testImplementation(libs.junit)
     androidTestImplementation(platform(libs.androidx.compose.bom))

app/src/main/java/com/example/dattingapp/FriendProfile.kt

@@ -45,7 +45,7 @@ import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import com.example.dattingapp.ui.theme.AccentPurple
 import com.example.dattingapp.ui.theme.DattingAPPTheme
-import com.example.dattingapp.ui.theme.TextDark
+import com.example.dattingapp.ui.theme.textDark
 import com.example.dattingapp.ui.theme.BadgePink
 import java.nio.file.WatchEvent
 
@@ -147,13 +147,13 @@ fun FriendProfileScreen(
                     text = "Elena",
                     fontSize = 24.sp,
                     fontWeight = FontWeight.Bold,
-                    color = TextDark
+                    color = textDark
                 )
                 Text(
                     text = "24",
                     fontSize = 24.sp,
                     fontWeight = FontWeight.Bold,
-                    color = TextDark
+                    color = textDark
                 )
                 Surface(
                     shape = RoundedCornerShape(12.dp),

app/src/main/java/com/example/dattingapp/Login/IdVerification.kt

@@ -135,7 +135,7 @@ fun IdVerificationScreen(
                     Icon(
                         imageVector = Icons.Outlined.ArrowBack,
                         contentDescription = "Back",
-                        tint = TextDark,
+                        tint = textDark,
                         modifier = Modifier.size(18.dp)
                     )
                 }
@@ -186,7 +186,7 @@ fun IdVerificationScreen(
                     text = "ID Verification",
                     fontSize = 20.sp,
                     fontWeight = FontWeight.Bold,
-                    color = TextDark
+                    color = textDark
                 )
 
                 Spacer(modifier = Modifier.height(6.dp))
@@ -221,7 +221,7 @@ fun IdVerificationScreen(
                         Icon(
                             imageVector = Icons.Default.AddAPhoto,
                             contentDescription = "Upload",
-                            tint = TextDark,
+                            tint = textDark,
                             modifier = Modifier.size(32.dp)
                         )
                         Spacer(modifier = Modifier.height(8.dp))
@@ -229,7 +229,7 @@ fun IdVerificationScreen(
                             text = "Upload your ID",
                             fontSize = 16.sp,
                             fontWeight = FontWeight.Bold,
-                            color = TextDark
+                            color = textDark
                         )
                         Spacer(modifier = Modifier.height(4.dp))
                         Text(
@@ -346,7 +346,7 @@ private fun GuidelineItem(
         Text(
             text = text,
             fontSize = 11.sp,
-            color = TextDark,
+            color = textDark,
             lineHeight = 14.sp
         )
     }

app/src/main/java/com/example/dattingapp/Login/ui/theme/Color.kt

@@ -1,11 +0,0 @@
-package com.example.dattingapp.Login.ui.theme
-
-import androidx.compose.ui.graphics.Color
-
-val Purple80 = Color(0xFFD0BCFF)
-val PurpleGrey80 = Color(0xFFCCC2DC)
-val Pink80 = Color(0xFFEFB8C8)
-
-val Purple40 = Color(0xFF6650a4)
-val PurpleGrey40 = Color(0xFF625b71)
-val Pink40 = Color(0xFF7D5260)

app/src/main/java/com/example/dattingapp/Login/ui/theme/Theme.kt

@@ -1,58 +0,0 @@
-package com.example.dattingapp.Login.ui.theme
-
-import android.app.Activity
-import android.os.Build
-import androidx.compose.foundation.isSystemInDarkTheme
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.darkColorScheme
-import androidx.compose.material3.dynamicDarkColorScheme
-import androidx.compose.material3.dynamicLightColorScheme
-import androidx.compose.material3.lightColorScheme
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.platform.LocalContext
-
-private val DarkColorScheme = darkColorScheme(
-    primary = Purple80,
-    secondary = PurpleGrey80,
-    tertiary = Pink80
-)
-
-private val LightColorScheme = lightColorScheme(
-    primary = Purple40,
-    secondary = PurpleGrey40,
-    tertiary = Pink40
-
-    /* Other default colors to override
-    background = Color(0xFFFFFBFE),
-    surface = Color(0xFFFFFBFE),
-    onPrimary = Color.White,
-    onSecondary = Color.White,
-    onTertiary = Color.White,
-    onBackground = Color(0xFF1C1B1F),
-    onSurface = Color(0xFF1C1B1F),
-    */
-)
-
-@Composable
-fun DattingAPPTheme(
-    darkTheme: Boolean = isSystemInDarkTheme(),
-    // Dynamic color is available on Android 12+
-    dynamicColor: Boolean = true,
-    content: @Composable () -> Unit
-) {
-    val colorScheme = when {
-        dynamicColor && Build.VERSION.SDK_INT >= Build.VERSION_CODES.S -> {
-            val context = LocalContext.current
-            if (darkTheme) dynamicDarkColorScheme(context) else dynamicLightColorScheme(context)
-        }
-
-        darkTheme -> DarkColorScheme
-        else -> LightColorScheme
-    }
-
-    MaterialTheme(
-        colorScheme = colorScheme,
-        typography = Typography,
-        content = content
-    )
-}

app/src/main/java/com/example/dattingapp/Login/ui/theme/Type.kt

@@ -1,34 +0,0 @@
-package com.example.dattingapp.Login.ui.theme
-
-import androidx.compose.material3.Typography
-import androidx.compose.ui.text.TextStyle
-import androidx.compose.ui.text.font.FontFamily
-import androidx.compose.ui.text.font.FontWeight
-import androidx.compose.ui.unit.sp
-
-// Set of Material typography styles to start with
-val Typography = Typography(
-    bodyLarge = TextStyle(
-        fontFamily = FontFamily.Default,
-        fontWeight = FontWeight.Normal,
-        fontSize = 16.sp,
-        lineHeight = 24.sp,
-        letterSpacing = 0.5.sp
-    )
-    /* Other default text styles to override
-    titleLarge = TextStyle(
-        fontFamily = FontFamily.Default,
-        fontWeight = FontWeight.Normal,
-        fontSize = 22.sp,
-        lineHeight = 28.sp,
-        letterSpacing = 0.sp
-    ),
-    labelSmall = TextStyle(
-        fontFamily = FontFamily.Default,
-        fontWeight = FontWeight.Medium,
-        fontSize = 11.sp,
-        lineHeight = 16.sp,
-        letterSpacing = 0.5.sp
-    )
-    */
-)

app/src/main/java/com/example/dattingapp/MyProfile.kt

@@ -35,7 +35,7 @@ import androidx.compose.ui.unit.sp
 import com.example.dattingapp.ui.theme.BrandMagenta
 import com.example.dattingapp.ui.theme.BrandPurple
 import com.example.dattingapp.ui.theme.DattingAPPTheme
-import com.example.dattingapp.ui.theme.TextDark
+import com.example.dattingapp.ui.theme.textDark
 import com.example.dattingapp.ui.theme.TextMuted
 
 
@@ -832,7 +832,7 @@ private fun StatCard(
 
     modifier: Modifier = Modifier,
 
-    numberColor: Color = TextDark
+    numberColor: Color = textDark
 
 ) {
 

app/src/main/java/com/example/dattingapp/ui/theme/Color.kt

@@ -25,7 +25,6 @@ val BrandMagenta = Color(0xFFB5005A)
 val BackgroundLight = Color(0xFFFAFAFA)
 val CardBackground = Color(0xFFF2ECEF)
 val GuidelinesBackground = Color(0xFFFFFBFD)
-val TextDark = Color(0xFF1E1E1E)
 val TextMuted = Color(0xFF6E6E6E)
 val OverlayDark = Color(0x66000000)
  val BrandPink = Color(0xFFE91E63)
@@ -72,4 +71,9 @@ val PrimaryBlue = Color(0xFF0066FF)
 val LightBlueIconBg = Color(0xFF8CAEF8)
 val DarkText = Color(0xFF1E232A)
 val MutedText = Color(0xFF757575)
-
+val textDark = Color(0xFF1E1B18)
+val textPink = Color(0xFFE91E63)
+val PinkGradientStart = Color(0xFFE91E63)
+val PurpleGradientEnd = Color(0xFF8E24AA)
+val LightBorderColor = Color(0xFFFFD1DC)
+val InputBg = Color(0xFFF9FAFB)

gradle/libs.versions.toml

@@ -17,6 +17,7 @@ media3UiVersion = "1.5.1"
 navigationFragmentKtx = "2.6.0"
 navigationUiKtx = "2.6.0"
 material3 = "1.4.0"
+ui = "1.12.0"
 
 [libraries]
 androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "coreKtx" }
@@ -42,6 +43,7 @@ androidx-navigation-ui-ktx = { group = "androidx.navigation", name = "navigation
 androidx-material3 = { group = "androidx.compose.material3", name = "material3", version.ref = "material3" }
 media3-ui = { module = "androidx.media3:media3-ui", version.ref = "media3UiVersion" }
 media3-exoplayer = { module = "androidx.media3:media3-exoplayer", version.ref = "media3ExoplayerVersion" }
+androidx-ui = { group = "androidx.compose.ui", name = "ui", version.ref = "ui" }
 
 [plugins]
 android-application = { id = "com.android.application", version.ref = "agp" }