Skip to content

Commit 4de5418

Browse files
compatible with Ladybug android studio now
1 parent 5ba81d3 commit 4de5418

File tree

10 files changed

+214
-136
lines changed

10 files changed

+214
-136
lines changed

app/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ android {
2020

2121
defaultConfig {
2222
applicationId "com.example.jetpack_compose_all_in_one"
23-
minSdk 26
23+
minSdk 29
2424
targetSdk 34
2525
versionCode 1
2626
versionName "1.0"

app/src/androidTest/java/com/example/jetpack_compose_all_in_one/lessons/lesson_18/ComposeUITestForListScreenTest.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ class ComposeUITestForListScreenTest{
1717
@get:Rule
1818
val composeRule = createComposeRule()
1919

20-
2120
@Test
2221
fun testList() {
2322
val stateList = mutableStateListOf<String>()

app/src/androidTest/java/com/example/jetpack_compose_all_in_one/ui/views/sign_in_sign_up/RegistrationKtTest.kt

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9,29 +9,29 @@ import androidx.compose.ui.test.performClick
99
import androidx.compose.ui.test.performTextClearance
1010
import androidx.compose.ui.test.performTextInput
1111
import androidx.test.ext.junit.runners.AndroidJUnit4
12-
import org.junit.Assert.*
12+
import org.junit.Assert.assertFalse
13+
import org.junit.Assert.assertTrue
1314
import org.junit.Before
1415
import org.junit.Rule
1516
import org.junit.Test
1617
import org.junit.runner.RunWith
1718

1819
@RunWith(AndroidJUnit4::class)
19-
class RegistrationKtTest{
20+
class RegistrationKtTest {
2021

2122
@get:Rule
2223
val composeTestRule = createComposeRule()
2324

2425
@Before
2526
fun setup() {
2627
composeTestRule.setContent {
27-
RegistrationForm{
28-
28+
RegistrationForm {
2929
}
3030
}
3131
}
3232

3333
@Test
34-
fun verifyAllViewExits(){
34+
fun verifyAllViewExits() {
3535
composeTestRule.apply {
3636
onNodeWithTag("Register").assertExists()
3737
onNodeWithText("Username").assertExists()
@@ -44,7 +44,7 @@ class RegistrationKtTest{
4444
}
4545

4646
@Test
47-
fun verifyEmailValidationWithValidEmail(){
47+
fun verifyEmailValidationWithValidEmail() {
4848
val validEmail = "abcd@gmail.com"
4949

5050
composeTestRule.onNodeWithText("Email").apply {
@@ -57,7 +57,7 @@ class RegistrationKtTest{
5757
}
5858

5959
@Test
60-
fun verifyEmailValidationWithInvalidEmail(){
60+
fun verifyEmailValidationWithInvalidEmail() {
6161
val invalidEmail = "invalidEmail"
6262
val errorMsg = "Input proper email id"
6363

@@ -71,7 +71,7 @@ class RegistrationKtTest{
7171
}
7272

7373
@Test
74-
fun verifyConfirmPasswordValidationWithValidPassword(){
74+
fun verifyConfirmPasswordValidationWithValidPassword() {
7575
val validConfirmPassword = ""
7676
val errorMsg = ""
7777

@@ -85,7 +85,7 @@ class RegistrationKtTest{
8585
}
8686

8787
@Test
88-
fun verifyConfirmPasswordValidationWithInvalidPassword(){
88+
fun verifyConfirmPasswordValidationWithInvalidPassword() {
8989
val validConfirmPassword = "password"
9090
val errorMsg = "Password is not matched"
9191

@@ -99,7 +99,7 @@ class RegistrationKtTest{
9999
}
100100

101101
@Test
102-
fun verifyButtonClick(){
102+
fun verifyButtonClick() {
103103
val userName = "user"
104104
val email = "abc@abc.com"
105105
val mobile = "123-456-789"

app/src/main/java/com/example/jetpack_compose_all_in_one/lessons/lesson_9/CounterDisplay.kt

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,10 @@ fun CounterDisplay() {
4848
text = counterText,
4949
style = TextStyle(
5050
fontSize = 36.sp,
51-
color = Color.White
51+
color = Color.Blue
5252
)
5353
)
54+
5455
OutlinedTextField(
5556
modifier = Modifier
5657
.fillMaxWidth()
@@ -64,12 +65,14 @@ fun CounterDisplay() {
6465
Text("Input")
6566
},
6667
textStyle = TextStyle(
67-
color = Color.White,
68+
color = Color.Blue,
6869
fontSize = 18.sp,
6970
textAlign = TextAlign.Start,
7071
),
7172
)
73+
7274
Spacer(modifier = Modifier.height(16.dp))
75+
7376
Button(
7477
onClick = {
7578
counterText = processInput(editedText)

app/src/main/java/com/example/jetpack_compose_all_in_one/third_party_lib/chat_gpt/view/ChatUI.kt

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,9 @@ import androidx.compose.ui.Modifier
2626
import androidx.compose.ui.draw.drawBehind
2727
import androidx.compose.ui.graphics.drawscope.Stroke
2828
import androidx.compose.ui.res.stringResource
29+
import androidx.compose.ui.tooling.preview.Preview
2930
import androidx.constraintlayout.compose.ConstraintLayout
31+
import androidx.lifecycle.viewmodel.compose.viewModel
3032
import com.example.jetpack_compose_all_in_one.R
3133
import com.example.jetpack_compose_all_in_one.third_party_lib.chat_gpt.remote.NetworkResult
3234
import com.example.jetpack_compose_all_in_one.third_party_lib.chat_gpt.viewmodel.ChatGPTViewModel
@@ -41,7 +43,12 @@ import com.example.jetpack_compose_all_in_one.ui.theme.dp_5
4143
import com.example.jetpack_compose_all_in_one.ui.views.chat.textBackgroundColor
4244
import com.example.openai_app.model.remote.responsemodel.ChatResponse
4345

44-
//Luan
46+
@Preview
47+
@Composable
48+
private fun ChatUIPrev() {
49+
ChatUI(chatGPTViewModel = viewModel())
50+
}
51+
4552
@Composable
4653
fun ChatUI(chatGPTViewModel: ChatGPTViewModel) {
4754
val result by chatGPTViewModel.result.observeAsState()

build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@ buildscript {
1010
classpath 'com.google.dagger:hilt-android-gradle-plugin:2.45'
1111
classpath 'com.google.gms:google-services:4.3.15'
1212
classpath "com.google.android.libraries.mapsplatform.secrets-gradle-plugin:secrets-gradle-plugin:2.0.1"
13-
classpath 'com.android.tools.build:gradle:8.1.0'
13+
classpath 'com.android.tools.build:gradle:8.7.1'
1414
classpath 'com.google.firebase:firebase-crashlytics-gradle:2.9.9'
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.1.1' apply false
19-
id 'com.android.library' version '8.1.1' apply false
18+
id 'com.android.application' version '8.7.1' apply false
19+
id 'com.android.library' version '8.7.1' apply false
2020
id 'org.jetbrains.kotlin.android' version '1.8.10' apply false
2121
id 'com.apollographql.apollo3' version '3.2.1' apply false
2222
}

gradle/wrapper/gradle-wrapper.jar

-15.4 KB
Binary file not shown.
Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
1-
#Tue Apr 11 20:11:17 IST 2023
1+
#Tue Oct 22 01:05:09 IST 2024
22
distributionBase=GRADLE_USER_HOME
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
43
distributionPath=wrapper/dists
5-
zipStorePath=wrapper/dists
4+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip
5+
networkTimeout=10000
6+
validateDistributionUrl=true
67
zipStoreBase=GRADLE_USER_HOME
8+
zipStorePath=wrapper/dists

0 commit comments

Comments
 (0)