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

Move 'Shared items' related classes to own package

Browse Source 
Signed-off-by: Tim Krüger <t@timkrueger.me>
This commit is contained in:
Tim Krüger 2022-05-11 18:48:00 +02:00
parent 716dcfe01d
commit fd76f8231d
No known key found for this signature in database
GPG Key ID: FECE3A7222C52A4E
14 changed files with 26 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -169,7 +169,7 @@
android:windowSoftInputMode="stateHidden" /> android:windowSoftInputMode="stateHidden" />
<activity <activity
android:name=".activities.SharedItemsActivity" android:name=".shareditems.activities.SharedItemsActivity"
android:theme="@style/AppTheme"/> android:theme="@style/AppTheme"/>
<receiver android:name=".receivers.PackageReplacedReceiver"> <receiver android:name=".receivers.PackageReplacedReceiver">

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

@ -103,7 +103,7 @@ import com.nextcloud.talk.BuildConfig
import com.nextcloud.talk.R import com.nextcloud.talk.R
import com.nextcloud.talk.activities.CallActivity import com.nextcloud.talk.activities.CallActivity
import com.nextcloud.talk.activities.MainActivity import com.nextcloud.talk.activities.MainActivity
import com.nextcloud.talk.activities.SharedItemsActivity import com.nextcloud.talk.shareditems.activities.SharedItemsActivity
import com.nextcloud.talk.activities.TakePhotoActivity import com.nextcloud.talk.activities.TakePhotoActivity
import com.nextcloud.talk.adapters.messages.IncomingLocationMessageViewHolder import com.nextcloud.talk.adapters.messages.IncomingLocationMessageViewHolder
import com.nextcloud.talk.adapters.messages.IncomingPreviewMessageViewHolder import com.nextcloud.talk.adapters.messages.IncomingPreviewMessageViewHolder

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

@ -51,7 +51,7 @@ import com.bluelinelabs.conductor.RouterTransaction
import com.bluelinelabs.conductor.changehandler.HorizontalChangeHandler import com.bluelinelabs.conductor.changehandler.HorizontalChangeHandler
import com.facebook.drawee.backends.pipeline.Fresco import com.facebook.drawee.backends.pipeline.Fresco
import com.nextcloud.talk.R import com.nextcloud.talk.R
import com.nextcloud.talk.activities.SharedItemsActivity import com.nextcloud.talk.shareditems.activities.SharedItemsActivity
import com.nextcloud.talk.adapters.items.ParticipantItem import com.nextcloud.talk.adapters.items.ParticipantItem
import com.nextcloud.talk.api.NcApi import com.nextcloud.talk.api.NcApi
import com.nextcloud.talk.application.NextcloudTalkApplication import com.nextcloud.talk.application.NextcloudTalkApplication

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

@ -22,7 +22,7 @@
package com.nextcloud.talk.dagger.modules package com.nextcloud.talk.dagger.modules
import com.nextcloud.talk.api.NcApi import com.nextcloud.talk.api.NcApi
import com.nextcloud.talk.repositories.SharedItemsRepository import com.nextcloud.talk.shareditems.repositories.SharedItemsRepository
import dagger.Module import dagger.Module
import dagger.Provides import dagger.Provides

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

@ -23,7 +23,7 @@ package com.nextcloud.talk.dagger.modules
import androidx.lifecycle.ViewModel import androidx.lifecycle.ViewModel
import androidx.lifecycle.ViewModelProvider import androidx.lifecycle.ViewModelProvider
import com.nextcloud.talk.viewmodels.SharedItemsViewModel import com.nextcloud.talk.shareditems.viewmodels.SharedItemsViewModel
import dagger.Binds import dagger.Binds
import dagger.MapKey import dagger.MapKey
import dagger.Module import dagger.Module

10
app/src/main/java/com/nextcloud/talk/activities/SharedItemsActivity.kt → app/src/main/java/com/nextcloud/talk/shareditems/activities/SharedItemsActivity.kt
View File

