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

Move to Core some classes used by kMail #839

Merged
merged 4 commits into from
Jul 19, 2022
Merged

Move to Core some classes used by kMail #839

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d40afe2
Move `SingleLiveEvent` to Core
KevinBoulongne Jul 18, 2022
b25c1fa
Move `DividerItemDecorator ` to Core
KevinBoulongne Jul 19, 2022
89acddf
Move `FormatterFileSize` to Core
KevinBoulongne Jul 19, 2022
8013729
Move Date formats also used by kMail to Core
KevinBoulongne Jul 19, 2022
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
2 changes: 1 addition & 1 deletion Core
Open in desktop
Submodule Core updated 8 files
+332 −0 schemas/com.infomaniak.lib.core.room.UserDatabase/3.json
+7 −7 src/main/java/com/infomaniak/lib/core/models/user/preferences/security/AuthDevices.kt
+11 −11 src/main/java/com/infomaniak/lib/core/models/user/preferences/security/Security.kt
+7 −10 src/main/java/com/infomaniak/lib/core/room/UserDatabase.kt
+81 −0 src/main/java/com/infomaniak/lib/core/room/UserMigration.kt
+123 −0 src/main/java/com/infomaniak/lib/core/utils/FormatterFileSize.kt
+68 −0 src/main/java/com/infomaniak/lib/core/utils/SingleLiveEvent.kt
+41 −0 src/main/java/com/infomaniak/lib/core/views/DividerItemDecorator.kt
1 change: 1 addition & 0 deletions app/src/main/java/com/infomaniak/drive/data/api/ApiRepository.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ import okhttp3.OkHttpClient
object ApiRepository : ApiRepositoryCore() {

var PER_PAGE = 200

private const val ACTIONS = "&actions[]=file_create" +
"&actions[]=file_rename" +
"&actions[]=file_move" +
Expand Down
1 change: 1 addition & 0 deletions app/src/main/java/com/infomaniak/drive/ui/MainViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ import com.infomaniak.drive.utils.SyncUtils.isSyncScheduled
import com.infomaniak.drive.utils.SyncUtils.syncImmediately
import com.infomaniak.lib.core.models.ApiResponse
import com.infomaniak.lib.core.networking.HttpClient
import com.infomaniak.lib.core.utils.SingleLiveEvent
import io.realm.Realm
import io.sentry.Sentry
import kotlinx.coroutines.*
Expand Down
4 changes: 2 additions & 2 deletions ...main/java/com/infomaniak/drive/ui/bottomSheetDialogs/SearchFilterDateBottomSheetDialog.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,11 +133,11 @@ class SearchFilterDateBottomSheetDialog : BottomSheetDialogFragment() {
}

private fun intervalAsText(start: Date, end: Date): String {
val longDate = "d MMM yyyy"
val longDate = FORMAT_DATE_CLEAR_MONTH_DAY_ONE_CHAR
val separator = " - "
val startFormat = when {
start.year() != end.year() -> start.format(longDate) + separator
start.month() != end.month() -> start.format("d MMM") + separator
start.month() != end.month() -> start.format(FORMAT_DATE_SHORT_DAY_ONE_CHAR) + separator
start.day() != end.day() -> start.format("d") + separator
else -> ""
}
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/com/infomaniak/drive/ui/fileList/FileListViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ import com.infomaniak.drive.ui.fileList.FileListFragment.FolderFilesResult
import com.infomaniak.drive.utils.AccountUtils
import com.infomaniak.drive.utils.FileId
import com.infomaniak.drive.utils.Position
import com.infomaniak.drive.utils.SingleLiveEvent
import com.infomaniak.lib.core.utils.SingleLiveEvent
import kotlinx.coroutines.*
import kotlinx.coroutines.sync.Mutex
import kotlinx.coroutines.sync.withLock
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/com/infomaniak/drive/ui/fileList/SearchFiltersViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import com.infomaniak.drive.data.models.ExtensionType
import com.infomaniak.drive.data.models.SearchCategoriesOwnershipFilter
import com.infomaniak.drive.data.models.SearchDateFilter
import com.infomaniak.drive.data.models.drive.Category
import com.infomaniak.drive.utils.SingleLiveEvent
import com.infomaniak.lib.core.utils.SingleLiveEvent

class SearchFiltersViewModel : ViewModel() {

Expand Down
1 change: 1 addition & 0 deletions app/src/main/java/com/infomaniak/drive/ui/menu/MenuFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ import com.infomaniak.drive.R
import com.infomaniak.drive.data.cache.DriveInfosController
import com.infomaniak.drive.data.models.UploadFile
import com.infomaniak.drive.utils.*
import com.infomaniak.lib.core.utils.FormatterFileSize
import com.infomaniak.lib.core.utils.UtilsUi.openUrl
import com.infomaniak.lib.core.utils.loadAvatar
import com.infomaniak.lib.core.utils.safeNavigate
Expand Down
5 changes: 2 additions & 3 deletions app/src/main/java/com/infomaniak/drive/ui/menu/TrashViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import androidx.lifecycle.liveData
import com.infomaniak.drive.data.api.ApiRepository
import com.infomaniak.drive.data.models.File
import com.infomaniak.drive.ui.fileList.FileListFragment
import com.infomaniak.drive.utils.SingleLiveEvent
import com.infomaniak.lib.core.utils.SingleLiveEvent
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.Job

Expand Down Expand Up @@ -110,5 +110,4 @@ class TrashViewModel : ViewModel() {
fun cancelTrashFileJob() {
getDeletedFilesJob.cancel()
}

}
}
4 changes: 2 additions & 2 deletions app/src/main/java/com/infomaniak/drive/ui/menu/settings/SelectMediaFoldersDialog.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@ import com.infomaniak.drive.data.models.MediaFolder
import com.infomaniak.drive.utils.DrivePermissions
import com.infomaniak.drive.utils.IsComplete
import com.infomaniak.drive.utils.MediaFoldersProvider
import com.infomaniak.drive.views.DividerItemDecorator
import com.infomaniak.drive.views.FullScreenBottomSheetDialog
import com.infomaniak.lib.core.views.DividerItemDecorator
import io.realm.Realm
import kotlinx.android.synthetic.main.fragment_bottom_sheet_select_media_folders.*
import kotlinx.coroutines.Dispatchers
Expand Down Expand Up @@ -175,4 +175,4 @@ class SelectMediaFoldersDialog : FullScreenBottomSheetDialog() {
elementsToRemove.postValue(deletedMediaFolderList)
}
}
}
}
1 change: 1 addition & 0 deletions app/src/main/java/com/infomaniak/drive/utils/FileItemUtils.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ import com.infomaniak.drive.ui.fileList.FileListFragment.Companion.MAX_DISPLAYED
import com.infomaniak.drive.ui.fileList.FileViewHolder
import com.infomaniak.drive.utils.Utils.ROOT_ID
import com.infomaniak.drive.views.CategoryIconView
import com.infomaniak.lib.core.utils.FormatterFileSize
import com.infomaniak.lib.core.utils.format
import io.sentry.Sentry
import kotlinx.android.synthetic.main.cardview_file_grid.view.filePreview2
Expand Down
121 changes: 0 additions & 121 deletions app/src/main/java/com/infomaniak/drive/utils/FormatterFileSize.kt
View file
Open in desktop

This file was deleted.

72 changes: 0 additions & 72 deletions app/src/main/java/com/infomaniak/drive/utils/SingleLiveEvent.kt
View file
Open in desktop

This file was deleted.

40 changes: 0 additions & 40 deletions app/src/main/java/com/infomaniak/drive/views/DividerItemDecorator.kt
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions app/src/main/java/com/infomaniak/drive/views/NotEnoughStorageView.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import com.infomaniak.drive.R
import com.infomaniak.drive.data.api.ApiRoutes
import com.infomaniak.drive.data.models.drive.Drive
import com.infomaniak.drive.utils.AccountUtils
import com.infomaniak.drive.utils.FormatterFileSize
import com.infomaniak.lib.core.utils.FormatterFileSize
import com.infomaniak.lib.core.utils.UtilsUi.openUrl
import kotlinx.android.synthetic.main.view_not_enough_storage.view.*

Expand Down Expand Up @@ -79,4 +79,4 @@ class NotEnoughStorageView @JvmOverloads constructor(
}
}
}
}
}