Skip to content

Commit de70fac

Browse files
chore(conv-creation): Move files to mvvm sub-packages
* Close dialog upon saving * colorize title lines Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
1 parent 9188445 commit de70fac

7 files changed

Lines changed: 21 additions & 17 deletions

File tree

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

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
/*
22
* Nextcloud Talk - Android Client
33
*
4-
* SPDX-FileCopyrightText: 2024 Sowjanya Kota <sowjanya.kch@gmail.com>
5-
* SPDX-FileCopyrightText: 2025 Marcel Hibbe <dev@mhibbe.de>
4+
* SPDX-FileCopyrightText: 2024-2026 Nextcloud GmbH and Nextcloud contributors
65
* SPDX-License-Identifier: GPL-3.0-or-later
76
*/
87

@@ -91,6 +90,7 @@ import com.nextcloud.talk.chat.ChatActivity
9190
import com.nextcloud.talk.components.ColoredStatusBar
9291
import com.nextcloud.talk.contacts.ContactsActivity
9392
import com.nextcloud.talk.contacts.loadImage
93+
import com.nextcloud.talk.conversationcreation.viewmodel.ConversationCreationViewModel
9494
import com.nextcloud.talk.extensions.getParcelableArrayListExtraProvider
9595
import com.nextcloud.talk.models.json.autocomplete.AutocompleteUser
9696
import com.nextcloud.talk.utils.CapabilitiesUtil
@@ -379,8 +379,9 @@ fun AddParticipants(
379379
) {
380380
Row {
381381
Text(
382-
text = stringResource(id = R.string.nc_participants).uppercase(),
383-
fontSize = 14.sp,
382+
text = stringResource(id = R.string.nc_participants),
383+
style = MaterialTheme.typography.titleSmall,
384+
color = MaterialTheme.colorScheme.primary,
384385
modifier = Modifier.padding(start = 0.dp, bottom = 16.dp)
385386
)
386387
Spacer(modifier = Modifier.weight(1f))
@@ -463,8 +464,9 @@ fun RoomCreationOptions(conversationCreationViewModel: ConversationCreationViewM
463464
val isPasswordSet = conversationCreationViewModel.isPasswordEnabled.value
464465

465466
Text(
466-
text = stringResource(id = R.string.nc_new_conversation_visibility).uppercase(),
467-
fontSize = 14.sp,
467+
text = stringResource(id = R.string.nc_new_conversation_visibility),
468+
style = MaterialTheme.typography.titleSmall,
469+
color = MaterialTheme.colorScheme.primary,
468470
modifier = Modifier.padding(top = 24.dp, start = 16.dp, end = 16.dp)
469471
)
470472
ConversationOptions(
@@ -690,6 +692,7 @@ fun ShowPasswordDialog(onDismiss: () -> Unit, conversationCreationViewModel: Con
690692
if (password.isNotEmpty() && password.isNotBlank()) {
691693
conversationCreationViewModel.updatePassword(password)
692694
conversationCreationViewModel.isPasswordEnabled(true)
695+
onDismiss()
693696
}
694697
}
695698
) {

app/src/main/java/com/nextcloud/talk/conversationcreation/ConversationCreationRepository.kt renamed to app/src/main/java/com/nextcloud/talk/conversationcreation/data/ConversationCreationRepository.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
/*
22
* Nextcloud Talk - Android Client
33
*
4-
* SPDX-FileCopyrightText: 2024 Sowjanya Kota <sowjanya.kch@gmail.com>
4+
* SPDX-FileCopyrightText: 2024-2026 Nextcloud GmbH and Nextcloud contributors
55
* SPDX-License-Identifier: GPL-3.0-or-later
66
*/
77

8-
package com.nextcloud.talk.conversationcreation
8+
package com.nextcloud.talk.conversationcreation.data
99

1010
import com.nextcloud.talk.data.user.model.User
1111
import com.nextcloud.talk.models.RetrofitBucket

app/src/main/java/com/nextcloud/talk/conversationcreation/ConversationCreationRepositoryImpl.kt renamed to app/src/main/java/com/nextcloud/talk/conversationcreation/data/ConversationCreationRepositoryImpl.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
/*
22
* Nextcloud Talk - Android Client
33
*
4-
* SPDX-FileCopyrightText: 2024 Sowjanya Kota <sowjanya.kch@gmail.com>
4+
* SPDX-FileCopyrightText: 2024-2026 Nextcloud GmbH and Nextcloud contributors
55
* SPDX-License-Identifier: GPL-3.0-or-later
66
*/
77

8-
package com.nextcloud.talk.conversationcreation
8+
package com.nextcloud.talk.conversationcreation.data
99

1010
import com.nextcloud.talk.api.NcApiCoroutines
1111
import com.nextcloud.talk.data.user.model.User

app/src/main/java/com/nextcloud/talk/conversationcreation/ConversationCreationViewModel.kt renamed to app/src/main/java/com/nextcloud/talk/conversationcreation/viewmodel/ConversationCreationViewModel.kt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,19 @@
11
/*
22
* Nextcloud Talk - Android Client
33
*
4-
* SPDX-FileCopyrightText: 2024 Sowjanya Kota <sowjanya.kch@gmail.com>
4+
* SPDX-FileCopyrightText: 2024-2026 Nextcloud GmbH and Nextcloud contributors
55
* SPDX-License-Identifier: GPL-3.0-or-later
66
*/
77

8-
package com.nextcloud.talk.conversationcreation
8+
package com.nextcloud.talk.conversationcreation.viewmodel
99

1010
import android.net.Uri
1111
import android.util.Log
1212
import androidx.compose.runtime.mutableStateOf
1313
import androidx.core.net.toFile
1414
import androidx.lifecycle.ViewModel
1515
import androidx.lifecycle.viewModelScope
16+
import com.nextcloud.talk.conversationcreation.data.ConversationCreationRepository
1617
import com.nextcloud.talk.data.user.model.User
1718
import com.nextcloud.talk.models.RetrofitBucket
1819
import com.nextcloud.talk.models.json.autocomplete.AutocompleteUser

app/src/main/java/com/nextcloud/talk/dagger/modules/RepositoryModule.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ import com.nextcloud.talk.chooseaccount.StatusRepository
2323
import com.nextcloud.talk.chooseaccount.StatusRepositoryImplementation
2424
import com.nextcloud.talk.contacts.ContactsRepository
2525
import com.nextcloud.talk.contacts.ContactsRepositoryImpl
26-
import com.nextcloud.talk.conversationcreation.ConversationCreationRepository
27-
import com.nextcloud.talk.conversationcreation.ConversationCreationRepositoryImpl
26+
import com.nextcloud.talk.conversationcreation.data.ConversationCreationRepository
27+
import com.nextcloud.talk.conversationcreation.data.ConversationCreationRepositoryImpl
2828
import com.nextcloud.talk.conversationinfoedit.data.ConversationInfoEditRepository
2929
import com.nextcloud.talk.conversationinfoedit.data.ConversationInfoEditRepositoryImpl
3030
import com.nextcloud.talk.conversationlist.data.OfflineConversationsRepository

app/src/main/java/com/nextcloud/talk/dagger/modules/ViewModelModule.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import com.nextcloud.talk.chat.viewmodels.ScheduledMessagesViewModel
1616
import com.nextcloud.talk.chooseaccount.StatusViewModel
1717
import com.nextcloud.talk.contacts.ContactsViewModel
1818
import com.nextcloud.talk.contextchat.ContextChatViewModel
19-
import com.nextcloud.talk.conversationcreation.ConversationCreationViewModel
19+
import com.nextcloud.talk.conversationcreation.viewmodel.ConversationCreationViewModel
2020
import com.nextcloud.talk.conversationinfo.viewmodel.ConversationInfoViewModel
2121
import com.nextcloud.talk.conversationinfoedit.viewmodel.ConversationInfoEditViewModel
2222
import com.nextcloud.talk.conversationlist.viewmodels.ConversationsListViewModel

app/src/main/java/com/nextcloud/talk/utils/preview/ComposePreviewUtils.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ import com.nextcloud.talk.chat.viewmodels.ChatViewModel
2727
import com.nextcloud.talk.contacts.ContactsRepository
2828
import com.nextcloud.talk.contacts.ContactsRepositoryImpl
2929
import com.nextcloud.talk.contacts.ContactsViewModel
30-
import com.nextcloud.talk.conversationcreation.ConversationCreationRepositoryImpl
31-
import com.nextcloud.talk.conversationcreation.ConversationCreationViewModel
30+
import com.nextcloud.talk.conversationcreation.data.ConversationCreationRepositoryImpl
31+
import com.nextcloud.talk.conversationcreation.viewmodel.ConversationCreationViewModel
3232
import com.nextcloud.talk.conversationlist.data.OfflineConversationsRepository
3333
import com.nextcloud.talk.conversationlist.data.network.ConversationsNetworkDataSource
3434
import com.nextcloud.talk.conversationlist.data.network.OfflineFirstConversationsRepository

0 commit comments

Comments
 (0)