Skip to content

Commit 2696194

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

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
@@ -98,6 +98,7 @@ import com.nextcloud.talk.components.ColoredStatusBar
9898
import com.nextcloud.talk.contacts.ContactsActivity
9999
import com.nextcloud.talk.contacts.loadImage
100100
import com.nextcloud.talk.conversationcreation.viewmodel.ConversationCreationViewModel
101+
import com.nextcloud.talk.conversationcreation.viewmodel.ValidPasswordUiState
101102
import com.nextcloud.talk.extensions.getParcelableArrayListExtraProvider
102103
import com.nextcloud.talk.models.json.autocomplete.AutocompleteUser
103104
import com.nextcloud.talk.utils.CapabilitiesUtil
@@ -567,10 +568,10 @@ fun RoomCreationOptions(conversationCreationViewModel: ConversationCreationViewM
567568
text = stringResource(id = R.string.nc_new_conversation_visibility),
568569
style = MaterialTheme.typography.titleSmall,
569570
color = MaterialTheme.colorScheme.primary,
570-
modifier = Modifier.padding(top = 24.dp, start = 16.dp, end = 16.dp)
571+
modifier = Modifier.padding(top = 24.dp, start = 16.dp, end = 16.dp, bottom = 16.dp)
571572
)
572573

573-
Column {
574+
Column(verticalArrangement = Arrangement.spacedBy(8.dp)) {
574575
ConversationOptions(
575576
icon = R.drawable.ic_avatar_link,
576577
text = R.string.nc_guest_access_allow_title,
@@ -666,7 +667,8 @@ fun ConversationOptions(
666667
Row(
667668
modifier = Modifier
668669
.fillMaxWidth()
669-
.padding(start = 16.dp, end = 16.dp, bottom = 8.dp)
670+
.height(40.dp)
671+
.padding(horizontal = 16.dp)
670672
.then(
671673
if (!conversationCreationViewModel.isPasswordEnabled.value && isPasswordSetOrChange) {
672674
Modifier.clickable {
@@ -681,7 +683,7 @@ fun ConversationOptions(
681683
val clipboardManager =
682684
context.getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager
683685
val clip = ClipData.newPlainText(
684-
context.getString(R.string.nc_app_product_name),
686+
context.resources.getString(R.string.nc_app_product_name),
685687
conversationCreationViewModel.password.value
686688
)
687689
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)