@ -1,4 +1,4 @@
package com.nextcloud.talk.activities package com.nextcloud.talk.shareditems.activities
import android.os.Bundle import android.os.Bundle
import android.util.Log import android.util.Log
@ -12,17 +12,17 @@ import androidx.recyclerview.widget.RecyclerView
import autodagger.AutoInjector import autodagger.AutoInjector
import com.google.android.material.tabs.TabLayout import com.google.android.material.tabs.TabLayout
import com.nextcloud.talk.R import com.nextcloud.talk.R
import com.nextcloud.talk.adapters.SharedItemsGridAdapter import com.nextcloud.talk.shareditems.adapters.SharedItemsGridAdapter
import com.nextcloud.talk.adapters.SharedItemsListAdapter import com.nextcloud.talk.shareditems.adapters.SharedItemsListAdapter
import com.nextcloud.talk.application.NextcloudTalkApplication import com.nextcloud.talk.application.NextcloudTalkApplication
import com.nextcloud.talk.databinding.ActivitySharedItemsBinding import com.nextcloud.talk.databinding.ActivitySharedItemsBinding
import com.nextcloud.talk.models.database.UserEntity import com.nextcloud.talk.models.database.UserEntity
import com.nextcloud.talk.repositories.SharedItemType import com.nextcloud.talk.shareditems.model.SharedItemType
import com.nextcloud.talk.utils.DisplayUtils import com.nextcloud.talk.utils.DisplayUtils
import com.nextcloud.talk.utils.bundle.BundleKeys.KEY_CONVERSATION_NAME import com.nextcloud.talk.utils.bundle.BundleKeys.KEY_CONVERSATION_NAME
import com.nextcloud.talk.utils.bundle.BundleKeys.KEY_ROOM_TOKEN import com.nextcloud.talk.utils.bundle.BundleKeys.KEY_ROOM_TOKEN
import com.nextcloud.talk.utils.bundle.BundleKeys.KEY_USER_ENTITY import com.nextcloud.talk.utils.bundle.BundleKeys.KEY_USER_ENTITY
import com.nextcloud.talk.viewmodels.SharedItemsViewModel import com.nextcloud.talk.shareditems.viewmodels.SharedItemsViewModel
import javax.inject.Inject import javax.inject.Inject
@AutoInjector(NextcloudTalkApplication::class) @AutoInjector(NextcloudTalkApplication::class)

4
app/src/main/java/com/nextcloud/talk/adapters/SharedItemsGridAdapter.kt → app/src/main/java/com/nextcloud/talk/shareditems/adapters/SharedItemsGridAdapter.kt
View File

@ -1,4 +1,4 @@
package com.nextcloud.talk.adapters package com.nextcloud.talk.shareditems.adapters
import android.net.Uri import android.net.Uri
import android.util.Log import android.util.Log
@ -16,7 +16,7 @@ import com.facebook.imagepipeline.common.RotationOptions
import com.facebook.imagepipeline.image.ImageInfo import com.facebook.imagepipeline.image.ImageInfo
import com.facebook.imagepipeline.request.ImageRequestBuilder import com.facebook.imagepipeline.request.ImageRequestBuilder
import com.nextcloud.talk.databinding.SharedItemGridBinding import com.nextcloud.talk.databinding.SharedItemGridBinding
import com.nextcloud.talk.repositories.SharedItem import com.nextcloud.talk.shareditems.model.SharedItem
import com.nextcloud.talk.utils.DrawableUtils import com.nextcloud.talk.utils.DrawableUtils
import com.nextcloud.talk.utils.FileViewerUtils import com.nextcloud.talk.utils.FileViewerUtils

4
app/src/main/java/com/nextcloud/talk/adapters/SharedItemsListAdapter.kt → app/src/main/java/com/nextcloud/talk/shareditems/adapters/SharedItemsListAdapter.kt
View File

@ -1,4 +1,4 @@
package com.nextcloud.talk.adapters package com.nextcloud.talk.shareditems.adapters
import android.net.Uri import android.net.Uri
import android.text.format.Formatter import android.text.format.Formatter
@ -16,7 +16,7 @@ import com.facebook.imagepipeline.common.RotationOptions
import com.facebook.imagepipeline.image.ImageInfo import com.facebook.imagepipeline.image.ImageInfo
import com.facebook.imagepipeline.request.ImageRequestBuilder import com.facebook.imagepipeline.request.ImageRequestBuilder
import com.nextcloud.talk.databinding.SharedItemListBinding import com.nextcloud.talk.databinding.SharedItemListBinding
import com.nextcloud.talk.repositories.SharedItem import com.nextcloud.talk.shareditems.model.SharedItem
import com.nextcloud.talk.utils.DateUtils import com.nextcloud.talk.utils.DateUtils
import com.nextcloud.talk.utils.DrawableUtils import com.nextcloud.talk.utils.DrawableUtils
import com.nextcloud.talk.utils.FileViewerUtils import com.nextcloud.talk.utils.FileViewerUtils

