diff --git a/app/build.gradle b/app/build.gradle deleted file mode 100644 index f00551d..0000000 --- a/app/build.gradle +++ /dev/null @@ -1,72 +0,0 @@ -plugins { - id 'com.android.application' - id 'kotlin-android' - id 'androidx.navigation.safeargs.kotlin' -} - - -android { - compileSdkVersion 30 - buildToolsVersion "30.0.2" - - defaultConfig { - applicationId "com.mindorks.sample.whatsapp" - minSdkVersion 21 - targetSdkVersion 30 - versionCode 1 - versionName "1.0" - - testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" - } - - buildTypes { - release { - minifyEnabled false - proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' - } - } - compileOptions { - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 - } - kotlinOptions { - jvmTarget = '1.8' - useIR = true - } - buildFeatures { - compose true - } - composeOptions { - kotlinCompilerExtensionVersion compose_version - kotlinCompilerVersion '1.4.0' - } -} - -dependencies { - implementation 'androidx.legacy:legacy-support-v4:1.0.0' - def nav_version = "2.3.0" - - implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" - implementation 'androidx.core:core-ktx:1.3.1' - implementation 'androidx.appcompat:appcompat:1.2.0' - implementation 'com.google.android.material:material:1.2.0' - implementation "androidx.compose.ui:ui:$compose_version" - implementation "androidx.compose.material:material:$compose_version" - implementation "androidx.ui:ui-tooling:$compose_version" - implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.3.0-alpha06' - testImplementation 'junit:junit:4.+' - implementation "androidx.compose.runtime:runtime-livedata:$compose_version" - - androidTestImplementation 'androidx.test.ext:junit:1.1.2' - androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0' - implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.9' - implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0' - implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.2.0' - implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.3.0-alpha07' - implementation "androidx.fragment:fragment-ktx:1.2.5" - implementation "androidx.navigation:navigation-fragment-ktx:2.3.0" - implementation "androidx.navigation:navigation-ui-ktx:2.3.0" - - implementation 'com.github.bumptech.glide:glide:4.11.0' - -} \ No newline at end of file diff --git a/app/build.gradle.kts b/app/build.gradle.kts new file mode 100644 index 0000000..773d8c8 --- /dev/null +++ b/app/build.gradle.kts @@ -0,0 +1,74 @@ +plugins { + id("com.android.application") + id("org.jetbrains.kotlin.android") + id("androidx.navigation.safeargs") +} + + +android { + namespace = "com.mindorks.sample.whatsapp" + compileSdk = 34 + + defaultConfig { + applicationId = "com.mindorks.sample.whatsapp" + minSdk = 24 + targetSdk = 30 + versionCode = 1 + versionName = "1.0" + + testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" + } + + buildTypes { + release { + isMinifyEnabled = false + proguardFiles( + getDefaultProguardFile("proguard-android-optimize.txt"), + "proguard-rules.pro" + ) + } + } + compileOptions { + sourceCompatibility = JavaVersion.VERSION_1_8 + targetCompatibility = JavaVersion.VERSION_1_8 + } + kotlinOptions { + jvmTarget = "1.8" + } + buildFeatures { + compose = true + } + composeOptions { + kotlinCompilerExtensionVersion = "1.5.14" + } +} + +dependencies { + implementation(libs.androidx.legacy.support.v4) + + implementation(libs.androidx.core.ktx) + implementation(libs.androidx.lifecycle.runtime.ktx) + implementation(libs.androidx.lifecycle.viewmodel) + implementation(libs.androidx.lifecycle.livedata) + implementation(libs.androidx.activity.compose) + implementation(libs.androidx.fragment.ktx) + implementation(platform(libs.androidx.compose.bom)) + implementation(libs.androidx.ui) + implementation(libs.androidx.ui.graphics) + implementation(libs.androidx.ui.tooling.preview) + implementation(libs.androidx.material3) + implementation(libs.glide) + implementation(libs.androidx.navigation.fragment.ktx) + implementation(libs.androidx.navigation.ui.ktx) + implementation(libs.androidx.runtime.livedata) + testImplementation(libs.junit) + androidTestImplementation(libs.androidx.junit) + androidTestImplementation(libs.androidx.espresso.core) + androidTestImplementation(platform(libs.androidx.compose.bom)) + androidTestImplementation(libs.androidx.ui.test.junit4) + debugImplementation(libs.androidx.ui.tooling) + debugImplementation(libs.androidx.ui.test.manifest) + + //Loading images by url + implementation(libs.coil.compose) +} \ No newline at end of file diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro index 481bb43..ff59496 100644 --- a/app/proguard-rules.pro +++ b/app/proguard-rules.pro @@ -1,6 +1,6 @@ # Add project specific ProGuard rules here. # You can control the set of applied configuration files using the -# proguardFiles setting in build.gradle. +# proguardFiles setting in build.gradle.kts. # # For more details, see # http://developer.android.com/guide/developing/tools/proguard.html diff --git a/app/src/main/java/com/mindorks/sample/whatsapp/data/local/Faker.kt b/app/src/main/java/com/mindorks/sample/whatsapp/data/local/Faker.kt index b880bed..683deec 100644 --- a/app/src/main/java/com/mindorks/sample/whatsapp/data/local/Faker.kt +++ b/app/src/main/java/com/mindorks/sample/whatsapp/data/local/Faker.kt @@ -1,5 +1,6 @@ package com.mindorks.sample.whatsapp.data.local + import com.mindorks.sample.whatsapp.R import com.mindorks.sample.whatsapp.data.model.Call import com.mindorks.sample.whatsapp.data.model.Chat diff --git a/app/src/main/java/com/mindorks/sample/whatsapp/screen/chat/ChatFragment.kt b/app/src/main/java/com/mindorks/sample/whatsapp/screen/chat/ChatFragment.kt index 42dc490..69e1fd2 100644 --- a/app/src/main/java/com/mindorks/sample/whatsapp/screen/chat/ChatFragment.kt +++ b/app/src/main/java/com/mindorks/sample/whatsapp/screen/chat/ChatFragment.kt @@ -4,7 +4,6 @@ import android.os.Bundle import android.view.LayoutInflater import android.view.View import android.view.ViewGroup -import androidx.compose.foundation.ExperimentalFoundationApi import androidx.compose.ui.platform.ComposeView import androidx.fragment.app.Fragment import com.mindorks.sample.whatsapp.data.local.addChat @@ -12,14 +11,13 @@ import com.mindorks.sample.whatsapp.data.model.User import com.mindorks.sample.whatsapp.screen.chat.ui.ChatScreenView import com.mindorks.sample.whatsapp.ui.WhatsAppTheme -@ExperimentalFoundationApi -class ChatFragment : Fragment() { +class ChatFragment : Fragment() { override fun onCreateView( inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle? - ): View? { + ): View { val userName = arguments?.getString("userName") ?: "" val userImage = arguments?.getString("userImage") ?: "" diff --git a/app/src/main/java/com/mindorks/sample/whatsapp/screen/chat/ui/ChatScreenView.kt b/app/src/main/java/com/mindorks/sample/whatsapp/screen/chat/ui/ChatScreenView.kt index 98f6d75..e9861e7 100644 --- a/app/src/main/java/com/mindorks/sample/whatsapp/screen/chat/ui/ChatScreenView.kt +++ b/app/src/main/java/com/mindorks/sample/whatsapp/screen/chat/ui/ChatScreenView.kt @@ -1,21 +1,22 @@ package com.mindorks.sample.whatsapp.screen.chat.ui -import androidx.compose.foundation.ExperimentalFoundationApi -import androidx.compose.material.Scaffold +import androidx.compose.foundation.layout.padding +import androidx.compose.material3.Scaffold import androidx.compose.runtime.Composable +import androidx.compose.ui.Modifier import com.mindorks.sample.whatsapp.data.local.chat import com.mindorks.sample.whatsapp.data.model.User -@ExperimentalFoundationApi + @Composable fun ChatScreenView(user: User, onBackIconClick: () -> Unit, onMessageSend: (String) -> Unit) { Scaffold( - bottomBar = { EditText(onMessageSend) }, + bottomBar = { ChatTextField(onMessageSend) }, topBar = { ChatTopBar(user, onBackIconClick) }, - bodyContent = { - ChatsScrollView(chat.toList()) - } + content = { + ChatsScrollView(modifier = Modifier.padding(it), chat.toList()) + }, ) } \ No newline at end of file diff --git a/app/src/main/java/com/mindorks/sample/whatsapp/screen/chat/ui/ChatTextField.kt b/app/src/main/java/com/mindorks/sample/whatsapp/screen/chat/ui/ChatTextField.kt new file mode 100644 index 0000000..c86c04c --- /dev/null +++ b/app/src/main/java/com/mindorks/sample/whatsapp/screen/chat/ui/ChatTextField.kt @@ -0,0 +1,96 @@ +package com.mindorks.sample.whatsapp.screen.chat.ui + + +import androidx.compose.foundation.background +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.Spacer +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.size +import androidx.compose.foundation.layout.width +import androidx.compose.foundation.rememberScrollState +import androidx.compose.foundation.shape.CircleShape +import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.material3.Icon +import androidx.compose.material3.IconButton +import androidx.compose.material3.Text +import androidx.compose.material3.TextField +import androidx.compose.material3.TextFieldDefaults +import androidx.compose.runtime.Composable +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.rememberCoroutineScope +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.draw.clip +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.res.painterResource +import androidx.compose.ui.text.input.TextFieldValue +import androidx.compose.ui.tooling.preview.Preview +import androidx.compose.ui.unit.dp +import com.mindorks.sample.whatsapp.R +import com.mindorks.sample.whatsapp.ui.BrightGreen +import com.mindorks.sample.whatsapp.ui.DarkestGreen +import com.mindorks.sample.whatsapp.ui.Gray +import com.mindorks.sample.whatsapp.ui.White +import kotlinx.coroutines.launch + + +@Composable +fun ChatTextField(onMessageSend: (String) -> Unit) { + val textState = remember { mutableStateOf(TextFieldValue()) } + val scrollState = rememberScrollState() + val scope = rememberCoroutineScope() + + Row( + modifier = Modifier + .background(DarkestGreen) + .fillMaxWidth() + .padding(4.dp), + verticalAlignment = Alignment.CenterVertically, + ) { + TextField( + value = textState.value, + modifier = Modifier + .clip(RoundedCornerShape(32.dp)) + .weight(1f), + onValueChange = { + textState.value = it + }, + placeholder = { + Text(text = "Message", color = Gray) + }, + colors = TextFieldDefaults.colors( + unfocusedContainerColor = White, + focusedIndicatorColor = Color.Transparent + ) + ) + + Spacer(modifier = Modifier.width(4.dp)) + + IconButton( + modifier = Modifier + .clip(CircleShape) + .background(BrightGreen), + onClick = { + onMessageSend(textState.value.text) + scope.launch { + scrollState.animateScrollTo(0) + } + }, + ) { + Icon( + modifier = Modifier.size(24.dp), + painter = painterResource(id = R.drawable.ic_send), + tint = White, + contentDescription = null + ) + } + } +} + +@Preview +@Composable +private fun ChatTextFieldPreview() { + ChatTextField() {} +} \ No newline at end of file diff --git a/app/src/main/java/com/mindorks/sample/whatsapp/screen/chat/ui/ChatTopAppBar.kt b/app/src/main/java/com/mindorks/sample/whatsapp/screen/chat/ui/ChatTopAppBar.kt index 0cddc17..710a3ae 100644 --- a/app/src/main/java/com/mindorks/sample/whatsapp/screen/chat/ui/ChatTopAppBar.kt +++ b/app/src/main/java/com/mindorks/sample/whatsapp/screen/chat/ui/ChatTopAppBar.kt @@ -1,56 +1,62 @@ package com.mindorks.sample.whatsapp.screen.chat.ui -import androidx.compose.foundation.Box -import androidx.compose.foundation.Icon -import androidx.compose.foundation.Text -import androidx.compose.foundation.layout.Column + import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.size -import androidx.compose.foundation.shape.CircleShape -import androidx.compose.material.IconButton -import androidx.compose.material.TopAppBar +import androidx.compose.material3.ExperimentalMaterial3Api +import androidx.compose.material3.Icon +import androidx.compose.material3.IconButton +import androidx.compose.material3.Text +import androidx.compose.material3.TopAppBar +import androidx.compose.material3.TopAppBarColors import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.Color -import androidx.compose.ui.res.vectorResource +import androidx.compose.ui.res.painterResource import androidx.compose.ui.text.TextStyle import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import com.mindorks.sample.whatsapp.R import com.mindorks.sample.whatsapp.data.model.User -import com.mindorks.sample.whatsapp.util.ImageLoader -import com.mindorks.sample.whatsapp.util.colorTopBar +import com.mindorks.sample.whatsapp.ui.DarkGreen +import com.mindorks.sample.whatsapp.ui.White +@OptIn(ExperimentalMaterial3Api::class) @Composable fun ChatTopBar(user: User, onBackIconClick: () -> Unit) { - - Column { - TopAppBar( - backgroundColor = colorTopBar(), - navigationIcon = { - IconButton(onClick = { - onBackIconClick() - }) { - Icon( - vectorResource(id = R.drawable.ic_arrow_back), - modifier = Modifier.padding(start = 8.dp), - tint = Color.White - ) - } - }, - actions = { - Box(shape = CircleShape, modifier = Modifier.size(40.dp)) { - ImageLoader(user.imageUrl) - } - }, - title = { - Text( - text = user.name, - color = Color.White, - style = TextStyle(fontSize = 18.sp, textAlign = TextAlign.Center) + TopAppBar( + navigationIcon = { + IconButton(onClick = { + onBackIconClick() + }) { + Icon( + painter = painterResource(id = R.drawable.ic_arrow_back), + contentDescription = null, + modifier = Modifier.padding(start = 8.dp), + tint = Color.White ) } + }, + actions = { + CircularCoilImage( + modifier = Modifier.size(40.dp), + user.imageUrl + ) + }, + title = { + Text( + text = user.name, + color = White, + style = TextStyle(fontSize = 18.sp, textAlign = TextAlign.Center) + ) + }, + colors = TopAppBarColors( + containerColor = DarkGreen, + scrolledContainerColor = DarkGreen, + navigationIconContentColor = Color.Gray, + titleContentColor = Color.White, + actionIconContentColor = Color.White ) - } + ) } \ No newline at end of file diff --git a/app/src/main/java/com/mindorks/sample/whatsapp/screen/chat/ui/ChatsScrollView.kt b/app/src/main/java/com/mindorks/sample/whatsapp/screen/chat/ui/ChatsScrollView.kt index 7769cf7..a486392 100644 --- a/app/src/main/java/com/mindorks/sample/whatsapp/screen/chat/ui/ChatsScrollView.kt +++ b/app/src/main/java/com/mindorks/sample/whatsapp/screen/chat/ui/ChatsScrollView.kt @@ -1,79 +1,96 @@ package com.mindorks.sample.whatsapp.screen.chat.ui -import androidx.compose.foundation.Box -import androidx.compose.foundation.Text + import androidx.compose.foundation.background import androidx.compose.foundation.layout.* -import androidx.compose.foundation.lazy.LazyColumnFor +import androidx.compose.foundation.lazy.LazyColumn +import androidx.compose.foundation.lazy.items import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier +import androidx.compose.ui.draw.clip import androidx.compose.ui.graphics.Color import androidx.compose.ui.text.TextStyle import androidx.compose.ui.text.style.TextOverflow +import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import com.mindorks.sample.whatsapp.data.model.Conversation -import com.mindorks.sample.whatsapp.util.colorLightGreen +import com.mindorks.sample.whatsapp.data.model.User +import com.mindorks.sample.whatsapp.ui.DarkGray +import com.mindorks.sample.whatsapp.ui.DarkestGreen +import com.mindorks.sample.whatsapp.ui.Green +import com.mindorks.sample.whatsapp.ui.White @Composable -fun ChatsScrollView(chat: List) { - LazyColumnFor( - chat, - modifier = Modifier.fillMaxHeight().background(color = colorLightGreen()).padding(10.dp) - .padding(bottom = 40.dp) +fun ChatsScrollView(modifier: Modifier = Modifier, chat: List) { + LazyColumn( + modifier = modifier + .fillMaxHeight() + .background(color = DarkestGreen) + .padding(horizontal = 16.dp) + .padding(top = 8.dp) ) { - if (it.id == 2) { - setupReceipientChat(it) - } else { - setupMyChat(it) - } - Spacer(modifier = Modifier.padding(8.dp)) - } -} - -@Composable -fun setupMyChat(chat: Conversation) { - Box( - backgroundColor = Color(38, 82, 72), - modifier = Modifier.fillMaxWidth() + Modifier.padding(80.dp, end = 10.dp), - shape = RoundedCornerShape(8.dp) - ) { - Row(modifier = Modifier.padding(all = 10.dp)) { - Column(modifier = Modifier.weight(3.0f, true)) { - Text( - text = chat.chat, - style = TextStyle( - fontSize = 16.sp, - color = Color.White - ), - maxLines = 1, - overflow = TextOverflow.Ellipsis + items(chat) { + if (it.id == 2) { + Message( + text = it.chat, + isRightAligned = true, + color = Green + ) + } else { + Message( + text = it.chat, + isRightAligned = false, + color = DarkGray ) } + Spacer(modifier = Modifier.padding(8.dp)) } } } @Composable -fun setupReceipientChat(chat: Conversation) { - Box( - backgroundColor = Color(62, 61, 64), - modifier = Modifier.fillMaxWidth() + Modifier.padding(10.dp, end = 80.dp), - shape = RoundedCornerShape(8.dp) +fun Message(text: String, isRightAligned: Boolean, color: Color) { + Row( + Modifier.fillMaxWidth() ) { - Row(modifier = Modifier.padding(10.dp)) { - Column(modifier = Modifier.weight(3.0f, true)) { - Text( - text = chat.chat, - style = TextStyle( - fontSize = 16.sp, - color = Color.White - ), - maxLines = 1, - overflow = TextOverflow.Ellipsis - ) - } + val spacersWeight = 0.2f + + if (isRightAligned) { + Spacer(modifier = Modifier.weight(spacersWeight)) + } + + Box( + modifier = Modifier + .weight(1f) + .clip(RoundedCornerShape(8.dp)) + .background(color) + ) { + Text( + modifier = Modifier.padding(8.dp), + text = text, + style = TextStyle( + fontSize = 16.sp, + color = White + ), + maxLines = 1, + overflow = TextOverflow.Ellipsis + ) + } + + if (!isRightAligned) { + Spacer(modifier = Modifier.weight(spacersWeight)) } } } + +@Preview +@Composable +private fun ChatScreenPreview() { + ChatScreenView( + user = User(id = 0, name = "name", imageUrl = ""), + onBackIconClick = {} + ) {} +} \ No newline at end of file diff --git a/app/src/main/java/com/mindorks/sample/whatsapp/screen/chat/ui/CircularCoilImage.kt b/app/src/main/java/com/mindorks/sample/whatsapp/screen/chat/ui/CircularCoilImage.kt new file mode 100644 index 0000000..127fa7d --- /dev/null +++ b/app/src/main/java/com/mindorks/sample/whatsapp/screen/chat/ui/CircularCoilImage.kt @@ -0,0 +1,26 @@ +package com.mindorks.sample.whatsapp.screen.chat.ui + +import androidx.compose.foundation.Image +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.shape.CircleShape +import androidx.compose.runtime.Composable +import androidx.compose.ui.Modifier +import androidx.compose.ui.draw.clip +import androidx.compose.ui.layout.ContentScale +import coil.annotation.ExperimentalCoilApi +import coil.compose.rememberImagePainter + +@OptIn(ExperimentalCoilApi::class) +@Composable +fun CircularCoilImage(modifier: Modifier = Modifier, url: String) { + Box( + modifier = modifier + .clip(CircleShape) + ) { + Image( + painter = rememberImagePainter(url), + contentScale = ContentScale.Crop, + contentDescription = null, + ) + } +} \ No newline at end of file diff --git a/app/src/main/java/com/mindorks/sample/whatsapp/screen/chat/ui/Divider.kt b/app/src/main/java/com/mindorks/sample/whatsapp/screen/chat/ui/Divider.kt new file mode 100644 index 0000000..38efc39 --- /dev/null +++ b/app/src/main/java/com/mindorks/sample/whatsapp/screen/chat/ui/Divider.kt @@ -0,0 +1,15 @@ +package com.mindorks.sample.whatsapp.screen.chat.ui + +import androidx.compose.material3.HorizontalDivider +import androidx.compose.runtime.Composable +import androidx.compose.ui.Modifier +import androidx.compose.ui.unit.dp +import com.mindorks.sample.whatsapp.ui.DarkerGreen + +@Composable +fun Divider(modifier: Modifier = Modifier) { + HorizontalDivider( + thickness = 1.dp, + color = DarkerGreen + ) +} \ No newline at end of file diff --git a/app/src/main/java/com/mindorks/sample/whatsapp/screen/chat/ui/EditText.kt b/app/src/main/java/com/mindorks/sample/whatsapp/screen/chat/ui/EditText.kt deleted file mode 100644 index 55196c0..0000000 --- a/app/src/main/java/com/mindorks/sample/whatsapp/screen/chat/ui/EditText.kt +++ /dev/null @@ -1,45 +0,0 @@ -package com.mindorks.sample.whatsapp.screen.chat.ui - -import androidx.compose.foundation.BaseTextField -import androidx.compose.foundation.Box -import androidx.compose.foundation.ExperimentalFoundationApi -import androidx.compose.foundation.layout.* -import androidx.compose.foundation.rememberScrollState -import androidx.compose.runtime.Composable -import androidx.compose.runtime.mutableStateOf -import androidx.compose.runtime.remember -import androidx.compose.ui.Modifier -import androidx.compose.ui.text.input.TextFieldValue -import androidx.compose.ui.unit.dp -import com.mindorks.sample.whatsapp.R -import com.mindorks.sample.whatsapp.util.ImageLoader -import com.mindorks.sample.whatsapp.util.colorTopBar - -@ExperimentalFoundationApi -@Composable -fun EditText(onMessageSend: (String) -> Unit) { - - val textState = remember { mutableStateOf(TextFieldValue()) } - val scrollState = rememberScrollState() - - Box(backgroundColor = colorTopBar()) { - Row(modifier = Modifier.padding(16.dp).fillMaxWidth()) { - BaseTextField( - value = textState.value, - modifier = Modifier.weight(1f, true), - onValueChange = { - textState.value = it - }) - Spacer(modifier = Modifier.preferredSize(12.dp)) - - ImageLoader( - imageUrl = R.drawable.ic_send, - modifier = Modifier.weight(0.05f, true), - onClick = { - - onMessageSend(textState.value.text) - scrollState.smoothScrollTo(0f) - }) - } - } -} \ No newline at end of file diff --git a/app/src/main/java/com/mindorks/sample/whatsapp/screen/main/MainFragment.kt b/app/src/main/java/com/mindorks/sample/whatsapp/screen/main/MainFragment.kt index 5d106a9..845a42e 100644 --- a/app/src/main/java/com/mindorks/sample/whatsapp/screen/main/MainFragment.kt +++ b/app/src/main/java/com/mindorks/sample/whatsapp/screen/main/MainFragment.kt @@ -4,16 +4,17 @@ import android.os.Bundle import android.view.LayoutInflater import android.view.View import android.view.ViewGroup -import androidx.compose.foundation.Text import androidx.compose.foundation.layout.Column -import androidx.compose.material.Surface -import androidx.compose.material.TopAppBar +import androidx.compose.material3.ExperimentalMaterial3Api +import androidx.compose.material3.Surface +import androidx.compose.material3.Text +import androidx.compose.material3.TopAppBar +import androidx.compose.material3.TopAppBarColors import androidx.compose.runtime.Composable import androidx.compose.runtime.State import androidx.compose.runtime.livedata.observeAsState import androidx.compose.ui.graphics.Color import androidx.compose.ui.platform.ComposeView -import androidx.compose.ui.unit.dp import androidx.fragment.app.Fragment import androidx.fragment.app.viewModels import androidx.navigation.fragment.findNavController @@ -25,7 +26,8 @@ import com.mindorks.sample.whatsapp.screen.main.view.call.CallsView import com.mindorks.sample.whatsapp.screen.main.view.chats.ChatsView import com.mindorks.sample.whatsapp.screen.main.view.status.StatusView import com.mindorks.sample.whatsapp.ui.WhatsAppTheme -import com.mindorks.sample.whatsapp.util.colorTopBar +import com.mindorks.sample.whatsapp.ui.DarkGreen +import com.mindorks.sample.whatsapp.ui.White class MainFragment : Fragment() { @@ -35,12 +37,11 @@ class MainFragment : Fragment() { inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle? - ): View? { + ): View { return ComposeView(requireContext()).apply { - setContent { WhatsAppTheme { - onScreenSelected { + NavHost { viewModel.navigateTo(it) } } @@ -48,33 +49,39 @@ class MainFragment : Fragment() { } } + @OptIn(ExperimentalMaterial3Api::class) @Composable - private fun onScreenSelected(onNavigate: (ScreenState.Screen) -> Unit) { - + private fun NavHost(onNavigate: (ScreenState.Screen) -> Unit) { val screenState: State = viewModel.screenState.observeAsState(viewModel.screenState.value) Column { TopAppBar( - title = { Text(getString(R.string.whatsapp), color = Color.White) }, - backgroundColor = colorTopBar(), - elevation = 0.dp + title = { Text(getString(R.string.whatsapp), color = White) }, + colors = TopAppBarColors( + containerColor = DarkGreen, + scrolledContainerColor = DarkGreen, + navigationIconContentColor = Color.Gray, + titleContentColor = Color.White, + actionIconContentColor = Color.White + ) ) + screenState.value?.let { TabsPanel(it, onNavigate) } + Surface { when (screenState.value?.state) { - ScreenState.Screen.CALLS -> CallsView() - ScreenState.Screen.CHATS -> ChatsView { + ScreenState.Screen.CHATS -> ChatsView() { val action = MainFragmentDirections.actionMainFragmentToChatFragment( it.name, it.imageUrl ) findNavController().navigate(action) } - ScreenState.Screen.STATUS -> StatusView() + else -> {} } } } diff --git a/app/src/main/java/com/mindorks/sample/whatsapp/screen/main/view/MainTabs.kt b/app/src/main/java/com/mindorks/sample/whatsapp/screen/main/view/MainTabs.kt index fa98363..2ba8d2d 100644 --- a/app/src/main/java/com/mindorks/sample/whatsapp/screen/main/view/MainTabs.kt +++ b/app/src/main/java/com/mindorks/sample/whatsapp/screen/main/view/MainTabs.kt @@ -1,22 +1,25 @@ package com.mindorks.sample.whatsapp.screen.main.view -import androidx.compose.foundation.Text -import androidx.compose.material.Tab -import androidx.compose.material.TabRow + +import androidx.compose.material3.Tab +import androidx.compose.material3.TabRow +import androidx.compose.material3.Text import androidx.compose.runtime.Composable -import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.mutableIntStateOf import androidx.compose.runtime.remember import androidx.compose.ui.graphics.Color -import com.mindorks.sample.whatsapp.util.colorTopBar +import com.mindorks.sample.whatsapp.ui.BrightGreen +import com.mindorks.sample.whatsapp.ui.DarkGreen +import com.mindorks.sample.whatsapp.ui.Gray data class ScreenState(var state: Screen = Screen.CALLS) { enum class Screen( val title: String = "Tab" ) { - CALLS(title = "Calls"), + STATUS(title = "Status"), CHATS(title = "Chats"), - STATUS(title = "Status") + CALLS(title = "Calls"), } } @@ -25,28 +28,34 @@ fun TabsPanel( screenState: ScreenState, onNavigate: (ScreenState.Screen) -> Unit, ) { - val (selectedTab, setSelectedTab) = remember { - mutableStateOf( - ScreenState.Screen.values().indexOf(screenState.state) + val (selectedTabIndex, setSelectedTab) = remember { + mutableIntStateOf( + ScreenState.Screen.entries.indexOf(screenState.state) ) } - val tabs = ScreenState.Screen.values() + val tabs = ScreenState.Screen.entries TabRow( - selectedTabIndex = selectedTab, - backgroundColor = colorTopBar(), + containerColor = DarkGreen, + selectedTabIndex = selectedTabIndex, tabs = { tabs.forEachIndexed { index, tab -> Tab( - text = { Text(text = tab.title.toUpperCase(), color = Color.White) }, - selected = index == selectedTab, + text = { + Text( + text = tab.title.uppercase(), + color = if (index == selectedTabIndex) BrightGreen else Gray + ) + }, + selected = index == selectedTabIndex, onClick = { setSelectedTab(index) onNavigate(tab) } ) } - } + }, + divider = {} ) -} \ No newline at end of file +} diff --git a/app/src/main/java/com/mindorks/sample/whatsapp/screen/main/view/call/CallItemView.kt b/app/src/main/java/com/mindorks/sample/whatsapp/screen/main/view/call/CallItemView.kt index 7254fba..8e59e86 100644 --- a/app/src/main/java/com/mindorks/sample/whatsapp/screen/main/view/call/CallItemView.kt +++ b/app/src/main/java/com/mindorks/sample/whatsapp/screen/main/view/call/CallItemView.kt @@ -1,49 +1,81 @@ package com.mindorks.sample.whatsapp.screen.main.view.call -import androidx.compose.foundation.Box -import androidx.compose.foundation.ContentGravity -import androidx.compose.foundation.Text +import androidx.compose.foundation.Image import androidx.compose.foundation.layout.* -import androidx.compose.foundation.shape.CircleShape +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.filled.Call +import androidx.compose.material3.Icon +import androidx.compose.material3.Text import androidx.compose.runtime.Composable -import androidx.compose.ui.Alignment +import androidx.compose.ui.Alignment.Companion.CenterEnd +import androidx.compose.ui.Alignment.Companion.CenterStart import androidx.compose.ui.Modifier +import androidx.compose.ui.res.painterResource import androidx.compose.ui.text.TextStyle import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import com.mindorks.sample.whatsapp.data.model.Call -import com.mindorks.sample.whatsapp.util.ImageLoader -import com.mindorks.sample.whatsapp.util.colorGreen +import com.mindorks.sample.whatsapp.screen.chat.ui.CircularCoilImage +import com.mindorks.sample.whatsapp.ui.BrightGreen +import com.mindorks.sample.whatsapp.ui.Gray +import com.mindorks.sample.whatsapp.ui.White @Composable fun CallItem(call: Call) { - val padding = 16.dp + val imageSize = 40.dp - Column(Modifier.padding(padding).fillMaxWidth()) { - Row(verticalGravity = Alignment.CenterVertically) { + Box( + Modifier + .padding(padding) + .fillMaxWidth(), + ) { + CircularCoilImage( + modifier = Modifier + .align(CenterStart) + .size(imageSize), + call.imageUrl + ) + Column( + modifier = Modifier + .padding(start = imageSize + padding) + .align(CenterStart) + ) { + Text(call.name, color = White) + + Row { + Image( + modifier = Modifier + .padding(end = 8.dp) + .size(12.dp), + painter = painterResource(call.voiceStatus), + contentDescription = null, + ) - Box(shape = CircleShape, modifier = Modifier.size(40.dp)) { - ImageLoader(call.imageUrl) - } - Column(modifier = Modifier.padding(start = padding)) { - Text(call.name) Text( call.time, style = TextStyle( fontSize = 12.sp, - color = colorGreen(), + color = Gray, textAlign = TextAlign.Center ), maxLines = 1, overflow = TextOverflow.Ellipsis ) } - Box(modifier = Modifier.fillMaxWidth(), gravity = ContentGravity.CenterEnd) { - ImageLoader(call.voiceStatus, modifier = Modifier) - } } + + Spacer(modifier = Modifier.size(width = 128.dp, height = 15.dp)) + + Icon( + modifier = Modifier + .size(32.dp) + .align(CenterEnd), + imageVector = Icons.Default.Call, + tint = BrightGreen, + contentDescription = null + ) } } diff --git a/app/src/main/java/com/mindorks/sample/whatsapp/screen/main/view/call/CallsView.kt b/app/src/main/java/com/mindorks/sample/whatsapp/screen/main/view/call/CallsView.kt index b6d768e..d736bd7 100644 --- a/app/src/main/java/com/mindorks/sample/whatsapp/screen/main/view/call/CallsView.kt +++ b/app/src/main/java/com/mindorks/sample/whatsapp/screen/main/view/call/CallsView.kt @@ -1,17 +1,21 @@ package com.mindorks.sample.whatsapp.screen.main.view.call import androidx.compose.foundation.background -import androidx.compose.foundation.lazy.LazyColumnFor -import androidx.compose.material.Divider +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.lazy.LazyColumn +import androidx.compose.foundation.lazy.items import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import com.mindorks.sample.whatsapp.data.local.calls -import com.mindorks.sample.whatsapp.util.colorLightGreen +import com.mindorks.sample.whatsapp.screen.chat.ui.Divider +import com.mindorks.sample.whatsapp.ui.DarkestGreen @Composable fun CallsView() { - LazyColumnFor(calls, modifier = Modifier.background(color = colorLightGreen())) { call -> - CallItem(call) - Divider() + LazyColumn(modifier = Modifier.fillMaxSize().background(color = DarkestGreen)) { + items(calls) {call -> + CallItem(call) + Divider() + } } } \ No newline at end of file diff --git a/app/src/main/java/com/mindorks/sample/whatsapp/screen/main/view/chats/ChatsItemView.kt b/app/src/main/java/com/mindorks/sample/whatsapp/screen/main/view/chats/ChatsItemView.kt index 62e388c..3068124 100644 --- a/app/src/main/java/com/mindorks/sample/whatsapp/screen/main/view/chats/ChatsItemView.kt +++ b/app/src/main/java/com/mindorks/sample/whatsapp/screen/main/view/chats/ChatsItemView.kt @@ -1,63 +1,72 @@ package com.mindorks.sample.whatsapp.screen.main.view.chats -import androidx.compose.foundation.Box -import androidx.compose.foundation.Text +import androidx.compose.foundation.background import androidx.compose.foundation.clickable import androidx.compose.foundation.layout.* import androidx.compose.foundation.shape.CircleShape +import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier -import androidx.compose.ui.graphics.Color +import androidx.compose.ui.draw.clip import androidx.compose.ui.text.TextStyle import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import com.mindorks.sample.whatsapp.data.model.Chat import com.mindorks.sample.whatsapp.data.model.User -import com.mindorks.sample.whatsapp.util.ImageLoader -import com.mindorks.sample.whatsapp.util.colorGreen -import com.mindorks.sample.whatsapp.util.colorLightGreen +import com.mindorks.sample.whatsapp.screen.chat.ui.CircularCoilImage +import com.mindorks.sample.whatsapp.ui.BrightGreen +import com.mindorks.sample.whatsapp.ui.DarkerGreen +import com.mindorks.sample.whatsapp.ui.Gray +import com.mindorks.sample.whatsapp.ui.White @Composable fun ChatsItemView(chat: Chat, loadNextScreen: (User) -> Unit) { Box( - modifier = Modifier.fillMaxWidth().clickable { - loadNextScreen( - User( - id = 2, - chat.name, - chat.url + modifier = Modifier + .fillMaxWidth() + .clickable { + loadNextScreen( + User( + id = 2, + chat.name, + chat.url + ) ) - ) - } + Modifier.padding(top = 4.dp, bottom = 4.dp)) { - Row(modifier = Modifier.padding(10.dp)) { - Box(shape = CircleShape, modifier = Modifier.size(40.dp)) { - ImageLoader(chat.url) } - Spacer(modifier = Modifier.preferredSize(12.dp)) + .padding( + top = 4.dp, bottom = 4.dp + )) { + Row(modifier = Modifier.padding(10.dp)) { + CircularCoilImage( + modifier = Modifier.size(40.dp), + chat.url + ) + + Spacer(modifier = Modifier.defaultMinSize(12.dp)) Column(modifier = Modifier.weight(3.0f, true)) { - Text(chat.name) - Spacer(modifier = Modifier.preferredSize(2.dp)) - userChat(chat) + Text(chat.name, color = White) + Spacer(modifier = Modifier.defaultMinSize(2.dp)) + UserChat(chat) } - Column(modifier = Modifier.weight(1.0f, true), horizontalGravity = Alignment.End) { + Column(modifier = Modifier.weight(1.0f, true), horizontalAlignment = Alignment.End) { MessageTime(chat) - Spacer(modifier = Modifier.preferredSize(2.dp)) - unreadCount(chat) + Spacer(modifier = Modifier.defaultMinSize(2.dp)) + UnreadCount(chat) } } } } @Composable -fun userChat(chat: Chat) { +fun UserChat(chat: Chat) { Text( text = chat.chat, style = TextStyle( fontSize = 16.sp, - color = Color.Gray + color = Gray ), maxLines = 1, overflow = TextOverflow.Ellipsis @@ -67,41 +76,37 @@ fun userChat(chat: Chat) { @Composable fun MessageTime(chat: Chat) { - Text( text = chat.time, style = TextStyle( fontSize = 12.sp, - color = colorGreen() + color = BrightGreen ) ) } @Composable -fun unreadCount(chat: Chat) { - +fun UnreadCount(chat: Chat) { if (chat.unreadCount != "0") { - setupUnreadCount(chat.unreadCount) + SetupUnreadCount(chat.unreadCount) } } @Composable -fun setupUnreadCount(count: String) { - - Column(horizontalGravity = Alignment.CenterHorizontally) { - Box( - modifier = Modifier.preferredSize(20.dp), - backgroundColor = colorGreen(), - gravity = Alignment.Center, - shape = CircleShape - ) { - Text( - text = count, - style = TextStyle( - fontSize = 12.sp, - color = colorLightGreen() - ) +fun SetupUnreadCount(count: String) { + Box( + modifier = Modifier + .clip(CircleShape) + .size(20.dp) + .background(BrightGreen), + contentAlignment = Alignment.Center, + ) { + Text( + text = count, + style = TextStyle( + fontSize = 12.sp, + color = DarkerGreen ) - } + ) } } \ No newline at end of file diff --git a/app/src/main/java/com/mindorks/sample/whatsapp/screen/main/view/chats/ChatsView.kt b/app/src/main/java/com/mindorks/sample/whatsapp/screen/main/view/chats/ChatsView.kt index 0652d69..8fb0ba8 100644 --- a/app/src/main/java/com/mindorks/sample/whatsapp/screen/main/view/chats/ChatsView.kt +++ b/app/src/main/java/com/mindorks/sample/whatsapp/screen/main/view/chats/ChatsView.kt @@ -1,18 +1,22 @@ package com.mindorks.sample.whatsapp.screen.main.view.chats import androidx.compose.foundation.background -import androidx.compose.foundation.lazy.LazyColumnFor -import androidx.compose.material.Divider +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.lazy.LazyColumn +import androidx.compose.foundation.lazy.items import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import com.mindorks.sample.whatsapp.data.local.chatsList import com.mindorks.sample.whatsapp.data.model.User -import com.mindorks.sample.whatsapp.util.colorLightGreen +import com.mindorks.sample.whatsapp.screen.chat.ui.Divider +import com.mindorks.sample.whatsapp.ui.DarkestGreen @Composable fun ChatsView(loadNextScreen: (User) -> Unit) { - LazyColumnFor(chatsList, modifier = Modifier.background(color = colorLightGreen())) { chat -> - ChatsItemView(chat, loadNextScreen) - Divider() + LazyColumn(modifier = Modifier.fillMaxSize().background(color = DarkestGreen)) { + items(chatsList) {chat -> + ChatsItemView(chat, loadNextScreen) + Divider() + } } } \ No newline at end of file diff --git a/app/src/main/java/com/mindorks/sample/whatsapp/screen/main/view/status/StatusItemView.kt b/app/src/main/java/com/mindorks/sample/whatsapp/screen/main/view/status/StatusItemView.kt index c78478e..89912b7 100644 --- a/app/src/main/java/com/mindorks/sample/whatsapp/screen/main/view/status/StatusItemView.kt +++ b/app/src/main/java/com/mindorks/sample/whatsapp/screen/main/view/status/StatusItemView.kt @@ -1,9 +1,7 @@ package com.mindorks.sample.whatsapp.screen.main.view.status -import androidx.compose.foundation.Box -import androidx.compose.foundation.Text import androidx.compose.foundation.layout.* -import androidx.compose.foundation.shape.CircleShape +import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier @@ -13,25 +11,27 @@ import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import com.mindorks.sample.whatsapp.data.model.Status -import com.mindorks.sample.whatsapp.util.ImageLoader -import com.mindorks.sample.whatsapp.util.colorGreen +import com.mindorks.sample.whatsapp.screen.chat.ui.CircularCoilImage +import com.mindorks.sample.whatsapp.ui.BrightGreen +import com.mindorks.sample.whatsapp.ui.White @Composable fun StatusItemView(status: Status) { val padding = 16.dp Column(Modifier.padding(padding).fillMaxWidth()) { - Row(verticalGravity = Alignment.CenterVertically) { + Row(verticalAlignment = Alignment.CenterVertically) { + CircularCoilImage( + modifier = Modifier.size(40.dp), + status.imageUrl + ) - Box(shape = CircleShape, modifier = Modifier.size(40.dp)) { - ImageLoader(status.imageUrl) - } Column(modifier = Modifier.padding(start = 16.dp)) { - Text(status.name) + Text(status.name, color = White) Text( status.time, style = TextStyle( fontSize = 12.sp, - color = colorGreen(), + color = BrightGreen, textAlign = TextAlign.Center ), maxLines = 1, diff --git a/app/src/main/java/com/mindorks/sample/whatsapp/screen/main/view/status/StatusView.kt b/app/src/main/java/com/mindorks/sample/whatsapp/screen/main/view/status/StatusView.kt index d9f7391..c79318c 100644 --- a/app/src/main/java/com/mindorks/sample/whatsapp/screen/main/view/status/StatusView.kt +++ b/app/src/main/java/com/mindorks/sample/whatsapp/screen/main/view/status/StatusView.kt @@ -1,17 +1,25 @@ package com.mindorks.sample.whatsapp.screen.main.view.status import androidx.compose.foundation.background -import androidx.compose.foundation.lazy.LazyColumnFor -import androidx.compose.material.Divider +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.lazy.LazyColumn +import androidx.compose.foundation.lazy.items import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import com.mindorks.sample.whatsapp.data.local.statusList -import com.mindorks.sample.whatsapp.util.colorLightGreen +import com.mindorks.sample.whatsapp.screen.chat.ui.Divider +import com.mindorks.sample.whatsapp.ui.DarkestGreen @Composable fun StatusView() { - LazyColumnFor(statusList, modifier = Modifier.background(color = colorLightGreen())) { status -> - StatusItemView(status) - Divider() + LazyColumn( + modifier = Modifier + .fillMaxSize() + .background(color = DarkestGreen) + ) { + items(statusList) {status -> + StatusItemView(status) + Divider() + } } } \ No newline at end of file diff --git a/app/src/main/java/com/mindorks/sample/whatsapp/screen/splash/SplashFragment.kt b/app/src/main/java/com/mindorks/sample/whatsapp/screen/splash/SplashFragment.kt index d6b7ecd..ce863cf 100644 --- a/app/src/main/java/com/mindorks/sample/whatsapp/screen/splash/SplashFragment.kt +++ b/app/src/main/java/com/mindorks/sample/whatsapp/screen/splash/SplashFragment.kt @@ -16,7 +16,7 @@ class SplashFragment : Fragment() { inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle? - ): View? { + ): View { return ComposeView(requireContext()).apply { setContent { WhatsAppTheme { diff --git a/app/src/main/java/com/mindorks/sample/whatsapp/screen/splash/SplashView.kt b/app/src/main/java/com/mindorks/sample/whatsapp/screen/splash/SplashView.kt index e100afb..148a69c 100644 --- a/app/src/main/java/com/mindorks/sample/whatsapp/screen/splash/SplashView.kt +++ b/app/src/main/java/com/mindorks/sample/whatsapp/screen/splash/SplashView.kt @@ -1,30 +1,33 @@ package com.mindorks.sample.whatsapp.screen.splash - -import androidx.compose.foundation.Box -import androidx.compose.foundation.ContentGravity import androidx.compose.foundation.Image +import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.fillMaxSize -import androidx.compose.material.Surface +import androidx.compose.material3.Surface import androidx.compose.runtime.Composable -import androidx.compose.runtime.launchInComposition +import androidx.compose.runtime.LaunchedEffect +import androidx.compose.runtime.rememberCoroutineScope +import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.res.colorResource +import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.vectorResource import com.mindorks.sample.whatsapp.R import kotlinx.coroutines.delay +import kotlinx.coroutines.launch private const val DELAY: Long = 2000 @Composable fun SplashView(modifier: Modifier = Modifier, loadNextScreen: () -> Unit) { Surface(color = colorResource(id = R.color.whatsapp_green)) { - Box(modifier = modifier.fillMaxSize(), gravity = ContentGravity.Center) { - launchInComposition { - delay(DELAY) - loadNextScreen() - } - Image(asset = vectorResource(id = R.drawable.ic_whatsapp_logo)) + Box(modifier = modifier.fillMaxSize(), contentAlignment = Alignment.Center) { + Image(painter = painterResource(id = R.drawable.ic_whatsapp_logo), null) } } + + LaunchedEffect(key1 = null) { + delay(DELAY) + loadNextScreen() + } } diff --git a/app/src/main/java/com/mindorks/sample/whatsapp/ui/Color.kt b/app/src/main/java/com/mindorks/sample/whatsapp/ui/Color.kt index 4b1c6f6..1574aae 100644 --- a/app/src/main/java/com/mindorks/sample/whatsapp/ui/Color.kt +++ b/app/src/main/java/com/mindorks/sample/whatsapp/ui/Color.kt @@ -2,7 +2,11 @@ package com.mindorks.sample.whatsapp.ui import androidx.compose.ui.graphics.Color -val primaryWhatsAppColor = Color(0xFFBB86FC) -val purple500 = Color(0xFF6200EE) -val purple700 = Color(0xFF3700B3) -val teal200 = Color(0xFF03DAC5) \ No newline at end of file +val BrightGreen = Color(0xFF0E9F7E) +val Green = Color(0xFF0B4D43) +val DarkGreen = Color(0xFF1C2D37) +val DarkerGreen = Color(0xFF162731) +val DarkestGreen = Color(0xFF0E1F29) +val White = Color(0xFFE8EEF2) +val Gray = Color(0xFF7A8183) +val DarkGray = Color(0xFF35393C) \ No newline at end of file diff --git a/app/src/main/java/com/mindorks/sample/whatsapp/ui/Shape.kt b/app/src/main/java/com/mindorks/sample/whatsapp/ui/Shape.kt index 7389389..a90024e 100644 --- a/app/src/main/java/com/mindorks/sample/whatsapp/ui/Shape.kt +++ b/app/src/main/java/com/mindorks/sample/whatsapp/ui/Shape.kt @@ -1,7 +1,7 @@ package com.mindorks.sample.whatsapp.ui import androidx.compose.foundation.shape.RoundedCornerShape -import androidx.compose.material.Shapes +import androidx.compose.material3.Shapes import androidx.compose.ui.unit.dp val shapes = Shapes( diff --git a/app/src/main/java/com/mindorks/sample/whatsapp/ui/Theme.kt b/app/src/main/java/com/mindorks/sample/whatsapp/ui/Theme.kt index e528cef..4937228 100644 --- a/app/src/main/java/com/mindorks/sample/whatsapp/ui/Theme.kt +++ b/app/src/main/java/com/mindorks/sample/whatsapp/ui/Theme.kt @@ -1,44 +1,22 @@ package com.mindorks.sample.whatsapp.ui -import androidx.compose.foundation.isSystemInDarkTheme -import androidx.compose.material.MaterialTheme -import androidx.compose.material.darkColors -import androidx.compose.material.lightColors +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.lightColorScheme import androidx.compose.runtime.Composable -private val DarkColorPalette = darkColors( - primary = primaryWhatsAppColor, - primaryVariant = primaryWhatsAppColor, - secondary = primaryWhatsAppColor -) - -private val LightColorPalette = lightColors( - primary = primaryWhatsAppColor, - primaryVariant = primaryWhatsAppColor, - secondary = primaryWhatsAppColor +private val LightColorScheme = lightColorScheme( + primary = BrightGreen, + secondary = BrightGreen, - /* Other default colors to override -background = Color.White, -surface = Color.White, -onPrimary = Color.White, -onSecondary = Color.Black, -onBackground = Color.Black, -onSurface = Color.Black, -*/ ) @Composable -fun WhatsAppTheme(darkTheme: Boolean = isSystemInDarkTheme(), content: @Composable () -> Unit) { - val colors = if (darkTheme) { - DarkColorPalette - } else { - LightColorPalette - } - +fun WhatsAppTheme( + content: @Composable () -> Unit +) { MaterialTheme( - colors = colors, - typography = typography, - shapes = shapes, + colorScheme = LightColorScheme, + typography = Typography, content = content ) } \ No newline at end of file diff --git a/app/src/main/java/com/mindorks/sample/whatsapp/ui/Type.kt b/app/src/main/java/com/mindorks/sample/whatsapp/ui/Type.kt index 569408c..513ef90 100644 --- a/app/src/main/java/com/mindorks/sample/whatsapp/ui/Type.kt +++ b/app/src/main/java/com/mindorks/sample/whatsapp/ui/Type.kt @@ -1,19 +1,19 @@ package com.mindorks.sample.whatsapp.ui -import androidx.compose.material.Typography +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( - body1 = TextStyle( +val Typography = Typography( + bodySmall = TextStyle( fontFamily = FontFamily.Default, fontWeight = FontWeight.Normal, fontSize = 16.sp ) - /* Other default text styles to override +/* Other default text styles to override button = TextStyle( fontFamily = FontFamily.Default, fontWeight = FontWeight.W500, diff --git a/app/src/main/java/com/mindorks/sample/whatsapp/util/Color.kt b/app/src/main/java/com/mindorks/sample/whatsapp/util/Color.kt deleted file mode 100644 index 8bfc3a2..0000000 --- a/app/src/main/java/com/mindorks/sample/whatsapp/util/Color.kt +++ /dev/null @@ -1,10 +0,0 @@ -package com.mindorks.sample.whatsapp.util - -import androidx.compose.ui.graphics.Color - - -fun colorGreen() = Color(3, 183, 144) - -fun colorTopBar() = Color(33, 46, 55) - -fun colorLightGreen() = Color(21, 31, 40) \ No newline at end of file diff --git a/app/src/main/java/com/mindorks/sample/whatsapp/util/ImageLoader.kt b/app/src/main/java/com/mindorks/sample/whatsapp/util/ImageLoader.kt index efe8188..3712712 100644 --- a/app/src/main/java/com/mindorks/sample/whatsapp/util/ImageLoader.kt +++ b/app/src/main/java/com/mindorks/sample/whatsapp/util/ImageLoader.kt @@ -1,210 +1,201 @@ package com.mindorks.sample.whatsapp.util - -import android.graphics.Bitmap -import android.graphics.drawable.Drawable -import androidx.annotation.DrawableRes -import androidx.compose.foundation.Canvas -import androidx.compose.foundation.Image -import androidx.compose.foundation.clickable -import androidx.compose.foundation.layout.fillMaxSize -import androidx.compose.foundation.layout.size -import androidx.compose.runtime.Composable -import androidx.compose.runtime.FrameManager -import androidx.compose.runtime.onCommit -import androidx.compose.runtime.stateFor -import androidx.compose.ui.Modifier -import androidx.compose.ui.WithConstraints -import androidx.compose.ui.graphics.ImageAsset -import androidx.compose.ui.graphics.asImageAsset -import androidx.compose.ui.graphics.drawscope.drawCanvas -import androidx.compose.ui.graphics.nativeCanvas -import androidx.compose.ui.layout.ContentScale -import androidx.compose.ui.platform.ContextAmbient -import androidx.compose.ui.res.loadVectorResource -import androidx.compose.ui.unit.dp -import com.bumptech.glide.Glide -import com.bumptech.glide.RequestBuilder -import com.bumptech.glide.request.target.CustomTarget -import com.bumptech.glide.request.target.Target.SIZE_ORIGINAL -import com.bumptech.glide.request.transition.Transition -import kotlinx.coroutines.CoroutineScope -import kotlinx.coroutines.Dispatchers -import kotlinx.coroutines.launch - - -@Composable -fun ImageLoader( - model: Any, - onImageReady: (() -> Unit)? = null, - customize: RequestBuilder.() -> RequestBuilder = { this } -) { - WithConstraints { - val image = stateFor(null) { null } - val drawable = stateFor(null) { null } - val context = ContextAmbient.current - - onCommit(model) { - val glide = Glide.with(context) - var target: CustomTarget? = null - val job = CoroutineScope(Dispatchers.Main).launch { - target = object : CustomTarget() { - override fun onLoadCleared(placeholder: Drawable?) { - image.value = null - drawable.value = placeholder - } - - override fun onResourceReady( - resource: Bitmap, - transition: Transition? - ) { - FrameManager.ensureStarted() - image.value = resource.asImageAsset() - onImageReady?.invoke() - } - } - - val width = - if (constraints.maxWidth > 0 && constraints.maxWidth < Int.MAX_VALUE) { - constraints.maxWidth - } else { - SIZE_ORIGINAL - } - - val height = - if (constraints.maxHeight > 0 && constraints.maxHeight < Int.MAX_VALUE) { - constraints.maxHeight - } else { - SIZE_ORIGINAL - } - - glide - .asBitmap() - .load(model) - .override(width, height) - .circleCrop() - .let(customize) - .into(target!!) - } - - onDispose { - image.value = null - drawable.value = null - glide.clear(target) - job.cancel() - } - } - - val theImage = image.value - val theDrawable = drawable.value - if (theImage != null) { - Image(asset = theImage) - } else if (theDrawable != null) { - Canvas(modifier = Modifier.fillMaxSize()) { - drawCanvas { canvas, _ -> theDrawable.draw(canvas.nativeCanvas) } - } - } - } -} - -@Composable -fun DrawableLoader( - model: Any, - onImageReady: (() -> Unit)? = null, - customize: RequestBuilder.() -> RequestBuilder = { this } -) { - WithConstraints { - val image = stateFor(null) { null } - val drawable = stateFor(null) { null } - val context = ContextAmbient.current - - onCommit(model) { - val glide = Glide.with(context) - var target: CustomTarget? = null - val job = CoroutineScope(Dispatchers.Main).launch { - target = object : CustomTarget() { - override fun onLoadCleared(placeholder: Drawable?) { - image.value = null - drawable.value = placeholder - } - - override fun onResourceReady( - resource: Bitmap, - transition: Transition? - ) { - FrameManager.ensureStarted() - image.value = resource.asImageAsset() - onImageReady?.invoke() - } - } - - val width = - if (constraints.maxWidth > 0 && constraints.maxWidth < Int.MAX_VALUE) { - constraints.maxWidth - } else { - SIZE_ORIGINAL - } - - val height = - if (constraints.maxHeight > 0 && constraints.maxHeight < Int.MAX_VALUE) { - constraints.maxHeight - } else { - SIZE_ORIGINAL - } - - glide - .asBitmap() - .load(model) - .override(width, height) - .let(customize) - .into(target!!) - } - - onDispose { - image.value = null - drawable.value = null - glide.clear(target) - job.cancel() - } - } - - val theImage = image.value - val theDrawable = drawable.value - if (theImage != null) { - Image(asset = theImage) - } else if (theDrawable != null) { - Canvas(modifier = Modifier.fillMaxSize()) { - drawCanvas { canvas, _ -> theDrawable.draw(canvas.nativeCanvas) } - } - } - } - - -} - -@Composable -fun ImageLoader(@DrawableRes imageUrl: Int, modifier: Modifier) { - - val vectorAsset = loadVectorResource(imageUrl) - vectorAsset.resource.resource?.let { - Image( - asset = it, - modifier = Modifier.size(12.dp) + modifier, - contentScale = ContentScale.Fit - ) - } -} -@Composable -fun ImageLoader(@DrawableRes imageUrl: Int,modifier: Modifier,onClick:()->Unit) { - - val vectorAsset = loadVectorResource(imageUrl) - vectorAsset.resource.resource?.let { - Image( - asset = it, - modifier = Modifier.size(24.dp)+modifier.clickable { - onClick() - }, - contentScale = ContentScale.Fit - ) - } - -} \ No newline at end of file +// +//import android.graphics.Bitmap +//import android.graphics.drawable.Drawable +//import androidx.annotation.DrawableRes +//import androidx.compose.foundation.Canvas +//import androidx.compose.foundation.Image +//import androidx.compose.foundation.clickable +//import androidx.compose.foundation.layout.fillMaxSize +//import androidx.compose.foundation.layout.size +//import androidx.compose.runtime.Composable +//import androidx.compose.ui.Modifier +//import androidx.compose.ui.graphics.nativeCanvas +//import androidx.compose.ui.layout.ContentScale +//import androidx.compose.ui.unit.dp +//import com.bumptech.glide.Glide +//import com.bumptech.glide.RequestBuilder +//import com.bumptech.glide.request.target.CustomTarget +//import com.bumptech.glide.request.target.Target.SIZE_ORIGINAL +//import com.bumptech.glide.request.transition.Transition +//import kotlinx.coroutines.CoroutineScope +//import kotlinx.coroutines.Dispatchers +//import kotlinx.coroutines.launch +// +// +//@Composable +//fun ImageLoader( +// model: Any, +// onImageReady: (() -> Unit)? = null, +// customize: RequestBuilder.() -> RequestBuilder = { this } +//) { +// WithConstraints { +// val image = stateFor(null) { null } +// val drawable = stateFor(null) { null } +// val context = ContextAmbient.current +// +// onCommit(model) { +// val glide = Glide.with(context) +// var target: CustomTarget? = null +// val job = CoroutineScope(Dispatchers.Main).launch { +// target = object : CustomTarget() { +// override fun onLoadCleared(placeholder: Drawable?) { +// image.value = null +// drawable.value = placeholder +// } +// +// override fun onResourceReady( +// resource: Bitmap, +// transition: Transition? +// ) { +// FrameManager.ensureStarted() +// image.value = resource.asImageAsset() +// onImageReady?.invoke() +// } +// } +// +// val width = +// if (constraints.maxWidth > 0 && constraints.maxWidth < Int.MAX_VALUE) { +// constraints.maxWidth +// } else { +// SIZE_ORIGINAL +// } +// +// val height = +// if (constraints.maxHeight > 0 && constraints.maxHeight < Int.MAX_VALUE) { +// constraints.maxHeight +// } else { +// SIZE_ORIGINAL +// } +// +// glide +// .asBitmap() +// .load(model) +// .override(width, height) +// .circleCrop() +// .let(customize) +// .into(target!!) +// } +// +// onDispose { +// image.value = null +// drawable.value = null +// glide.clear(target) +// job.cancel() +// } +// } +// +// val theImage = image.value +// val theDrawable = drawable.value +// if (theImage != null) { +// Image(asset = theImage) +// } else if (theDrawable != null) { +// Canvas(modifier = Modifier.fillMaxSize()) { +// drawCanvas { canvas, _ -> theDrawable.draw(canvas.nativeCanvas) } +// } +// } +// } +//} +// +//@Composable +//fun DrawableLoader( +// model: Any, +// onImageReady: (() -> Unit)? = null, +// customize: RequestBuilder.() -> RequestBuilder = { this } +//) { +// WithConstraints { +// val image = stateFor(null) { null } +// val drawable = stateFor(null) { null } +// val context = ContextAmbient.current +// +// onCommit(model) { +// val glide = Glide.with(context) +// var target: CustomTarget? = null +// val job = CoroutineScope(Dispatchers.Main).launch { +// target = object : CustomTarget() { +// override fun onLoadCleared(placeholder: Drawable?) { +// image.value = null +// drawable.value = placeholder +// } +// +// override fun onResourceReady( +// resource: Bitmap, +// transition: Transition? +// ) { +// FrameManager.ensureStarted() +// image.value = resource.asImageAsset() +// onImageReady?.invoke() +// } +// } +// +// val width = +// if (constraints.maxWidth > 0 && constraints.maxWidth < Int.MAX_VALUE) { +// constraints.maxWidth +// } else { +// SIZE_ORIGINAL +// } +// +// val height = +// if (constraints.maxHeight > 0 && constraints.maxHeight < Int.MAX_VALUE) { +// constraints.maxHeight +// } else { +// SIZE_ORIGINAL +// } +// +// glide +// .asBitmap() +// .load(model) +// .override(width, height) +// .let(customize) +// .into(target!!) +// } +// +// onDispose { +// image.value = null +// drawable.value = null +// glide.clear(target) +// job.cancel() +// } +// } +// +// val theImage = image.value +// val theDrawable = drawable.value +// if (theImage != null) { +// Image(asset = theImage) +// } else if (theDrawable != null) { +// Canvas(modifier = Modifier.fillMaxSize()) { +// drawCanvas { canvas, _ -> theDrawable.draw(canvas.nativeCanvas) } +// } +// } +// } +// +// +//} +// +//@Composable +//fun ImageLoader(@DrawableRes imageUrl: Int, modifier: Modifier) { +// +// val vectorAsset = loadVectorResource(imageUrl) +// vectorAsset.resource.resource?.let { +// Image( +// asset = it, +// modifier = Modifier.size(12.dp) + modifier, +// contentScale = ContentScale.Fit +// ) +// } +//} +//@Composable +//fun ImageLoader(@DrawableRes imageUrl: Int,modifier: Modifier,onClick:()->Unit) { +// +// val vectorAsset = loadVectorResource(imageUrl) +// vectorAsset.resource.resource?.let { +// Image( +// asset = it, +// modifier = Modifier.size(24.dp)+modifier.clickable { +// onClick() +// }, +// contentScale = ContentScale.Fit +// ) +// } +// +//} \ No newline at end of file diff --git a/app/src/main/res/layout/activity_whatsapp.xml b/app/src/main/res/layout/activity_whatsapp.xml index cdd5987..a97a6f6 100644 --- a/app/src/main/res/layout/activity_whatsapp.xml +++ b/app/src/main/res/layout/activity_whatsapp.xml @@ -1,15 +1,11 @@ - - - - \ No newline at end of file + app:defaultNavHost="true" + app:layout_behavior="@string/appbar_scrolling_view_behavior" + app:navGraph="@navigation/mobile_navigation" /> diff --git a/build.gradle b/build.gradle deleted file mode 100644 index c19d001..0000000 --- a/build.gradle +++ /dev/null @@ -1,32 +0,0 @@ -// Top-level build file where you can add configuration options common to all sub-projects/modules. -buildscript { - ext { - compose_version = '1.0.0-alpha01' - } - ext.kotlin_version = "1.4.10" - repositories { - mavenCentral() - google() - jcenter() - } - dependencies { - classpath "com.android.tools.build:gradle:4.0.1" - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" - def nav_version = "2.3.0" - classpath "androidx.navigation:navigation-safe-args-gradle-plugin:$nav_version" - // NOTE: Do not place your application dependencies here; they belong - // in the individual module build.gradle files - } -} - -allprojects { - repositories { - mavenCentral() - google() - jcenter() - } -} - -task clean(type: Delete) { - delete rootProject.buildDir -} \ No newline at end of file diff --git a/build.gradle.kts b/build.gradle.kts new file mode 100644 index 0000000..dd460b9 --- /dev/null +++ b/build.gradle.kts @@ -0,0 +1,5 @@ +plugins { + alias(libs.plugins.android.application) apply false + alias(libs.plugins.jetbrains.kotlin.android) apply false + alias(libs.plugins.navigation.safeargs) apply false +} \ No newline at end of file diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml new file mode 100644 index 0000000..061212f --- /dev/null +++ b/gradle/libs.versions.toml @@ -0,0 +1,49 @@ +[versions] +agp = "8.4.2" +coilCompose = "1.3.1" +fragmentKtx = "1.8.5" +glide = "4.12.0" +kotlin = "1.9.0" +coreKtx = "1.13.1" +junit = "4.13.2" +junitVersion = "1.2.1" +espressoCore = "3.6.1" +legacySupportV4 = "1.0.0" +lifecycle = "2.8.7" +activityCompose = "1.9.3" +composeBom = "2024.10.00" +navigation = "2.8.3" +runtimeLivedata = "1.7.5" + +[libraries] +androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "coreKtx" } +androidx-fragment-ktx = { module = "androidx.fragment:fragment-ktx", version.ref = "fragmentKtx" } +androidx-legacy-support-v4 = { module = "androidx.legacy:legacy-support-v4", version.ref = "legacySupportV4" } +androidx-lifecycle-livedata = { module = "androidx.lifecycle:lifecycle-livedata-ktx", version.ref = "lifecycle" } +androidx-navigation-fragment-ktx = { module = "androidx.navigation:navigation-fragment-ktx", version.ref = "navigation" } +androidx-navigation-ui-ktx = { module = "androidx.navigation:navigation-ui-ktx", version.ref = "navigation" } +coil-compose = { module = "io.coil-kt:coil-compose", version.ref = "coilCompose" } +glide = { module = "com.github.bumptech.glide:glide", version.ref = "glide" } +junit = { group = "junit", name = "junit", version.ref = "junit" } +androidx-junit = { group = "androidx.test.ext", name = "junit", version.ref = "junitVersion" } +androidx-espresso-core = { group = "androidx.test.espresso", name = "espresso-core", version.ref = "espressoCore" } +androidx-lifecycle-runtime-ktx = { group = "androidx.lifecycle", name = "lifecycle-runtime-ktx", version.ref = "lifecycle" } +androidx-lifecycle-viewmodel = { group = "androidx.lifecycle", name = "lifecycle-viewmodel", version.ref = "lifecycle"} +androidx-activity-compose = { group = "androidx.activity", name = "activity-compose", version.ref = "activityCompose" } +androidx-compose-bom = { group = "androidx.compose", name = "compose-bom", version.ref = "composeBom" } +androidx-ui = { group = "androidx.compose.ui", name = "ui" } +androidx-ui-graphics = { group = "androidx.compose.ui", name = "ui-graphics" } +androidx-ui-tooling = { group = "androidx.compose.ui", name = "ui-tooling" } +androidx-ui-tooling-preview = { group = "androidx.compose.ui", name = "ui-tooling-preview" } +androidx-ui-test-manifest = { group = "androidx.compose.ui", name = "ui-test-manifest" } +androidx-ui-test-junit4 = { group = "androidx.compose.ui", name = "ui-test-junit4" } +androidx-material3 = { group = "androidx.compose.material3", name = "material3" } +androidx-runtime-livedata = { group = "androidx.compose.runtime", name = "runtime-livedata", version.ref = "runtimeLivedata" } + + +[plugins] +android-application = { id = "com.android.application", version.ref = "agp" } +jetbrains-kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" } +navigation-safeargs = {id = "androidx.navigation.safeargs", version.ref = "navigation"} + + diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index f6b961f..7454180 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 7320588..8a9803d 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Sat Sep 19 19:47:17 IST 2020 +#Wed Oct 30 20:20:33 MSK 2024 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.6-rc-6-all.zip diff --git a/gradlew b/gradlew index cccdd3d..1b6c787 100755 --- a/gradlew +++ b/gradlew @@ -1,78 +1,129 @@ -#!/usr/bin/env sh +#!/bin/sh + +# +# Copyright © 2015-2021 the original authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# ############################################################################## -## -## Gradle start up script for UN*X -## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# ############################################################################## # Attempt to set APP_HOME + # Resolve links: $0 may be a link -PRG="$0" -# Need this for relative symlinks. -while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`"/$link" - fi +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >/dev/null -APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null + +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` +APP_BASE_NAME=${0##*/} # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS="" +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' # Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD="maximum" +MAX_FD=maximum warn () { echo "$*" -} +} >&2 die () { echo echo "$*" echo exit 1 -} +} >&2 # OS specific support (must be 'true' or 'false'). cygwin=false msys=false darwin=false nonstop=false -case "`uname`" in - CYGWIN* ) - cygwin=true - ;; - Darwin* ) - darwin=true - ;; - MINGW* ) - msys=true - ;; - NONSTOP* ) - nonstop=true - ;; +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; esac CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + # Determine the Java command to use to start the JVM. if [ -n "$JAVA_HOME" ] ; then if [ -x "$JAVA_HOME/jre/sh/java" ] ; then # IBM's JDK on AIX uses strange locations for the executables - JAVACMD="$JAVA_HOME/jre/sh/java" + JAVACMD=$JAVA_HOME/jre/sh/java else - JAVACMD="$JAVA_HOME/bin/java" + JAVACMD=$JAVA_HOME/bin/java fi if [ ! -x "$JAVACMD" ] ; then die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME @@ -81,7 +132,7 @@ Please set the JAVA_HOME variable in your environment to match the location of your Java installation." fi else - JAVACMD="java" + JAVACMD=java which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. Please set the JAVA_HOME variable in your environment to match the @@ -89,84 +140,95 @@ location of your Java installation." fi # Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then - MAX_FD_LIMIT=`ulimit -H -n` - if [ $? -eq 0 ] ; then - if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then - MAX_FD="$MAX_FD_LIMIT" - fi - ulimit -n $MAX_FD - if [ $? -ne 0 ] ; then - warn "Could not set maximum file descriptor limit: $MAX_FD" - fi - else - warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" - fi +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac fi -# For Darwin, add options to specify how the application appears in the dock -if $darwin; then - GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" -fi +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) -# For Cygwin, switch paths to Windows format before running java -if $cygwin ; then - APP_HOME=`cygpath --path --mixed "$APP_HOME"` - CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` - JAVACMD=`cygpath --unix "$JAVACMD"` - - # We build the pattern for arguments to be converted via cygpath - ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` - SEP="" - for dir in $ROOTDIRSRAW ; do - ROOTDIRS="$ROOTDIRS$SEP$dir" - SEP="|" - done - OURCYGPATTERN="(^($ROOTDIRS))" - # Add a user-defined pattern to the cygpath arguments - if [ "$GRADLE_CYGPATTERN" != "" ] ; then - OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" - fi # Now convert the arguments - kludge to limit ourselves to /bin/sh - i=0 - for arg in "$@" ; do - CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` - CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option - - if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition - eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` - else - eval `echo args$i`="\"$arg\"" + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) fi - i=$((i+1)) + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg done - case $i in - (0) set -- ;; - (1) set -- "$args0" ;; - (2) set -- "$args0" "$args1" ;; - (3) set -- "$args0" "$args1" "$args2" ;; - (4) set -- "$args0" "$args1" "$args2" "$args3" ;; - (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; - esac fi -# Escape application args -save () { - for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done - echo " " -} -APP_ARGS=$(save "$@") - -# Collect all arguments for the java command, following the shell quoting and substitution rules -eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" - -# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong -if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then - cd "$(dirname "$0")" -fi +# Collect all arguments for the java command; +# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of +# shell script including quotes and variable substitutions, so put them in +# double quotes to make sure that they get re-expanded; and +# * put everything else in single quotes, so that it's not re-expanded. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat index e95643d..ac1b06f 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -1,3 +1,19 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + @if "%DEBUG%" == "" @echo off @rem ########################################################################## @rem @@ -13,15 +29,18 @@ if "%DIRNAME%" == "" set DIRNAME=. set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS= +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" @rem Find java.exe if defined JAVA_HOME goto findJavaFromJavaHome set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto init +if "%ERRORLEVEL%" == "0" goto execute echo. echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. @@ -35,7 +54,7 @@ goto fail set JAVA_HOME=%JAVA_HOME:"=% set JAVA_EXE=%JAVA_HOME%/bin/java.exe -if exist "%JAVA_EXE%" goto init +if exist "%JAVA_EXE%" goto execute echo. echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% @@ -45,28 +64,14 @@ echo location of your Java installation. goto fail -:init -@rem Get command-line arguments, handling Windows variants - -if not "%OS%" == "Windows_NT" goto win9xME_args - -:win9xME_args -@rem Slurp the command line arguments. -set CMD_LINE_ARGS= -set _SKIP=2 - -:win9xME_args_slurp -if "x%~1" == "x" goto execute - -set CMD_LINE_ARGS=%* - :execute @rem Setup the command line set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + @rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* :end @rem End local scope for the variables with windows NT shell diff --git a/settings.gradle b/settings.gradle deleted file mode 100644 index 1a5f4bc..0000000 --- a/settings.gradle +++ /dev/null @@ -1,2 +0,0 @@ -rootProject.name = "WhatsApp" -include ':app' diff --git a/settings.gradle.kts b/settings.gradle.kts new file mode 100644 index 0000000..8cd7e1b --- /dev/null +++ b/settings.gradle.kts @@ -0,0 +1,23 @@ +pluginManagement { + repositories { + google { + content { + includeGroupByRegex("com\\.android.*") + includeGroupByRegex("com\\.google.*") + includeGroupByRegex("androidx.*") + } + } + mavenCentral() + gradlePluginPortal() + } +} +dependencyResolutionManagement { + repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS) + repositories { + google() + mavenCentral() + } +} + +rootProject.name = "WhatsApp" +include(":app")