gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-06-19 11:39:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

rename ContactsActivityCompose to ContactsActivity

Browse Source 
the old ContactsActivity was deleted, so ContactsActivityCompose becomes ContactsActivity now

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
This commit is contained in:
Marcel Hibbe 2025-03-07 15:12:40 +01:00
parent 1c7d84f90b
commit 23b03eead8
No known key found for this signature in database
GPG Key ID: C793F8B59F43CE7B
5 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/AndroidManifest.xml
View File

@ -126,7 +126,7 @@
android:name=".account.WebViewLoginActivity" android:name=".account.WebViewLoginActivity"
android:theme="@style/AppTheme" /> android:theme="@style/AppTheme" />
<activity android:name=".contacts.ContactsActivityCompose" <activity android:name=".contacts.ContactsActivity"
android:theme="@style/AppTheme"/> android:theme="@style/AppTheme"/>
<activity android:name=".conversationcreation.ConversationCreationActivity" <activity android:name=".conversationcreation.ConversationCreationActivity"

4
app/src/main/java/com/nextcloud/talk/contacts/ContactsActivityCompose.kt → app/src/main/java/com/nextcloud/talk/contacts/ContactsActivity.kt
View File

@ -25,7 +25,7 @@ import com.nextcloud.talk.utils.bundle.BundleKeys
import javax.inject.Inject import javax.inject.Inject
@AutoInjector(NextcloudTalkApplication::class) @AutoInjector(NextcloudTalkApplication::class)
class ContactsActivityCompose : BaseActivity() { class ContactsActivity : BaseActivity() {
@Inject @Inject
lateinit var viewModelFactory: ViewModelProvider.Factory lateinit var viewModelFactory: ViewModelProvider.Factory
@ -73,7 +73,7 @@ class ContactsActivityCompose : BaseActivity() {
class CompanionClass { class CompanionClass {
companion object { companion object {
internal val TAG = ContactsActivityCompose::class.simpleName internal val TAG = ContactsActivity::class.simpleName
internal const val ROOM_TYPE_ONE_ONE = "1" internal const val ROOM_TYPE_ONE_ONE = "1"
} }
} }

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

@ -84,8 +84,8 @@ import com.nextcloud.talk.R
import com.nextcloud.talk.activities.BaseActivity import com.nextcloud.talk.activities.BaseActivity
import com.nextcloud.talk.application.NextcloudTalkApplication import com.nextcloud.talk.application.NextcloudTalkApplication
import com.nextcloud.talk.chat.ChatActivity import com.nextcloud.talk.chat.ChatActivity
import com.nextcloud.talk.contacts.ContactsActivity
import com.nextcloud.talk.components.SetupSystemBars import com.nextcloud.talk.components.SetupSystemBars
import com.nextcloud.talk.contacts.ContactsActivityCompose
import com.nextcloud.talk.contacts.loadImage import com.nextcloud.talk.contacts.loadImage
import com.nextcloud.talk.extensions.getParcelableArrayListExtraProvider import com.nextcloud.talk.extensions.getParcelableArrayListExtraProvider
import com.nextcloud.talk.models.json.autocomplete.AutocompleteUser import com.nextcloud.talk.models.json.autocomplete.AutocompleteUser
@ -379,7 +379,7 @@ fun AddParticipants(
modifier = Modifier modifier = Modifier
.padding(start = 16.dp, bottom = 16.dp) .padding(start = 16.dp, bottom = 16.dp)
.clickable { .clickable {
val intent = Intent(context, ContactsActivityCompose::class.java) val intent = Intent(context, ContactsActivity::class.java)
intent.putParcelableArrayListExtra( intent.putParcelableArrayListExtra(
"selectedParticipants", "selectedParticipants",
participants as ArrayList<AutocompleteUser> participants as ArrayList<AutocompleteUser>
@ -417,7 +417,7 @@ fun AddParticipants(
modifier = Modifier modifier = Modifier
.fillMaxWidth() .fillMaxWidth()
.clickable { .clickable {
val intent = Intent(context, ContactsActivityCompose::class.java) val intent = Intent(context, ContactsActivity::class.java)
intent.putExtra(BundleKeys.KEY_ADD_PARTICIPANTS, true) intent.putExtra(BundleKeys.KEY_ADD_PARTICIPANTS, true)
launcher.launch(intent) launcher.launch(intent)
}, },

4
app/src/main/java/com/nextcloud/talk/conversationinfo/ConversationInfoActivity.kt
View File

@ -53,7 +53,7 @@ import com.nextcloud.talk.application.NextcloudTalkApplication
import com.nextcloud.talk.bottomsheet.items.BasicListItemWithImage import com.nextcloud.talk.bottomsheet.items.BasicListItemWithImage
import com.nextcloud.talk.bottomsheet.items.listItemsWithImage import com.nextcloud.talk.bottomsheet.items.listItemsWithImage
import com.nextcloud.talk.chat.ChatActivity import com.nextcloud.talk.chat.ChatActivity
import com.nextcloud.talk.contacts.ContactsActivityCompose import com.nextcloud.talk.contacts.ContactsActivity
import com.nextcloud.talk.conversationinfo.viewmodel.ConversationInfoViewModel import com.nextcloud.talk.conversationinfo.viewmodel.ConversationInfoViewModel
import com.nextcloud.talk.conversationinfoedit.ConversationInfoEditActivity import com.nextcloud.talk.conversationinfoedit.ConversationInfoEditActivity
import com.nextcloud.talk.data.user.model.User import com.nextcloud.talk.data.user.model.User
@ -694,7 +694,7 @@ class ConversationInfoActivity :
bundle.putStringArrayList(BundleKeys.KEY_EXISTING_PARTICIPANTS, existingParticipantsId) bundle.putStringArrayList(BundleKeys.KEY_EXISTING_PARTICIPANTS, existingParticipantsId)
bundle.putString(BundleKeys.KEY_TOKEN, conversation!!.token) bundle.putString(BundleKeys.KEY_TOKEN, conversation!!.token)
val intent = Intent(this, ContactsActivityCompose::class.java) val intent = Intent(this, ContactsActivity::class.java)
intent.putExtras(bundle) intent.putExtras(bundle)
addParticipantsResult.launch(intent) addParticipantsResult.launch(intent)

4
app/src/main/java/com/nextcloud/talk/conversationlist/ConversationsListActivity.kt
View File

@ -82,7 +82,7 @@ import com.nextcloud.talk.application.NextcloudTalkApplication
import com.nextcloud.talk.arbitrarystorage.ArbitraryStorageManager import com.nextcloud.talk.arbitrarystorage.ArbitraryStorageManager
import com.nextcloud.talk.chat.ChatActivity import com.nextcloud.talk.chat.ChatActivity
import com.nextcloud.talk.chat.viewmodels.ChatViewModel import com.nextcloud.talk.chat.viewmodels.ChatViewModel
import com.nextcloud.talk.contacts.ContactsActivityCompose import com.nextcloud.talk.contacts.ContactsActivity
import com.nextcloud.talk.contacts.ContactsUiState import com.nextcloud.talk.contacts.ContactsUiState
import com.nextcloud.talk.contacts.ContactsViewModel import com.nextcloud.talk.contacts.ContactsViewModel
import com.nextcloud.talk.contacts.RoomUiState import com.nextcloud.talk.contacts.RoomUiState
@ -1252,7 +1252,7 @@ class ConversationsListActivity :
conversation.type === ConversationEnums.ConversationType.ROOM_TYPE_ONE_TO_ONE_CALL conversation.type === ConversationEnums.ConversationType.ROOM_TYPE_ONE_TO_ONE_CALL
private fun showNewConversationsScreen() { private fun showNewConversationsScreen() {
val intent = Intent(context, ContactsActivityCompose::class.java) val intent = Intent(context, ContactsActivity::class.java)
startActivity(intent) startActivity(intent)
} }