yayan 5 月之前
父节点
当前提交
e39a894c63

+ 2 - 2
app/src/main/java/io/nexilis/alpha/MainActivity.kt

@@ -21,9 +21,9 @@ class MainActivity : ComponentActivity() {
             }
         }
         Api.connect(
+            this@MainActivity,
             "OneApp",
-            "38747683290F62E9667A018F490396EAE47BC16ADECD85B7E865C733E6DBD6A2",
-            this@MainActivity
+            "38747683290F62E9667A018F490396EAE47BC16ADECD85B7E865C733E6DBD6A2"
         )
     }
 

+ 17 - 23
app/src/main/java/io/nexilis/alpha/ui/main/Call.kt

@@ -30,12 +30,13 @@ import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
-import io.nexilis.service.ui.RemoteView
 
 @Composable
 fun CallLayoutScreen() {
-    Box(modifier = Modifier.fillMaxSize()) {
-        RemoteView(modifier = Modifier.fillMaxSize())
+    Box(modifier = Modifier
+        .fillMaxSize()
+        .background(Color(0xAA1E1E1E))
+    ) {
         Column(
             modifier = Modifier
                 .fillMaxSize()
@@ -44,13 +45,8 @@ fun CallLayoutScreen() {
             horizontalAlignment = Alignment.CenterHorizontally,
             verticalArrangement = Arrangement.SpaceBetween
         ) {
-            // Caller Info Section
             CallerInfoSection()
-
-            // Call Status Section
             CallStatusSection()
-
-            // Call Action Buttons Section
             CallActionButtonsSection()
         }
     }
@@ -62,16 +58,13 @@ fun CallerInfoSection() {
         horizontalAlignment = Alignment.CenterHorizontally,
         modifier = Modifier.padding(top = 50.dp)
     ) {
-        // Caller Avatar
         Image(
-            painter = rememberVectorPainter(Icons.Default.Person), // Replace with your drawable
+            painter = rememberVectorPainter(Icons.Default.Person),
             contentDescription = "Caller Avatar",
             modifier = Modifier
                 .size(120.dp)
                 .clip(CircleShape),
         )
-
-        // Caller Name
         Text(
             text = "John Doe",
             color = Color.White,
@@ -100,24 +93,25 @@ fun CallActionButtonsSection() {
             .fillMaxWidth()
             .padding(bottom = 50.dp)
     ) {
-        // Mute Button
         CallActionButton(
-            icon = Icons.Default.Mic, // Replace with your drawable
-            onClick = { /* Handle mute action */ },
+            icon = Icons.Default.Mic,
+            onClick = {
+
+            },
             backgroundColor = Color.Gray
         )
-
-        // Speaker Button
         CallActionButton(
-            icon = Icons.AutoMirrored.Filled.VolumeUp, // Replace with your drawable
-            onClick = { /* Handle speaker action */ },
+            icon = Icons.AutoMirrored.Filled.VolumeUp,
+            onClick = {
+
+            },
             backgroundColor = Color.Gray
         )
-
-        // End Call Button
         CallActionButton(
-            icon = Icons.Default.CallEnd, // Replace with your drawable
-            onClick = { /* Handle end call action */ },
+            icon = Icons.Default.CallEnd,
+            onClick = {
+
+            },
             backgroundColor = Color.Red
         )
     }

+ 12 - 0
cpaas-lite/build.gradle.kts

@@ -3,6 +3,7 @@ plugins {
     alias(libs.plugins.jetbrainsKotlinAndroid)
     alias(libs.plugins.googleDaggerHiltAndroid)
     alias(libs.plugins.googleDevtoolsKsp)
+    alias(libs.plugins.kotlinCompose)
 }
 
 android {
@@ -28,6 +29,13 @@ android {
     kotlinOptions {
         jvmTarget = "1.8"
     }
+    buildFeatures {
+        compose = true
+        buildConfig = true
+    }
+    composeOptions {
+        kotlinCompilerExtensionVersion = "1.5.13"
+    }
 }
 
 dependencies {
@@ -56,6 +64,10 @@ dependencies {
     implementation(libs.firebase.messaging)
 
     implementation(files("libs/annotation.jar"))
+
+    implementation(platform(libs.androidx.compose.bom))
+    implementation(libs.androidx.ui)
+
     testImplementation(libs.junit)
     androidTestImplementation(libs.androidx.junit)
     androidTestImplementation(libs.androidx.espresso.core)