2
app/src/main/java/com/nextcloud/talk/repositories/SharedItem.kt → app/src/main/java/com/nextcloud/talk/shareditems/model/SharedItem.kt
View File

@ -1,4 +1,4 @@
package com.nextcloud.talk.repositories package com.nextcloud.talk.shareditems.model
import com.nextcloud.talk.models.database.UserEntity import com.nextcloud.talk.models.database.UserEntity

2
app/src/main/java/com/nextcloud/talk/repositories/SharedItemType.kt → app/src/main/java/com/nextcloud/talk/shareditems/model/SharedItemType.kt
View File

@ -1,4 +1,4 @@
package com.nextcloud.talk.repositories package com.nextcloud.talk.shareditems.model
import java.util.Locale import java.util.Locale

2
app/src/main/java/com/nextcloud/talk/repositories/SharedMediaItems.kt → app/src/main/java/com/nextcloud/talk/shareditems/model/SharedMediaItems.kt
View File

@ -1,4 +1,4 @@
package com.nextcloud.talk.repositories package com.nextcloud.talk.shareditems.model
class SharedMediaItems( class SharedMediaItems(
val items: List<SharedItem>, val items: List<SharedItem>,

5
app/src/main/java/com/nextcloud/talk/repositories/SharedItemsRepository.kt → app/src/main/java/com/nextcloud/talk/shareditems/repositories/SharedItemsRepository.kt
View File

@ -1,4 +1,4 @@
package com.nextcloud.talk.repositories package com.nextcloud.talk.shareditems.repositories
import android.util.Log import android.util.Log
import com.nextcloud.talk.R import com.nextcloud.talk.R
@ -6,6 +6,9 @@ import com.nextcloud.talk.api.NcApi
import com.nextcloud.talk.application.NextcloudTalkApplication.Companion.sharedApplication import com.nextcloud.talk.application.NextcloudTalkApplication.Companion.sharedApplication
import com.nextcloud.talk.models.database.UserEntity import com.nextcloud.talk.models.database.UserEntity
import com.nextcloud.talk.models.json.chat.ChatShareOverall import com.nextcloud.talk.models.json.chat.ChatShareOverall
import com.nextcloud.talk.shareditems.model.SharedItem
import com.nextcloud.talk.shareditems.model.SharedItemType
import com.nextcloud.talk.shareditems.model.SharedMediaItems
import com.nextcloud.talk.utils.ApiUtils import com.nextcloud.talk.utils.ApiUtils
import io.reactivex.Observable import io.reactivex.Observable
import retrofit2.Response import retrofit2.Response

8
app/src/main/java/com/nextcloud/talk/viewmodels/SharedItemsViewModel.kt → app/src/main/java/com/nextcloud/talk/shareditems/viewmodels/SharedItemsViewModel.kt
View File

@ -1,13 +1,13 @@
package com.nextcloud.talk.viewmodels package com.nextcloud.talk.shareditems.viewmodels
import android.util.Log import android.util.Log
import androidx.lifecycle.LiveData import androidx.lifecycle.LiveData
import androidx.lifecycle.MutableLiveData import androidx.lifecycle.MutableLiveData
import androidx.lifecycle.ViewModel import androidx.lifecycle.ViewModel
import com.nextcloud.talk.models.database.UserEntity import com.nextcloud.talk.models.database.UserEntity
import com.nextcloud.talk.repositories.SharedItemType import com.nextcloud.talk.shareditems.model.SharedItemType
import com.nextcloud.talk.repositories.SharedItemsRepository import com.nextcloud.talk.shareditems.repositories.SharedItemsRepository
import com.nextcloud.talk.repositories.SharedMediaItems import com.nextcloud.talk.shareditems.model.SharedMediaItems
import io.reactivex.Observer import io.reactivex.Observer
import io.reactivex.android.schedulers.AndroidSchedulers import io.reactivex.android.schedulers.AndroidSchedulers
import io.reactivex.disposables.Disposable import io.reactivex.disposables.Disposable

2
app/src/main/res/layout/activity_shared_items.xml
View File

@ -25,7 +25,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="@color/bg_default" android:background="@color/bg_default"
tools:context=".activities.SharedItemsActivity"> tools:context=".shareditems.activities.SharedItemsActivity">
<com.google.android.material.appbar.AppBarLayout <com.google.android.material.appbar.AppBarLayout
android:id="@+id/shared_items_appbar" android:id="@+id/shared_items_appbar"