Skip to content

Commit 794b948

Browse files
committed
modify layout and import changes with the package name change
Signed-off-by: sowjanyakch <sowjanya.kch@gmail.com>
1 parent afbd817 commit 794b948

2 files changed

Lines changed: 7 additions & 5 deletions

File tree

app/src/main/java/com/nextcloud/talk/conversationcreation/ConversationCreationActivity.kt

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,7 @@ import com.nextcloud.talk.components.ColoredStatusBar
9595
import com.nextcloud.talk.contacts.ContactsActivity
9696
import com.nextcloud.talk.contacts.loadImage
9797
import com.nextcloud.talk.conversationcreation.viewmodel.ConversationCreationViewModel
98+
import com.nextcloud.talk.conversationcreation.viewmodel.ValidPasswordUiState
9899
import com.nextcloud.talk.extensions.getParcelableArrayListExtraProvider
99100
import com.nextcloud.talk.models.json.autocomplete.AutocompleteUser
100101
import com.nextcloud.talk.utils.CapabilitiesUtil
@@ -471,10 +472,10 @@ fun RoomCreationOptions(conversationCreationViewModel: ConversationCreationViewM
471472
text = stringResource(id = R.string.nc_new_conversation_visibility),
472473
style = MaterialTheme.typography.titleSmall,
473474
color = MaterialTheme.colorScheme.primary,
474-
modifier = Modifier.padding(top = 24.dp, start = 16.dp, end = 16.dp)
475+
modifier = Modifier.padding(top = 24.dp, start = 16.dp, end = 16.dp, bottom = 16.dp)
475476
)
476477

477-
Column {
478+
Column(verticalArrangement = Arrangement.spacedBy(8.dp)) {
478479
ConversationOptions(
479480
icon = R.drawable.ic_avatar_link,
480481
text = R.string.nc_guest_access_allow_title,
@@ -570,7 +571,8 @@ fun ConversationOptions(
570571
Row(
571572
modifier = Modifier
572573
.fillMaxWidth()
573-
.padding(start = 16.dp, end = 16.dp, bottom = 8.dp)
574+
.height(40.dp)
575+
.padding(horizontal = 16.dp)
574576
.then(
575577
if (!conversationCreationViewModel.isPasswordEnabled.value && isPasswordSetOrChange) {
576578
Modifier.clickable {
@@ -585,7 +587,7 @@ fun ConversationOptions(
585587
val clipboardManager =
586588
context.getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager
587589
val clip = ClipData.newPlainText(
588-
context.getString(R.string.nc_app_product_name),
590+
context.resources.getString(R.string.nc_app_product_name),
589591
conversationCreationViewModel.password.value
590592
)
591593
clipboardManager.setPrimaryClip(clip)

app/src/main/java/com/nextcloud/talk/conversationinfo/viewmodel/ConversationInfoViewModel.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import androidx.lifecycle.MutableLiveData
1515
import androidx.lifecycle.ViewModel
1616
import androidx.lifecycle.viewModelScope
1717
import com.nextcloud.talk.chat.data.network.ChatNetworkDataSource
18-
import com.nextcloud.talk.conversationcreation.ConversationCreationRepository
18+
import com.nextcloud.talk.conversationcreation.data.ConversationCreationRepository
1919
import com.nextcloud.talk.conversationinfo.CreateRoomRequest
2020
import com.nextcloud.talk.conversationinfo.Participants
2121
import com.nextcloud.talk.data.user.model.User

0 commit comments

Comments
 (0)