gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-07-17 09:45:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

Regroup stuff & start working on new group conversation

Browse Source 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
This commit is contained in:
Mario Danic 2020-01-29 23:28:26 +01:00
parent 2647e56b44
commit 9fb9f38974
No known key found for this signature in database
GPG Key ID: CDE0BBD2738C4CC0
16 changed files with 82 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/com/nextcloud/talk/activities/MainActivity.kt
View File

@ -43,7 +43,7 @@ import com.nextcloud.talk.controllers.base.BaseController
import com.nextcloud.talk.controllers.base.providers.ActionBarProvider
import com.nextcloud.talk.newarch.domain.repository.offline.UsersRepository
import com.nextcloud.talk.newarch.features.account.serverentry.ServerEntryView
import com.nextcloud.talk.newarch.features.contactsflow.ContactsView
import com.nextcloud.talk.newarch.features.contactsflow.contacts.ContactsView
import com.nextcloud.talk.newarch.features.conversationslist.ConversationsListView
import com.nextcloud.talk.newarch.local.models.UserNgEntity
import com.nextcloud.talk.utils.ConductorRemapping

2
app/src/main/java/com/nextcloud/talk/controllers/ConversationInfoController.kt
View File

@ -66,7 +66,7 @@ import com.nextcloud.talk.models.json.converters.EnumNotificationLevelConverter
import com.nextcloud.talk.models.json.generic.GenericOverall
import com.nextcloud.talk.models.json.participants.Participant
import com.nextcloud.talk.models.json.participants.ParticipantsOverall
import com.nextcloud.talk.newarch.features.contactsflow.ContactsView
import com.nextcloud.talk.newarch.features.contactsflow.contacts.ContactsView
import com.nextcloud.talk.newarch.local.models.UserNgEntity
import com.nextcloud.talk.newarch.local.models.getCredentials
import com.nextcloud.talk.newarch.utils.Images

2
app/src/main/java/com/nextcloud/talk/newarch/features/contactsflow/ContactPresenter.kt → app/src/main/java/com/nextcloud/talk/newarch/features/contactsflow/contacts/ContactPresenter.kt
View File

@ -20,7 +20,7 @@
*
*/
package com.nextcloud.talk.newarch.features.contactsflow
package com.nextcloud.talk.newarch.features.contactsflow.contacts
import android.content.Context
import android.view.ViewGroup

2
app/src/main/java/com/nextcloud/talk/newarch/features/contactsflow/ContactsUtils.kt → app/src/main/java/com/nextcloud/talk/newarch/features/contactsflow/contacts/ContactsUtils.kt
View File

