Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

ドライブファイルのファイルのディレクトリ移動をできるようにした #1751

Merged
merged 15 commits into from
Jul 6, 2023
Merged

ドライブファイルのファイルのディレクトリ移動をできるようにした #1751

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
9e68607
fix: crush bug
pantasystem Jul 3, 2023
09f51f6
fix
pantasystem Jul 4, 2023
0f52149
feat: modelとdtoで分けるようにした
pantasystem Jul 6, 2023
c85aafe
feat: WIP
pantasystem Jul 6, 2023
c27655e
fix: ページネーションできるように修正
pantasystem Jul 6, 2023
f63239f
feat: 取得できなかった問題を修正
pantasystem Jul 6, 2023
051132c
feat: 未実装部分を実装
pantasystem Jul 6, 2023
4417c85
feat: 上限を超えてファイルを選択できないようにした
pantasystem Jul 6, 2023
b154b0f
feat: DriveViewModelで統一した
pantasystem Jul 6, 2023
9921a62
feat: DriveViewModelで統一した
pantasystem Jul 6, 2023
cecc8e4
refactor: 不要になった処理を削除
pantasystem Jul 6, 2023
e19fadc
refactor
pantasystem Jul 6, 2023
90af16d
feat: ファイルを移動できるようにした
pantasystem Jul 6, 2023
a1a0941
feat: Composable関数が過剰にRecomposeしないように
pantasystem Jul 6, 2023
0120935
fix: ファイル移動後は選択状態が解除されるようにした
pantasystem Jul 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions app/src/main/java/jp/panta/misskeyandroidclient/ui/main/MainActivityEventHandler.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ internal class MainActivityEventHandler(

private fun collectCrashlyticsCollectionState() {
lifecycleScope.launch {
lifecycleOwner.repeatOnLifecycle(Lifecycle.State.CREATED) {
lifecycleOwner.repeatOnLifecycle(Lifecycle.State.STARTED) {
mainViewModel.isShowFirebaseCrashlytics.collect {
if (it) {
ConfirmCrashlyticsDialog().show(
Expand All @@ -92,7 +92,7 @@ internal class MainActivityEventHandler(

private fun collectConfirmGoogleAnalyticsState() {
lifecycleScope.launch {
lifecycleOwner.repeatOnLifecycle(Lifecycle.State.CREATED) {
lifecycleOwner.repeatOnLifecycle(Lifecycle.State.STARTED) {
mainViewModel.isShowGoogleAnalyticsDialog.collect {
if (it) {
ConfirmGoogleAnalyticsDialog().show(
Expand Down Expand Up @@ -156,14 +156,14 @@ internal class MainActivityEventHandler(
lifecycleOwner.whenResumed {
// NOTE: 通知音を再生する
mainViewModel.newNotifications.collect {
if (ringtone.isPlaying) {
if (ringtone?.isPlaying == true) {
ringtone.stop()
}
if (
configStore.configState.value.isEnableNotificationSound
&& audioManager.ringerMode == AudioManager.RINGER_MODE_NORMAL
) {
ringtone.play()
ringtone?.play()
}
}
}
Expand Down
115 changes: 0 additions & 115 deletions app/src/test/java/jp/panta/misskeyandroidclient/model/drive/DirectoryPathTest.kt
View file
Open in desktop

This file was deleted.

143 changes: 0 additions & 143 deletions app/src/test/java/jp/panta/misskeyandroidclient/model/drive/DriveStoreTest.kt
View file
Open in desktop

This file was deleted.

54 changes: 0 additions & 54 deletions app/src/test/java/jp/panta/misskeyandroidclient/model/drive/SelectedFilePropertyIdsTest.kt
View file
Open in desktop

This file was deleted.

8 changes: 5 additions & 3 deletions modules/api/src/main/java/net/pantasystem/milktea/api/misskey/MisskeyAPI.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ import net.pantasystem.milktea.api.misskey.users.renote.mute.RenoteMuteDTO
import net.pantasystem.milktea.api.misskey.users.renote.mute.RenoteMutesRequest
import net.pantasystem.milktea.api.misskey.users.report.ReportDTO
import net.pantasystem.milktea.api.misskey.v13.EmojisResponse
import net.pantasystem.milktea.model.drive.Directory
import net.pantasystem.milktea.model.instance.Meta
import net.pantasystem.milktea.model.instance.RequestMeta
import net.pantasystem.milktea.model.messaging.RequestMessageHistory
Expand Down Expand Up @@ -208,10 +207,13 @@ interface MisskeyAPI {
suspend fun showFile(@Body req: ShowFile) : Response<FilePropertyDTO>

@POST("api/drive/folders")
suspend fun getFolders(@Body folderRequest: RequestFolder): Response<List<Directory>>
suspend fun getFolders(@Body folderRequest: RequestFolder): Response<List<DirectoryNetworkDTO>>

@POST("api/drive/folders/create")
suspend fun createFolder(@Body createFolder: CreateFolder): Response<Directory>
suspend fun createFolder(@Body createFolder: CreateFolder): Response<DirectoryNetworkDTO>

@POST("api/drive/folders/show")
suspend fun showFolder(@Body req: ShowFolderRequest): Response<DirectoryNetworkDTO>


//meta
Expand Down
Loading