@ -20,7 +20,7 @@
*
*/
package com.nextcloud.talk.newarch.features.contactsflow
package com.nextcloud.talk.newarch.features.contactsflow.contacts
enum class ParticipantElementType {
PARTICIPANT,

4
app/src/main/java/com/nextcloud/talk/newarch/features/contactsflow/ContactsView.kt → app/src/main/java/com/nextcloud/talk/newarch/features/contactsflow/contacts/ContactsView.kt
View File

@ -20,7 +20,7 @@
*
*/
package com.nextcloud.talk.newarch.features.contactsflow
package com.nextcloud.talk.newarch.features.contactsflow.contacts
import android.content.Context
import android.os.Bundle
@ -31,8 +31,6 @@ import androidx.core.view.isVisible
import androidx.lifecycle.observe
import androidx.recyclerview.widget.LinearLayoutManager
import androidx.recyclerview.widget.RecyclerView
import com.bluelinelabs.conductor.ControllerChangeHandler
import com.bluelinelabs.conductor.ControllerChangeType
import com.bluelinelabs.conductor.RouterTransaction
import com.bluelinelabs.conductor.autodispose.ControllerScopeProvider
import com.bluelinelabs.conductor.changehandler.HorizontalChangeHandler

2
app/src/main/java/com/nextcloud/talk/newarch/features/contactsflow/ContactsViewFooterSource.kt → app/src/main/java/com/nextcloud/talk/newarch/features/contactsflow/contacts/ContactsViewFooterSource.kt
View File

@ -20,7 +20,7 @@
*
*/
package com.nextcloud.talk.newarch.features.contactsflow
package com.nextcloud.talk.newarch.features.contactsflow.contacts
import android.content.Context
import com.nextcloud.talk.R

2
app/src/main/java/com/nextcloud/talk/newarch/features/contactsflow/ContactsViewHeaderSource.kt → app/src/main/java/com/nextcloud/talk/newarch/features/contactsflow/contacts/ContactsViewHeaderSource.kt
View File

@ -20,7 +20,7 @@
*
*/
package com.nextcloud.talk.newarch.features.contactsflow
package com.nextcloud.talk.newarch.features.contactsflow.contacts
import android.content.Context
import com.nextcloud.talk.R

2
app/src/main/java/com/nextcloud/talk/newarch/features/contactsflow/ContactsViewModel.kt → app/src/main/java/com/nextcloud/talk/newarch/features/contactsflow/contacts/ContactsViewModel.kt
View File

@ -20,7 +20,7 @@
*
*/
package com.nextcloud.talk.newarch.features.contactsflow
package com.nextcloud.talk.newarch.features.contactsflow.contacts
import android.app.Application
import androidx.lifecycle.LiveData

2
app/src/main/java/com/nextcloud/talk/newarch/features/contactsflow/ContactsViewModelFactory.kt → app/src/main/java/com/nextcloud/talk/newarch/features/contactsflow/contacts/ContactsViewModelFactory.kt
View File

@ -20,7 +20,7 @@
*
*/
package com.nextcloud.talk.newarch.features.contactsflow
package com.nextcloud.talk.newarch.features.contactsflow.contacts
import android.app.Application
import androidx.lifecycle.ViewModel

2
app/src/main/java/com/nextcloud/talk/newarch/features/contactsflow/ContactsViewOperationState.kt → app/src/main/java/com/nextcloud/talk/newarch/features/contactsflow/contacts/ContactsViewOperationState.kt
View File

@ -20,7 +20,7 @@
*
*/
package com.nextcloud.talk.newarch.features.contactsflow
package com.nextcloud.talk.newarch.features.contactsflow.contacts
import kotlinx.serialization.Serializable

2
app/src/main/java/com/nextcloud/talk/newarch/features/contactsflow/ContactsViewSource.kt → app/src/main/java/com/nextcloud/talk/newarch/features/contactsflow/contacts/ContactsViewSource.kt
View File

@ -20,7 +20,7 @@
*
*/
package com.nextcloud.talk.newarch.features.contactsflow
package com.nextcloud.talk.newarch.features.contactsflow.contacts
import androidx.lifecycle.LiveData
import com.nextcloud.talk.models.json.participants.Participant

2
app/src/main/java/com/nextcloud/talk/newarch/features/contactsflow/di/module/ContactsFlowModule.kt
View File

@ -26,7 +26,7 @@ import android.app.Application
import com.nextcloud.talk.newarch.domain.usecases.AddParticipantToConversationUseCase
import com.nextcloud.talk.newarch.domain.usecases.CreateConversationUseCase
import com.nextcloud.talk.newarch.domain.usecases.GetContactsUseCase
import com.nextcloud.talk.newarch.features.contactsflow.ContactsViewModelFactory
import com.nextcloud.talk.newarch.features.contactsflow.contacts.ContactsViewModelFactory
import com.nextcloud.talk.newarch.services.GlobalService
import org.koin.android.ext.koin.androidApplication
import org.koin.dsl.module

2
app/src/main/java/com/nextcloud/talk/newarch/features/contactsflow/source/FixedListSource.kt
View File

@ -22,7 +22,7 @@
package com.nextcloud.talk.newarch.features.contactsflow.source
import com.nextcloud.talk.newarch.features.contactsflow.ContactsViewSource
import com.nextcloud.talk.newarch.features.contactsflow.contacts.ContactsViewSource
import com.otaliastudios.elements.Source
import com.otaliastudios.elements.extensions.ListSource

3
app/src/main/java/com/nextcloud/talk/newarch/features/conversationsList/ConversationsListView.kt
View File

@ -47,7 +47,7 @@ import com.nextcloud.talk.controllers.bottomsheet.items.BasicListItemWithImage
import com.nextcloud.talk.controllers.bottomsheet.items.listItemsWithImage
import com.nextcloud.talk.models.json.conversations.Conversation
import com.nextcloud.talk.newarch.data.presenters.AdvancedEmptyPresenter
import com.nextcloud.talk.newarch.features.contactsflow.ContactsView
import com.nextcloud.talk.newarch.features.contactsflow.contacts.ContactsView
import com.nextcloud.talk.newarch.features.search.DebouncingTextWatcher
import com.nextcloud.talk.newarch.mvvm.BaseView
import com.nextcloud.talk.newarch.mvvm.ext.initRecyclerView
@ -63,7 +63,6 @@ import com.uber.autodispose.lifecycle.LifecycleScopeProvider
import kotlinx.android.synthetic.main.conversations_list_view.view.*
import kotlinx.android.synthetic.main.message_state.view.*
import kotlinx.android.synthetic.main.search_layout.*
import kotlinx.android.synthetic.main.search_layout.view.*
import org.koin.android.ext.android.inject
import org.parceler.Parcels

67
app/src/main/res/layout/new_group_conversation_view.xml Normal file
View File

@ -0,0 +1,67 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ /*
~ * Nextcloud Talk application
~ *
~ * @author Mario Danic
~ * Copyright (C) 2017-2020 Mario Danic <mario@lovelyhq.com>
~ *
~ * This program is free software: you can redistribute it and/or modify
~ * it under the terms of the GNU General Public License as published by
~ * the Free Software Foundation, either version 3 of the License, or
~ * at your option) any later version.
~ *
~ * This program is distributed in the hope that it will be useful,
~ * but WITHOUT ANY WARRANTY; without even the implied warranty of
~ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
~ * GNU General Public License for more details.
~ *
~ * You should have received a copy of the GNU General Public License
~ * along with this program. If not, see <http://www.gnu.org/licenses/>.
~ */
-->
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent">
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
<com.google.android.material.textfield.TextInputLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="@string/nc_call_name"
android:id="@+id/conversationNameTextInputLayout">
<com.google.android.material.textfield.TextInputEditText
android:layout_width="match_parent"
android:layout_margin="8dp"
android:layout_height="match_parent"/>
</com.google.android.material.textfield.TextInputLayout>
<com.google.android.material.switchmaterial.SwitchMaterial
android:layout_width="match_parent"
android:layout_below="@id/conversationNameTextInputLayout"
android:layout_height="wrap_content"
android:id="@+id/allowGuestsSwitchMaterial"
android:text="@string/nc_allow_guests"
android:layout_marginHorizontal="8dp"
android:layout_marginBottom="8dp">
</com.google.android.material.switchmaterial.SwitchMaterial>
<com.google.android.material.textfield.TextInputLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="@string/nc_password_optional"
android:layout_below="@id/allowGuestsSwitchMaterial"
android:id="@+id/passwordTextInputLayout">
<com.google.android.material.textfield.TextInputEditText
android:layout_width="match_parent"
android:layout_marginHorizontal="8dp"
android:layout_marginBottom="8dp"
android:layout_height="match_parent"/>
</com.google.android.material.textfield.TextInputLayout>
</RelativeLayout>
</ScrollView>

1
app/src/main/res/values/strings.xml
View File

@ -134,6 +134,7 @@
<string name="nc_no_proxy">No proxy</string>
<string name="nc_username">Username</string>
<string name="nc_password">Password</string>
<string name="nc_password_optional">Password (Optional)</string>
<string name="nc_password_redacted">Redacted for privacy reasons</string>
<string name="nc_conversation_link">Conversation link</string>
<string name="nc_new_password">New password</string>