From 8df62ef2b7e66467887568b7e1586552222e1724 Mon Sep 17 00:00:00 2001 From: Abdelilah El Aissaoui Date: Wed, 28 Sep 2022 01:48:34 +0200 Subject: [PATCH] Moved classes to match the package name --- build.gradle.kts | 2 +- .../{app => com/jetpackduba/gitnuro}/App.kt | 30 ++++++------- .../jetpackduba/gitnuro}/AppConstants.kt | 2 +- .../jetpackduba/gitnuro}/AppStateManager.kt | 6 +-- .../jetpackduba/gitnuro}/ErrorsManager.kt | 4 +- .../jetpackduba/gitnuro}/TempFilesManager.kt | 4 +- .../credentials/CredentialsStateManager.kt | 2 +- .../gitnuro}/credentials/GProcess.kt | 2 +- .../gitnuro}/credentials/GRemoteSession.kt | 8 ++-- .../gitnuro}/credentials/GSessionManager.kt | 2 +- .../credentials/HttpCredentialsProvider.kt | 8 ++-- .../jetpackduba/gitnuro}/di/AppComponent.kt | 8 ++-- .../jetpackduba/gitnuro}/di/TabComponent.kt | 6 +-- .../jetpackduba/gitnuro}/di/TabScope.kt | 2 +- .../gitnuro}/di/modules/NetworkModule.kt | 4 +- .../gitnuro}/exceptions/GitnuroException.kt | 2 +- .../exceptions/InvalidDirectoryException.kt | 2 +- .../exceptions/InvalidMessageException.kt | 2 +- .../exceptions/InvalidRemoteUrlException.kt | 2 +- .../exceptions/MissingDiffEntryException.kt | 2 +- .../exceptions/RebaseCancelledException.kt | 2 +- .../UncommitedChangesDetectedException.kt | 2 +- .../gitnuro}/extensions/DateExtensions.kt | 2 +- .../extensions/DiffEntryExtensions.kt | 12 +++--- .../extensions/InputStreamExtensions.kt | 2 +- .../gitnuro}/extensions/IntExtensions.kt | 2 +- .../extensions/LazyListStateExtensions.kt | 2 +- .../gitnuro}/extensions/ListExtensions.kt | 2 +- .../gitnuro}/extensions/ModifierExtensions.kt | 2 +- .../gitnuro}/extensions/RawTextExtensions.kt | 2 +- .../gitnuro}/extensions/RefExtensions.kt | 2 +- .../extensions/RepositoryStateExtensions.kt | 2 +- .../extensions/RevCommitExtensions.kt | 2 +- .../extensions/SemaphoreExtensions.kt | 2 +- .../jetpackduba/gitnuro}/extensions/Shell.kt | 4 +- .../extensions/StateManagementUtils.kt | 2 +- .../gitnuro}/extensions/StatusExtensions.kt | 2 +- .../gitnuro}/extensions/StringExtensions.kt | 2 +- .../gitnuro}/extensions/SystemUtils.kt | 4 +- .../gitnuro}/extensions/WindowPlacement.kt | 4 +- .../jetpackduba/gitnuro}/git/CloneStatus.kt | 2 +- .../jetpackduba/gitnuro}/git/DiffEntryType.kt | 10 ++--- .../gitnuro}/git/FileChangesWatcher.kt | 8 ++-- .../gitnuro}/git/RawFileManager.kt | 6 +-- .../jetpackduba/gitnuro}/git/TabState.kt | 12 +++--- .../jetpackduba/gitnuro}/git/TaskEvent.kt | 2 +- .../gitnuro}/git/author/LoadAuthorUseCase.kt | 4 +- .../gitnuro}/git/author/SaveAuthorUseCase.kt | 4 +- .../git/branches/CheckoutRefUseCase.kt | 6 +-- .../branches/CreateBranchOnCommitUseCase.kt | 2 +- .../git/branches/CreateBranchUseCase.kt | 2 +- .../git/branches/DeleteBranchUseCase.kt | 2 +- .../DeleteLocallyRemoteBranchesUseCase.kt | 2 +- .../git/branches/GetBranchesUseCase.kt | 2 +- .../git/branches/GetCurrentBranchUseCase.kt | 2 +- .../git/branches/GetRemoteBranchesUseCase.kt | 2 +- .../git/branches/MergeBranchUseCase.kt | 4 +- .../gitnuro}/git/diff/FormatDiffUseCase.kt | 4 +- .../GenerateSplitHunkFromDiffResultUseCase.kt | 2 +- .../git/diff/GetCommitDiffEntriesUseCase.kt | 4 +- .../GetDiffEntryForUncommitedDiffUseCase.kt | 12 +++--- .../jetpackduba/gitnuro}/git/diff/Hunk.kt | 2 +- .../gitnuro}/git/diff/HunkDiffGenerator.kt | 8 ++-- .../gitnuro}/git/graph/GraphCommitList.kt | 2 +- .../gitnuro}/git/graph/GraphLane.kt | 2 +- .../gitnuro}/git/graph/GraphNode.kt | 2 +- .../gitnuro}/git/graph/GraphWalk.kt | 2 +- .../gitnuro}/git/graph/IGraphNode.kt | 2 +- .../git/graph/UncommitedChangesGraphNode.kt | 2 +- .../git/log/CheckHasPreviousCommitsUseCase.kt | 2 +- .../gitnuro}/git/log/CheckoutCommitUseCase.kt | 2 +- .../git/log/CherryPickCommitUseCase.kt | 2 +- .../git/log/GetLastCommitMessageUseCase.kt | 2 +- .../gitnuro}/git/log/GetLogUseCase.kt | 6 +-- .../gitnuro}/git/log/ResetToCommitUseCase.kt | 2 +- .../gitnuro}/git/log/RevertCommitUseCase.kt | 2 +- .../gitnuro}/git/rebase/AbortRebaseUseCase.kt | 2 +- .../git/rebase/ContinueRebaseUseCase.kt | 2 +- .../GetRebaseLinesFullMessageUseCase.kt | 2 +- .../git/rebase/RebaseBranchUseCase.kt | 4 +- .../rebase/ResumeRebaseInteractiveUseCase.kt | 4 +- .../gitnuro}/git/rebase/SkipRebaseUseCase.kt | 2 +- .../rebase/StartRebaseInteractiveUseCase.kt | 4 +- .../CloneRepositoryUseCase.kt | 4 +- .../DeleteRemoteBranchUseCase.kt | 8 ++-- .../FetchAllBranchesUseCase.kt | 2 +- .../HandleTransportUseCase.kt | 6 +-- .../remote_operations/PullBranchUseCase.kt | 2 +- .../PullFromSpecificBranchUseCase.kt | 6 +-- .../remote_operations/PushBranchUseCase.kt | 6 +-- .../PushToSpecificBranchUseCase.kt | 10 ++--- .../gitnuro}/git/remotes/AddRemoteUseCase.kt | 2 +- .../git/remotes/DeleteRemoteUseCase.kt | 2 +- .../gitnuro}/git/remotes/GetRemotesUseCase.kt | 2 +- .../gitnuro}/git/remotes/RemoteInfo.kt | 2 +- .../git/remotes/UpdateRemoteUseCase.kt | 2 +- .../repository/GetRepositoryStateUseCase.kt | 2 +- .../repository/InitLocalRepositoryUseCase.kt | 2 +- .../git/repository/OpenRepositoryUseCase.kt | 2 +- .../repository/ResetRepositoryStateUseCase.kt | 2 +- .../gitnuro}/git/stash/ApplyStashUseCase.kt | 2 +- .../gitnuro}/git/stash/DeleteStashUseCase.kt | 2 +- .../gitnuro}/git/stash/GetStashListUseCase.kt | 2 +- .../gitnuro}/git/stash/PopLastStashUseCase.kt | 2 +- .../gitnuro}/git/stash/PopStashUseCase.kt | 2 +- .../gitnuro}/git/stash/StashChangesUseCase.kt | 2 +- .../git/submodules/GetSubmodulesUseCase.kt | 2 +- .../submodules/InitalizeSubmoduleUseCase.kt | 2 +- .../git/submodules/UpdateSubmoduleUseCase.kt | 4 +- .../git/tags/CreateTagOnCommitUseCase.kt | 2 +- .../gitnuro}/git/tags/DeleteTagUseCase.kt | 2 +- .../gitnuro}/git/tags/GetTagsUseCase.kt | 2 +- .../CheckHasUncommitedChangedUseCase.kt | 4 +- .../gitnuro}/git/workspace/DoCommitUseCase.kt | 2 +- .../workspace/GetLinesFromRawTextUseCase.kt | 2 +- .../git/workspace/GetLinesFromTextUseCase.kt | 2 +- .../git/workspace/GetStagedUseCase.kt | 4 +- .../git/workspace/GetStatusSummaryUseCase.kt | 4 +- .../git/workspace/GetStatusUseCase.kt | 2 +- .../git/workspace/GetUnstagedUseCase.kt | 4 +- .../gitnuro}/git/workspace/HunkEdit.kt | 2 +- .../git/workspace/ResetEntryUseCase.kt | 2 +- .../git/workspace/ResetHunkUseCase.kt | 8 ++-- .../gitnuro}/git/workspace/StageAllUseCase.kt | 2 +- .../git/workspace/StageEntryUseCase.kt | 2 +- .../git/workspace/StageHunkUseCase.kt | 10 ++--- .../workspace/StageUntrackedFileUseCase.kt | 2 +- .../gitnuro}/git/workspace/Status.kt | 5 ++- .../git/workspace/UnstageAllUseCase.kt | 2 +- .../git/workspace/UnstageEntryUseCase.kt | 2 +- .../git/workspace/UnstageHunkUseCase.kt | 10 ++--- .../gitnuro}/images/ImagesCache.kt | 2 +- .../gitnuro}/images/InMemoryImagesCache.kt | 2 +- .../gitnuro}/images/NetworkImageLoader.kt | 10 ++--- .../gitnuro}/keybindings/Keybinding.kt | 6 +-- .../jetpackduba/gitnuro}/logging/logger.kt | 2 +- .../{ => com/jetpackduba/gitnuro}/main.kt | 2 +- .../jetpackduba/gitnuro}/models/AuthorInfo.kt | 2 +- .../gitnuro}/models/AuthorInfoSimple.kt | 2 +- .../gitnuro}/preferences/AppSettings.kt | 12 +++--- .../preferences/WindowsPlacementPreference.kt | 2 +- .../jetpackduba/gitnuro}/theme/Color.kt | 2 +- .../gitnuro}/theme/ColorsScheme.kt | 2 +- .../gitnuro}/theme/ComponentsColors.kt | 2 +- .../jetpackduba/gitnuro}/theme/Theme.kt | 4 +- .../jetpackduba/gitnuro}/theme/Typography.kt | 2 +- .../jetpackduba/gitnuro}/ui/AppTab.kt | 14 +++---- .../jetpackduba/gitnuro}/ui/Blame.kt | 22 +++++----- .../jetpackduba/gitnuro}/ui/Branches.kt | 16 +++---- .../jetpackduba/gitnuro}/ui/CommitChanges.kt | 20 ++++----- .../jetpackduba/gitnuro}/ui/FileHistory.kt | 34 +++++++-------- .../jetpackduba/gitnuro}/ui/Menu.kt | 10 ++--- .../gitnuro}/ui/RebaseInteractive.kt | 16 +++---- .../jetpackduba/gitnuro}/ui/Remotes.kt | 22 +++++----- .../jetpackduba/gitnuro}/ui/RepositoryOpen.kt | 26 ++++++------ .../jetpackduba/gitnuro}/ui/SideMenuUtils.kt | 2 +- .../jetpackduba/gitnuro}/ui/Stashes.kt | 12 +++--- .../jetpackduba/gitnuro}/ui/Submodules.kt | 14 +++---- .../jetpackduba/gitnuro}/ui/SystemDialogs.kt | 10 ++--- .../jetpackduba/gitnuro}/ui/Tags.kt | 12 +++--- .../gitnuro}/ui/UncommitedChanges.kt | 32 +++++++------- .../jetpackduba/gitnuro}/ui/WelcomePage.kt | 24 +++++------ .../components/AdjustableOutlinedTextField.kt | 7 +--- .../gitnuro}/ui/components/AvatarImage.kt | 6 +-- .../gitnuro}/ui/components/DialogBox.kt | 2 +- .../gitnuro}/ui/components/Expandable.kt | 4 +- .../gitnuro}/ui/components/PrimaryButton.kt | 4 +- .../ui/components/RepositoriesTabPanel.kt | 14 +++---- .../ui/components/ScrollableColumn.kt | 6 +-- .../ui/components/ScrollableLazyColumn.kt | 6 +-- .../gitnuro}/ui/components/SecondaryButton.kt | 4 +- .../gitnuro}/ui/components/SideMenuEntry.kt | 8 ++-- .../gitnuro}/ui/components/SideMenuPanel.kt | 2 +- .../ui/components/SideMenuSubentry.kt | 6 +-- .../gitnuro}/ui/components/TextLink.kt | 8 ++-- .../gitnuro}/ui/components/Tooltip.kt | 2 +- .../gitnuro}/ui/components/TooltipText.kt | 2 +- .../ui/context_menu/BranchContextMenu.kt | 6 +-- .../CommitedChangesEntriesContextMenu.kt | 2 +- .../ui/context_menu/DropDownContent.kt | 2 +- .../ui/context_menu/DropDownContentData.kt | 2 +- .../ui/context_menu/LogContextMenu.kt | 3 +- .../ui/context_menu/PullContextMenu.kt | 2 +- .../ui/context_menu/PushContextMenu.kt | 2 +- .../context_menu/RemoteBranchesContextMenu.kt | 2 +- .../ui/context_menu/RemoteContextMenu.kt | 2 +- .../RepositoryAdditionalOptionsMenu.kt | 2 +- .../context_menu/StagedEntriesContextMenu.kt | 6 +-- .../ui/context_menu/StashContextMenu.kt | 2 +- .../ui/context_menu/StashesContextMenu.kt | 2 +- .../context_menu/StatusEntriesContextMenu.kt | 6 +-- .../ui/context_menu/SubmoduleContextMenu.kt | 2 +- .../ui/context_menu/TagContextMenu.kt | 2 +- .../gitnuro}/ui/dialogs/AppInfoDialog.kt | 14 +++---- .../gitnuro}/ui/dialogs/AuthorDialog.kt | 14 +++---- .../gitnuro}/ui/dialogs/CloneDialog.kt | 18 ++++---- .../gitnuro}/ui/dialogs/EditRemotesDialog.kt | 12 +++--- .../gitnuro}/ui/dialogs/MaterialDialog.kt | 8 ++-- .../gitnuro}/ui/dialogs/NewBranchDialog.kt | 12 +++--- .../gitnuro}/ui/dialogs/NewTagDialog.kt | 12 +++--- .../gitnuro}/ui/dialogs/PasswordDialog.kt | 12 +++--- .../gitnuro}/ui/dialogs/ResetDialog.kt | 10 ++--- .../ui/dialogs/StashWithMessageDialog.kt | 12 +++--- .../gitnuro}/ui/dialogs/UserPasswordDialog.kt | 14 +++---- .../ui/dialogs/settings/SettingsDialog.kt | 22 +++++----- .../jetpackduba/gitnuro}/ui/diff/Diff.kt | 35 ++++++++-------- .../gitnuro}/ui/dropdowns/DropDownOption.kt | 2 +- .../gitnuro}/ui/dropdowns/ScaleDropDown.kt | 2 +- .../jetpackduba/gitnuro}/ui/log/Log.kt | 42 ++++++++++--------- .../jetpackduba/gitnuro}/ui/log/LogDialog.kt | 4 +- .../jetpackduba/gitnuro}/updates/Update.kt | 2 +- .../gitnuro}/updates/UpdatesRepository.kt | 4 +- .../gitnuro}/updates/UpdatesWebService.kt | 2 +- .../gitnuro}/viewmodels/AuthorViewModel.kt | 14 +++---- .../gitnuro}/viewmodels/BranchesViewModel.kt | 15 +++---- .../gitnuro}/viewmodels/CloneViewModel.kt | 8 ++-- .../viewmodels/CommitChangesViewModel.kt | 10 ++--- .../gitnuro}/viewmodels/DiffViewModel.kt | 22 +++++----- .../viewmodels/ExpandableViewModel.kt | 2 +- .../gitnuro}/viewmodels/HistoryViewModel.kt | 20 +++++---- .../gitnuro}/viewmodels/LogViewModel.kt | 40 +++++++++--------- .../gitnuro}/viewmodels/MenuViewModel.kt | 18 ++++---- .../viewmodels/RebaseInteractiveViewModel.kt | 18 ++++---- .../gitnuro}/viewmodels/RemotesViewModel.kt | 17 ++++---- .../gitnuro}/viewmodels/SettingsViewModel.kt | 6 +-- .../gitnuro}/viewmodels/StashesViewModel.kt | 16 +++---- .../gitnuro}/viewmodels/StatusViewModel.kt | 25 +++++------ .../viewmodels/SubmodulesViewModel.kt | 12 +++--- .../gitnuro}/viewmodels/TabViewModel.kt | 35 ++++++++-------- .../gitnuro}/viewmodels/TagsViewModel.kt | 12 +++--- .../gitnuro}/viewmodels/ViewDiffResult.kt | 6 +-- .../jetpackduba/gitnuro}/app/TestUtils.kt | 2 +- .../app/git/BeforeRepoAllTestsExtension.kt | 13 +++--- .../gitnuro}/app/git/BranchesManagerTest.kt | 4 +- .../diff/GetCommitDiffEntriesUseCaseTest.kt | 4 +- ...erateSplitHunkFromDiffResultUseCaseTest.kt | 4 +- 236 files changed, 758 insertions(+), 753 deletions(-) rename src/main/kotlin/{app => com/jetpackduba/gitnuro}/App.kt (92%) rename src/main/kotlin/{app => com/jetpackduba/gitnuro}/AppConstants.kt (98%) rename src/main/kotlin/{app => com/jetpackduba/gitnuro}/AppStateManager.kt (95%) rename src/main/kotlin/{app => com/jetpackduba/gitnuro}/ErrorsManager.kt (93%) rename src/main/kotlin/{app => com/jetpackduba/gitnuro}/TempFilesManager.kt (83%) rename src/main/kotlin/{app => com/jetpackduba/gitnuro}/credentials/CredentialsStateManager.kt (96%) rename src/main/kotlin/{app => com/jetpackduba/gitnuro}/credentials/GProcess.kt (97%) rename src/main/kotlin/{app => com/jetpackduba/gitnuro}/credentials/GRemoteSession.kt (90%) rename src/main/kotlin/{app => com/jetpackduba/gitnuro}/credentials/GSessionManager.kt (95%) rename src/main/kotlin/{app => com/jetpackduba/gitnuro}/credentials/HttpCredentialsProvider.kt (86%) rename src/main/kotlin/{app => com/jetpackduba/gitnuro}/di/AppComponent.kt (55%) rename src/main/kotlin/{app => com/jetpackduba/gitnuro}/di/TabComponent.kt (60%) rename src/main/kotlin/{app => com/jetpackduba/gitnuro}/di/TabScope.kt (74%) rename src/main/kotlin/{app => com/jetpackduba/gitnuro}/di/modules/NetworkModule.kt (81%) rename src/main/kotlin/{app => com/jetpackduba/gitnuro}/exceptions/GitnuroException.kt (61%) rename src/main/kotlin/{app => com/jetpackduba/gitnuro}/exceptions/InvalidDirectoryException.kt (61%) rename src/main/kotlin/{app => com/jetpackduba/gitnuro}/exceptions/InvalidMessageException.kt (60%) rename src/main/kotlin/{app => com/jetpackduba/gitnuro}/exceptions/InvalidRemoteUrlException.kt (61%) rename src/main/kotlin/{app => com/jetpackduba/gitnuro}/exceptions/MissingDiffEntryException.kt (61%) rename src/main/kotlin/{app => com/jetpackduba/gitnuro}/exceptions/RebaseCancelledException.kt (61%) rename src/main/kotlin/{app => com/jetpackduba/gitnuro}/exceptions/UncommitedChangesDetectedException.kt (64%) rename src/main/kotlin/{app => com/jetpackduba/gitnuro}/extensions/DateExtensions.kt (96%) rename src/main/kotlin/{app => com/jetpackduba/gitnuro}/extensions/DiffEntryExtensions.kt (92%) rename src/main/kotlin/{app => com/jetpackduba/gitnuro}/extensions/InputStreamExtensions.kt (88%) rename src/main/kotlin/{app => com/jetpackduba/gitnuro}/extensions/IntExtensions.kt (91%) rename src/main/kotlin/{app => com/jetpackduba/gitnuro}/extensions/LazyListStateExtensions.kt (87%) rename src/main/kotlin/{app => com/jetpackduba/gitnuro}/extensions/ListExtensions.kt (85%) rename src/main/kotlin/{app => com/jetpackduba/gitnuro}/extensions/ModifierExtensions.kt (94%) rename src/main/kotlin/{app => com/jetpackduba/gitnuro}/extensions/RawTextExtensions.kt (85%) rename src/main/kotlin/{app => com/jetpackduba/gitnuro}/extensions/RefExtensions.kt (98%) rename src/main/kotlin/{app => com/jetpackduba/gitnuro}/extensions/RepositoryStateExtensions.kt (90%) rename src/main/kotlin/{app => com/jetpackduba/gitnuro}/extensions/RevCommitExtensions.kt (84%) rename src/main/kotlin/{app => com/jetpackduba/gitnuro}/extensions/SemaphoreExtensions.kt (85%) rename src/main/kotlin/{app => com/jetpackduba/gitnuro}/extensions/Shell.kt (95%) rename src/main/kotlin/{app => com/jetpackduba/gitnuro}/extensions/StateManagementUtils.kt (94%) rename src/main/kotlin/{app => com/jetpackduba/gitnuro}/extensions/StatusExtensions.kt (73%) rename src/main/kotlin/{app => com/jetpackduba/gitnuro}/extensions/StringExtensions.kt (96%) rename src/main/kotlin/{app => com/jetpackduba/gitnuro}/extensions/SystemUtils.kt (96%) rename src/main/kotlin/{app => com/jetpackduba/gitnuro}/extensions/WindowPlacement.kt (89%) rename src/main/kotlin/{app => com/jetpackduba/gitnuro}/git/CloneStatus.kt (97%) rename src/main/kotlin/{app => com/jetpackduba/gitnuro}/git/DiffEntryType.kt (84%) rename src/main/kotlin/{app => com/jetpackduba/gitnuro}/git/FileChangesWatcher.kt (95%) rename src/main/kotlin/{app => com/jetpackduba/gitnuro}/git/RawFileManager.kt (96%) rename src/main/kotlin/{app => com/jetpackduba/gitnuro}/git/TabState.kt (96%) rename src/main/kotlin/{app => com/jetpackduba/gitnuro}/git/TaskEvent.kt (80%) rename src/main/kotlin/{app => com/jetpackduba/gitnuro}/git/author/LoadAuthorUseCase.kt (91%) rename src/main/kotlin/{app => com/jetpackduba/gitnuro}/git/author/SaveAuthorUseCase.kt (93%) rename src/main/kotlin/{app => com/jetpackduba/gitnuro}/git/branches/CheckoutRefUseCase.kt (83%) rename src/main/kotlin/{app => com/jetpackduba/gitnuro}/git/branches/CreateBranchOnCommitUseCase.kt (92%) rename src/main/kotlin/{app => com/jetpackduba/gitnuro}/git/branches/CreateBranchUseCase.kt (90%) rename src/main/kotlin/{app => com/jetpackduba/gitnuro}/git/branches/DeleteBranchUseCase.kt (91%) rename src/main/kotlin/{app => com/jetpackduba/gitnuro}/git/branches/DeleteLocallyRemoteBranchesUseCase.kt (91%) rename src/main/kotlin/{app => com/jetpackduba/gitnuro}/git/branches/GetBranchesUseCase.kt (89%) rename src/main/kotlin/{app => com/jetpackduba/gitnuro}/git/branches/GetCurrentBranchUseCase.kt (94%) rename src/main/kotlin/{app => com/jetpackduba/gitnuro}/git/branches/GetRemoteBranchesUseCase.kt (91%) rename src/main/kotlin/{app => com/jetpackduba/gitnuro}/git/branches/MergeBranchUseCase.kt (88%) rename src/main/kotlin/{app => com/jetpackduba/gitnuro}/git/diff/FormatDiffUseCase.kt (95%) rename src/main/kotlin/{app => com/jetpackduba/gitnuro}/git/diff/GenerateSplitHunkFromDiffResultUseCase.kt (98%) rename src/main/kotlin/{app => com/jetpackduba/gitnuro}/git/diff/GetCommitDiffEntriesUseCase.kt (94%) rename src/main/kotlin/{app => com/jetpackduba/gitnuro}/git/diff/GetDiffEntryForUncommitedDiffUseCase.kt (80%) rename src/main/kotlin/{app => com/jetpackduba/gitnuro}/git/diff/Hunk.kt (92%) rename src/main/kotlin/{app => com/jetpackduba/gitnuro}/git/diff/HunkDiffGenerator.kt (97%) rename src/main/kotlin/{app => com/jetpackduba/gitnuro}/git/graph/GraphCommitList.kt (99%) rename src/main/kotlin/{app => com/jetpackduba/gitnuro}/git/graph/GraphLane.kt (64%) rename src/main/kotlin/{app => com/jetpackduba/gitnuro}/git/graph/GraphNode.kt (98%) rename src/main/kotlin/{app => com/jetpackduba/gitnuro}/git/graph/GraphWalk.kt (99%) rename src/main/kotlin/{app => com/jetpackduba/gitnuro}/git/graph/IGraphNode.kt (70%) rename src/main/kotlin/{app => com/jetpackduba/gitnuro}/git/graph/UncommitedChangesGraphNode.kt (89%) rename src/main/kotlin/{app => com/jetpackduba/gitnuro}/git/log/CheckHasPreviousCommitsUseCase.kt (93%) rename src/main/kotlin/{app => com/jetpackduba/gitnuro}/git/log/CheckoutCommitUseCase.kt (91%) rename src/main/kotlin/{app => com/jetpackduba/gitnuro}/git/log/CherryPickCommitUseCase.kt (92%) rename src/main/kotlin/{app => com/jetpackduba/gitnuro}/git/log/GetLastCommitMessageUseCase.kt (94%) rename src/main/kotlin/{app => com/jetpackduba/gitnuro}/git/log/GetLogUseCase.kt (91%) rename src/main/kotlin/{app => com/jetpackduba/gitnuro}/git/log/ResetToCommitUseCase.kt (95%) rename src/main/kotlin/{app => com/jetpackduba/gitnuro}/git/log/RevertCommitUseCase.kt (91%) rename src/main/kotlin/{app => com/jetpackduba/gitnuro}/git/rebase/AbortRebaseUseCase.kt (90%) rename src/main/kotlin/{app => com/jetpackduba/gitnuro}/git/rebase/ContinueRebaseUseCase.kt (90%) rename src/main/kotlin/{app => com/jetpackduba/gitnuro}/git/rebase/GetRebaseLinesFullMessageUseCase.kt (97%) rename src/main/kotlin/{app => com/jetpackduba/gitnuro}/git/rebase/RebaseBranchUseCase.kt (86%) rename src/main/kotlin/{app => com/jetpackduba/gitnuro}/git/rebase/ResumeRebaseInteractiveUseCase.kt (86%) rename src/main/kotlin/{app => com/jetpackduba/gitnuro}/git/rebase/SkipRebaseUseCase.kt (90%) rename src/main/kotlin/{app => com/jetpackduba/gitnuro}/git/rebase/StartRebaseInteractiveUseCase.kt (87%) rename src/main/kotlin/{app => com/jetpackduba/gitnuro}/git/remote_operations/CloneRepositoryUseCase.kt (96%) rename src/main/kotlin/{app => com/jetpackduba/gitnuro}/git/remote_operations/DeleteRemoteBranchUseCase.kt (88%) rename src/main/kotlin/{app => com/jetpackduba/gitnuro}/git/remote_operations/FetchAllBranchesUseCase.kt (93%) rename src/main/kotlin/{app => com/jetpackduba/gitnuro}/git/remote_operations/HandleTransportUseCase.kt (76%) rename src/main/kotlin/{app => com/jetpackduba/gitnuro}/git/remote_operations/PullBranchUseCase.kt (95%) rename src/main/kotlin/{app => com/jetpackduba/gitnuro}/git/remote_operations/PullFromSpecificBranchUseCase.kt (90%) rename src/main/kotlin/{app => com/jetpackduba/gitnuro}/git/remote_operations/PushBranchUseCase.kt (89%) rename src/main/kotlin/{app => com/jetpackduba/gitnuro}/git/remote_operations/PushToSpecificBranchUseCase.kt (85%) rename src/main/kotlin/{app => com/jetpackduba/gitnuro}/git/remotes/AddRemoteUseCase.kt (91%) rename src/main/kotlin/{app => com/jetpackduba/gitnuro}/git/remotes/DeleteRemoteUseCase.kt (89%) rename src/main/kotlin/{app => com/jetpackduba/gitnuro}/git/remotes/GetRemotesUseCase.kt (94%) rename src/main/kotlin/{app => com/jetpackduba/gitnuro}/git/remotes/RemoteInfo.kt (78%) rename src/main/kotlin/{app => com/jetpackduba/gitnuro}/git/remotes/UpdateRemoteUseCase.kt (93%) rename src/main/kotlin/{app => com/jetpackduba/gitnuro}/git/repository/GetRepositoryStateUseCase.kt (89%) rename src/main/kotlin/{app => com/jetpackduba/gitnuro}/git/repository/InitLocalRepositoryUseCase.kt (91%) rename src/main/kotlin/{app => com/jetpackduba/gitnuro}/git/repository/OpenRepositoryUseCase.kt (95%) rename src/main/kotlin/{app => com/jetpackduba/gitnuro}/git/repository/ResetRepositoryStateUseCase.kt (91%) rename src/main/kotlin/{app => com/jetpackduba/gitnuro}/git/stash/ApplyStashUseCase.kt (90%) rename src/main/kotlin/{app => com/jetpackduba/gitnuro}/git/stash/DeleteStashUseCase.kt (93%) rename src/main/kotlin/{app => com/jetpackduba/gitnuro}/git/stash/GetStashListUseCase.kt (91%) rename src/main/kotlin/{app => com/jetpackduba/gitnuro}/git/stash/PopLastStashUseCase.kt (89%) rename src/main/kotlin/{app => com/jetpackduba/gitnuro}/git/stash/PopStashUseCase.kt (92%) rename src/main/kotlin/{app => com/jetpackduba/gitnuro}/git/stash/StashChangesUseCase.kt (92%) rename src/main/kotlin/{app => com/jetpackduba/gitnuro}/git/submodules/GetSubmodulesUseCase.kt (90%) rename src/main/kotlin/{app => com/jetpackduba/gitnuro}/git/submodules/InitalizeSubmoduleUseCase.kt (88%) rename src/main/kotlin/{app => com/jetpackduba/gitnuro}/git/submodules/UpdateSubmoduleUseCase.kt (94%) rename src/main/kotlin/{app => com/jetpackduba/gitnuro}/git/tags/CreateTagOnCommitUseCase.kt (92%) rename src/main/kotlin/{app => com/jetpackduba/gitnuro}/git/tags/DeleteTagUseCase.kt (90%) rename src/main/kotlin/{app => com/jetpackduba/gitnuro}/git/tags/GetTagsUseCase.kt (89%) rename src/main/kotlin/{app => com/jetpackduba/gitnuro}/git/workspace/CheckHasUncommitedChangedUseCase.kt (80%) rename src/main/kotlin/{app => com/jetpackduba/gitnuro}/git/workspace/DoCommitUseCase.kt (91%) rename src/main/kotlin/{app => com/jetpackduba/gitnuro}/git/workspace/GetLinesFromRawTextUseCase.kt (91%) rename src/main/kotlin/{app => com/jetpackduba/gitnuro}/git/workspace/GetLinesFromTextUseCase.kt (94%) rename src/main/kotlin/{app => com/jetpackduba/gitnuro}/git/workspace/GetStagedUseCase.kt (88%) rename src/main/kotlin/{app => com/jetpackduba/gitnuro}/git/workspace/GetStatusSummaryUseCase.kt (91%) rename src/main/kotlin/{app => com/jetpackduba/gitnuro}/git/workspace/GetStatusUseCase.kt (89%) rename src/main/kotlin/{app => com/jetpackduba/gitnuro}/git/workspace/GetUnstagedUseCase.kt (90%) rename src/main/kotlin/{app => com/jetpackduba/gitnuro}/git/workspace/HunkEdit.kt (96%) rename src/main/kotlin/{app => com/jetpackduba/gitnuro}/git/workspace/ResetEntryUseCase.kt (93%) rename src/main/kotlin/{app => com/jetpackduba/gitnuro}/git/workspace/ResetHunkUseCase.kt (91%) rename src/main/kotlin/{app => com/jetpackduba/gitnuro}/git/workspace/StageAllUseCase.kt (92%) rename src/main/kotlin/{app => com/jetpackduba/gitnuro}/git/workspace/StageEntryUseCase.kt (90%) rename src/main/kotlin/{app => com/jetpackduba/gitnuro}/git/workspace/StageHunkUseCase.kt (90%) rename src/main/kotlin/{app => com/jetpackduba/gitnuro}/git/workspace/StageUntrackedFileUseCase.kt (94%) rename src/main/kotlin/{app => com/jetpackduba/gitnuro}/git/workspace/Status.kt (82%) rename src/main/kotlin/{app => com/jetpackduba/gitnuro}/git/workspace/UnstageAllUseCase.kt (87%) rename src/main/kotlin/{app => com/jetpackduba/gitnuro}/git/workspace/UnstageEntryUseCase.kt (90%) rename src/main/kotlin/{app => com/jetpackduba/gitnuro}/git/workspace/UnstageHunkUseCase.kt (90%) rename src/main/kotlin/{app => com/jetpackduba/gitnuro}/images/ImagesCache.kt (77%) rename src/main/kotlin/{app => com/jetpackduba/gitnuro}/images/InMemoryImagesCache.kt (89%) rename src/main/kotlin/{app => com/jetpackduba/gitnuro}/images/NetworkImageLoader.kt (91%) rename src/main/kotlin/{app => com/jetpackduba/gitnuro}/keybindings/Keybinding.kt (94%) rename src/main/kotlin/{app => com/jetpackduba/gitnuro}/logging/logger.kt (66%) rename src/main/kotlin/{ => com/jetpackduba/gitnuro}/main.kt (60%) rename src/main/kotlin/{app => com/jetpackduba/gitnuro}/models/AuthorInfo.kt (77%) rename src/main/kotlin/{app => com/jetpackduba/gitnuro}/models/AuthorInfoSimple.kt (66%) rename src/main/kotlin/{app => com/jetpackduba/gitnuro}/preferences/AppSettings.kt (94%) rename src/main/kotlin/{app => com/jetpackduba/gitnuro}/preferences/WindowsPlacementPreference.kt (60%) rename src/main/kotlin/{app => com/jetpackduba/gitnuro}/theme/Color.kt (98%) rename src/main/kotlin/{app => com/jetpackduba/gitnuro}/theme/ColorsScheme.kt (98%) rename src/main/kotlin/{app => com/jetpackduba/gitnuro}/theme/ComponentsColors.kt (97%) rename src/main/kotlin/{app => com/jetpackduba/gitnuro}/theme/Theme.kt (96%) rename src/main/kotlin/{app => com/jetpackduba/gitnuro}/theme/Typography.kt (98%) rename src/main/kotlin/{app => com/jetpackduba/gitnuro}/ui/AppTab.kt (93%) rename src/main/kotlin/{app => com/jetpackduba/gitnuro}/ui/Blame.kt (92%) rename src/main/kotlin/{app => com/jetpackduba/gitnuro}/ui/Branches.kt (89%) rename src/main/kotlin/{app => com/jetpackduba/gitnuro}/ui/CommitChanges.kt (94%) rename src/main/kotlin/{app => com/jetpackduba/gitnuro}/ui/FileHistory.kt (88%) rename src/main/kotlin/{app => com/jetpackduba/gitnuro}/ui/Menu.kt (97%) rename src/main/kotlin/{app => com/jetpackduba/gitnuro}/ui/RebaseInteractive.kt (92%) rename src/main/kotlin/{app => com/jetpackduba/gitnuro}/ui/Remotes.kt (85%) rename src/main/kotlin/{app => com/jetpackduba/gitnuro}/ui/RepositoryOpen.kt (95%) rename src/main/kotlin/{app => com/jetpackduba/gitnuro}/ui/SideMenuUtils.kt (89%) rename src/main/kotlin/{app => com/jetpackduba/gitnuro}/ui/Stashes.kt (84%) rename src/main/kotlin/{app => com/jetpackduba/gitnuro}/ui/Submodules.kt (84%) rename src/main/kotlin/{app => com/jetpackduba/gitnuro}/ui/SystemDialogs.kt (91%) rename src/main/kotlin/{app => com/jetpackduba/gitnuro}/ui/Tags.kt (82%) rename src/main/kotlin/{app => com/jetpackduba/gitnuro}/ui/UncommitedChanges.kt (95%) rename src/main/kotlin/{app => com/jetpackduba/gitnuro}/ui/WelcomePage.kt (93%) rename src/main/kotlin/{app => com/jetpackduba/gitnuro}/ui/components/AdjustableOutlinedTextField.kt (92%) rename src/main/kotlin/{app => com/jetpackduba/gitnuro}/ui/components/AvatarImage.kt (91%) rename src/main/kotlin/{app => com/jetpackduba/gitnuro}/ui/components/DialogBox.kt (93%) rename src/main/kotlin/{app => com/jetpackduba/gitnuro}/ui/components/Expandable.kt (86%) rename src/main/kotlin/{app => com/jetpackduba/gitnuro}/ui/components/PrimaryButton.kt (90%) rename src/main/kotlin/{app => com/jetpackduba/gitnuro}/ui/components/RepositoriesTabPanel.kt (94%) rename src/main/kotlin/{app => com/jetpackduba/gitnuro}/ui/components/ScrollableColumn.kt (88%) rename src/main/kotlin/{app => com/jetpackduba/gitnuro}/ui/components/ScrollableLazyColumn.kt (90%) rename src/main/kotlin/{app => com/jetpackduba/gitnuro}/ui/components/SecondaryButton.kt (91%) rename src/main/kotlin/{app => com/jetpackduba/gitnuro}/ui/components/SideMenuEntry.kt (91%) rename src/main/kotlin/{app => com/jetpackduba/gitnuro}/ui/components/SideMenuPanel.kt (97%) rename src/main/kotlin/{app => com/jetpackduba/gitnuro}/ui/components/SideMenuSubentry.kt (93%) rename src/main/kotlin/{app => com/jetpackduba/gitnuro}/ui/components/TextLink.kt (83%) rename src/main/kotlin/{app => com/jetpackduba/gitnuro}/ui/components/Tooltip.kt (94%) rename src/main/kotlin/{app => com/jetpackduba/gitnuro}/ui/components/TooltipText.kt (97%) rename src/main/kotlin/{app => com/jetpackduba/gitnuro}/ui/context_menu/BranchContextMenu.kt (93%) rename src/main/kotlin/{app => com/jetpackduba/gitnuro}/ui/context_menu/CommitedChangesEntriesContextMenu.kt (94%) rename src/main/kotlin/{app => com/jetpackduba/gitnuro}/ui/context_menu/DropDownContent.kt (96%) rename src/main/kotlin/{app => com/jetpackduba/gitnuro}/ui/context_menu/DropDownContentData.kt (70%) rename src/main/kotlin/{app => com/jetpackduba/gitnuro}/ui/context_menu/LogContextMenu.kt (94%) rename src/main/kotlin/{app => com/jetpackduba/gitnuro}/ui/context_menu/PullContextMenu.kt (90%) rename src/main/kotlin/{app => com/jetpackduba/gitnuro}/ui/context_menu/PushContextMenu.kt (91%) rename src/main/kotlin/{app => com/jetpackduba/gitnuro}/ui/context_menu/RemoteBranchesContextMenu.kt (89%) rename src/main/kotlin/{app => com/jetpackduba/gitnuro}/ui/context_menu/RemoteContextMenu.kt (86%) rename src/main/kotlin/{app => com/jetpackduba/gitnuro}/ui/context_menu/RepositoryAdditionalOptionsMenu.kt (92%) rename src/main/kotlin/{app => com/jetpackduba/gitnuro}/ui/context_menu/StagedEntriesContextMenu.kt (77%) rename src/main/kotlin/{app => com/jetpackduba/gitnuro}/ui/context_menu/StashContextMenu.kt (88%) rename src/main/kotlin/{app => com/jetpackduba/gitnuro}/ui/context_menu/StashesContextMenu.kt (92%) rename src/main/kotlin/{app => com/jetpackduba/gitnuro}/ui/context_menu/StatusEntriesContextMenu.kt (90%) rename src/main/kotlin/{app => com/jetpackduba/gitnuro}/ui/context_menu/SubmoduleContextMenu.kt (93%) rename src/main/kotlin/{app => com/jetpackduba/gitnuro}/ui/context_menu/TagContextMenu.kt (91%) rename src/main/kotlin/{app => com/jetpackduba/gitnuro}/ui/dialogs/AppInfoDialog.kt (87%) rename src/main/kotlin/{app => com/jetpackduba/gitnuro}/ui/dialogs/AuthorDialog.kt (92%) rename src/main/kotlin/{app => com/jetpackduba/gitnuro}/ui/dialogs/CloneDialog.kt (95%) rename src/main/kotlin/{app => com/jetpackduba/gitnuro}/ui/dialogs/EditRemotesDialog.kt (97%) rename src/main/kotlin/{app => com/jetpackduba/gitnuro}/ui/dialogs/MaterialDialog.kt (93%) rename src/main/kotlin/{app => com/jetpackduba/gitnuro}/ui/dialogs/NewBranchDialog.kt (90%) rename src/main/kotlin/{app => com/jetpackduba/gitnuro}/ui/dialogs/NewTagDialog.kt (91%) rename src/main/kotlin/{app => com/jetpackduba/gitnuro}/ui/dialogs/PasswordDialog.kt (91%) rename src/main/kotlin/{app => com/jetpackduba/gitnuro}/ui/dialogs/ResetDialog.kt (92%) rename src/main/kotlin/{app => com/jetpackduba/gitnuro}/ui/dialogs/StashWithMessageDialog.kt (91%) rename src/main/kotlin/{app => com/jetpackduba/gitnuro}/ui/dialogs/UserPasswordDialog.kt (93%) rename src/main/kotlin/{app => com/jetpackduba/gitnuro}/ui/dialogs/settings/SettingsDialog.kt (95%) rename src/main/kotlin/{app => com/jetpackduba/gitnuro}/ui/diff/Diff.kt (96%) rename src/main/kotlin/{app => com/jetpackduba/gitnuro}/ui/dropdowns/DropDownOption.kt (55%) rename src/main/kotlin/{app => com/jetpackduba/gitnuro}/ui/dropdowns/ScaleDropDown.kt (66%) rename src/main/kotlin/{app => com/jetpackduba/gitnuro}/ui/log/Log.kt (97%) rename src/main/kotlin/{app => com/jetpackduba/gitnuro}/ui/log/LogDialog.kt (73%) rename src/main/kotlin/{app => com/jetpackduba/gitnuro}/updates/Update.kt (79%) rename src/main/kotlin/{app => com/jetpackduba/gitnuro}/updates/UpdatesRepository.kt (87%) rename src/main/kotlin/{app => com/jetpackduba/gitnuro}/updates/UpdatesWebService.kt (77%) rename src/main/kotlin/{app => com/jetpackduba/gitnuro}/viewmodels/AuthorViewModel.kt (75%) rename src/main/kotlin/{app => com/jetpackduba/gitnuro}/viewmodels/BranchesViewModel.kt (87%) rename src/main/kotlin/{app => com/jetpackduba/gitnuro}/viewmodels/CloneViewModel.kt (93%) rename src/main/kotlin/{app => com/jetpackduba/gitnuro}/viewmodels/CommitChangesViewModel.kt (82%) rename src/main/kotlin/{app => com/jetpackduba/gitnuro}/viewmodels/DiffViewModel.kt (90%) rename src/main/kotlin/{app => com/jetpackduba/gitnuro}/viewmodels/ExpandableViewModel.kt (89%) rename src/main/kotlin/{app => com/jetpackduba/gitnuro}/viewmodels/HistoryViewModel.kt (87%) rename src/main/kotlin/{app => com/jetpackduba/gitnuro}/viewmodels/LogViewModel.kt (91%) rename src/main/kotlin/{app => com/jetpackduba/gitnuro}/viewmodels/MenuViewModel.kt (79%) rename src/main/kotlin/{app => com/jetpackduba/gitnuro}/viewmodels/RebaseInteractiveViewModel.kt (91%) rename src/main/kotlin/{app => com/jetpackduba/gitnuro}/viewmodels/RemotesViewModel.kt (89%) rename src/main/kotlin/{app => com/jetpackduba/gitnuro}/viewmodels/SettingsViewModel.kt (90%) rename src/main/kotlin/{app => com/jetpackduba/gitnuro}/viewmodels/StashesViewModel.kt (83%) rename src/main/kotlin/{app => com/jetpackduba/gitnuro}/viewmodels/StatusViewModel.kt (92%) rename src/main/kotlin/{app => com/jetpackduba/gitnuro}/viewmodels/SubmodulesViewModel.kt (76%) rename src/main/kotlin/{app => com/jetpackduba/gitnuro}/viewmodels/TabViewModel.kt (94%) rename src/main/kotlin/{app => com/jetpackduba/gitnuro}/viewmodels/TagsViewModel.kt (80%) rename src/main/kotlin/{app => com/jetpackduba/gitnuro}/viewmodels/ViewDiffResult.kt (65%) rename src/test/kotlin/{ => com/jetpackduba/gitnuro}/app/TestUtils.kt (95%) rename src/test/kotlin/{ => com/jetpackduba/gitnuro}/app/git/BeforeRepoAllTestsExtension.kt (81%) rename src/test/kotlin/{ => com/jetpackduba/gitnuro}/app/git/BranchesManagerTest.kt (98%) rename src/test/kotlin/{ => com/jetpackduba/gitnuro}/app/git/diff/GetCommitDiffEntriesUseCaseTest.kt (67%) rename src/test/kotlin/{ => com/jetpackduba/gitnuro}/app/usecase/GenerateSplitHunkFromDiffResultUseCaseTest.kt (98%) diff --git a/build.gradle.kts b/build.gradle.kts index a7edc82..41b22a0 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -87,7 +87,7 @@ task("fatJarLinux", type = Jar::class) { manifest { attributes["Implementation-Title"] = name attributes["Implementation-Version"] = projectVersion - attributes["Main-Class"] = "MainKt" + attributes["Main-Class"] = "com.jetpackduba.gitnuro.MainKt" } from(configurations.runtimeClasspath.get().map { if (it.isDirectory) it else zipTree(it) }) { exclude( diff --git a/src/main/kotlin/app/App.kt b/src/main/kotlin/com/jetpackduba/gitnuro/App.kt similarity index 92% rename from src/main/kotlin/app/App.kt rename to src/main/kotlin/com/jetpackduba/gitnuro/App.kt index 7455815..815a98b 100644 --- a/src/main/kotlin/app/App.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/App.kt @@ -1,6 +1,6 @@ @file:OptIn(ExperimentalComposeUiApi::class) -package app +package com.jetpackduba.gitnuro import androidx.compose.foundation.background import androidx.compose.foundation.layout.* @@ -23,20 +23,20 @@ import androidx.compose.ui.unit.sp import androidx.compose.ui.window.Window import androidx.compose.ui.window.application import androidx.compose.ui.window.rememberWindowState -import app.di.DaggerAppComponent -import app.extensions.preferenceValue -import app.extensions.toWindowPlacement -import app.logging.printLog -import app.preferences.AppSettings -import app.theme.AppTheme -import app.theme.Theme -import app.theme.primaryTextColor -import app.theme.secondaryTextColor -import app.ui.AppTab -import app.ui.components.RepositoriesTabPanel -import app.ui.components.TabInformation -import app.ui.dialogs.settings.SettingsDialog -import app.viewmodels.SettingsViewModel +import com.jetpackduba.gitnuro.di.DaggerAppComponent +import com.jetpackduba.gitnuro.extensions.preferenceValue +import com.jetpackduba.gitnuro.extensions.toWindowPlacement +import com.jetpackduba.gitnuro.logging.printLog +import com.jetpackduba.gitnuro.preferences.AppSettings +import com.jetpackduba.gitnuro.theme.AppTheme +import com.jetpackduba.gitnuro.theme.Theme +import com.jetpackduba.gitnuro.theme.primaryTextColor +import com.jetpackduba.gitnuro.theme.secondaryTextColor +import com.jetpackduba.gitnuro.ui.AppTab +import com.jetpackduba.gitnuro.ui.components.RepositoriesTabPanel +import com.jetpackduba.gitnuro.ui.components.TabInformation +import com.jetpackduba.gitnuro.ui.dialogs.settings.SettingsDialog +import com.jetpackduba.gitnuro.viewmodels.SettingsViewModel import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.launch diff --git a/src/main/kotlin/app/AppConstants.kt b/src/main/kotlin/com/jetpackduba/gitnuro/AppConstants.kt similarity index 98% rename from src/main/kotlin/app/AppConstants.kt rename to src/main/kotlin/com/jetpackduba/gitnuro/AppConstants.kt index 76b473f..543efa6 100644 --- a/src/main/kotlin/app/AppConstants.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/AppConstants.kt @@ -1,4 +1,4 @@ -package app +package com.jetpackduba.gitnuro object AppConstants { val openSourceProjects = listOf( diff --git a/src/main/kotlin/app/AppStateManager.kt b/src/main/kotlin/com/jetpackduba/gitnuro/AppStateManager.kt similarity index 95% rename from src/main/kotlin/app/AppStateManager.kt rename to src/main/kotlin/com/jetpackduba/gitnuro/AppStateManager.kt index c94c841..3c9ef6c 100644 --- a/src/main/kotlin/app/AppStateManager.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/AppStateManager.kt @@ -1,6 +1,6 @@ -package app +package com.jetpackduba.gitnuro -import app.preferences.AppSettings +import com.jetpackduba.gitnuro.preferences.AppSettings import kotlinx.coroutines.* import kotlinx.coroutines.sync.Mutex import kotlinx.serialization.decodeFromString @@ -85,6 +85,6 @@ class AppStateManager @Inject constructor( } fun cancelCoroutines() { - appStateScope.cancel("Closing app") + appStateScope.cancel("Closing com.jetpackduba.gitnuro.app") } } \ No newline at end of file diff --git a/src/main/kotlin/app/ErrorsManager.kt b/src/main/kotlin/com/jetpackduba/gitnuro/ErrorsManager.kt similarity index 93% rename from src/main/kotlin/app/ErrorsManager.kt rename to src/main/kotlin/com/jetpackduba/gitnuro/ErrorsManager.kt index d03b35c..9886051 100644 --- a/src/main/kotlin/app/ErrorsManager.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/ErrorsManager.kt @@ -1,6 +1,6 @@ -package app +package com.jetpackduba.gitnuro -import app.di.TabScope +import com.jetpackduba.gitnuro.di.TabScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.flow.MutableSharedFlow import kotlinx.coroutines.flow.MutableStateFlow diff --git a/src/main/kotlin/app/TempFilesManager.kt b/src/main/kotlin/com/jetpackduba/gitnuro/TempFilesManager.kt similarity index 83% rename from src/main/kotlin/app/TempFilesManager.kt rename to src/main/kotlin/com/jetpackduba/gitnuro/TempFilesManager.kt index c2e6edf..8791a22 100644 --- a/src/main/kotlin/app/TempFilesManager.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/TempFilesManager.kt @@ -1,6 +1,6 @@ -package app +package com.jetpackduba.gitnuro -import app.di.TabScope +import com.jetpackduba.gitnuro.di.TabScope import javax.inject.Inject import kotlin.io.path.createTempDirectory import kotlin.io.path.deleteIfExists diff --git a/src/main/kotlin/app/credentials/CredentialsStateManager.kt b/src/main/kotlin/com/jetpackduba/gitnuro/credentials/CredentialsStateManager.kt similarity index 96% rename from src/main/kotlin/app/credentials/CredentialsStateManager.kt rename to src/main/kotlin/com/jetpackduba/gitnuro/credentials/CredentialsStateManager.kt index 61e733f..2bafea7 100644 --- a/src/main/kotlin/app/credentials/CredentialsStateManager.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/credentials/CredentialsStateManager.kt @@ -1,4 +1,4 @@ -package app.credentials +package com.jetpackduba.gitnuro.credentials import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.StateFlow diff --git a/src/main/kotlin/app/credentials/GProcess.kt b/src/main/kotlin/com/jetpackduba/gitnuro/credentials/GProcess.kt similarity index 97% rename from src/main/kotlin/app/credentials/GProcess.kt rename to src/main/kotlin/com/jetpackduba/gitnuro/credentials/GProcess.kt index cd0711e..392447a 100644 --- a/src/main/kotlin/app/credentials/GProcess.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/credentials/GProcess.kt @@ -1,4 +1,4 @@ -package app.credentials +package com.jetpackduba.gitnuro.credentials import org.apache.sshd.client.channel.ChannelExec import org.apache.sshd.client.session.ClientSession diff --git a/src/main/kotlin/app/credentials/GRemoteSession.kt b/src/main/kotlin/com/jetpackduba/gitnuro/credentials/GRemoteSession.kt similarity index 90% rename from src/main/kotlin/app/credentials/GRemoteSession.kt rename to src/main/kotlin/com/jetpackduba/gitnuro/credentials/GRemoteSession.kt index 782e456..70ad09a 100644 --- a/src/main/kotlin/app/credentials/GRemoteSession.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/credentials/GRemoteSession.kt @@ -1,4 +1,4 @@ -package app.credentials +package com.jetpackduba.gitnuro.credentials import org.apache.sshd.client.SshClient import org.apache.sshd.client.future.ConnectFuture @@ -63,11 +63,11 @@ class GRemoteSession @Inject constructor( val filePasswordProvider = FilePasswordProvider { _, _, _ -> - credentialsStateManager.updateState(CredentialsState.SshCredentialsRequested) + CredentialsStateManager.updateState(CredentialsState.SshCredentialsRequested) - var credentials = credentialsStateManager.currentCredentialsState + var credentials = CredentialsStateManager.currentCredentialsState while (credentials is CredentialsState.CredentialsRequested) { - credentials = credentialsStateManager.currentCredentialsState + credentials = CredentialsStateManager.currentCredentialsState } if (credentials !is CredentialsState.SshCredentialsAccepted) diff --git a/src/main/kotlin/app/credentials/GSessionManager.kt b/src/main/kotlin/com/jetpackduba/gitnuro/credentials/GSessionManager.kt similarity index 95% rename from src/main/kotlin/app/credentials/GSessionManager.kt rename to src/main/kotlin/com/jetpackduba/gitnuro/credentials/GSessionManager.kt index 66d6b10..77bc466 100644 --- a/src/main/kotlin/app/credentials/GSessionManager.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/credentials/GSessionManager.kt @@ -1,4 +1,4 @@ -package app.credentials +package com.jetpackduba.gitnuro.credentials import org.eclipse.jgit.transport.CredentialsProvider import org.eclipse.jgit.transport.RemoteSession diff --git a/src/main/kotlin/app/credentials/HttpCredentialsProvider.kt b/src/main/kotlin/com/jetpackduba/gitnuro/credentials/HttpCredentialsProvider.kt similarity index 86% rename from src/main/kotlin/app/credentials/HttpCredentialsProvider.kt rename to src/main/kotlin/com/jetpackduba/gitnuro/credentials/HttpCredentialsProvider.kt index 7feaa86..836c0c0 100644 --- a/src/main/kotlin/app/credentials/HttpCredentialsProvider.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/credentials/HttpCredentialsProvider.kt @@ -1,4 +1,4 @@ -package app.credentials +package com.jetpackduba.gitnuro.credentials import org.eclipse.jgit.transport.CredentialItem import org.eclipse.jgit.transport.CredentialsProvider @@ -23,11 +23,11 @@ class HttpCredentialsProvider : CredentialsProvider() { } override fun get(uri: URIish?, vararg items: CredentialItem?): Boolean { - credentialsStateManager.updateState(CredentialsState.HttpCredentialsRequested) + CredentialsStateManager.updateState(CredentialsState.HttpCredentialsRequested) - var credentials = credentialsStateManager.currentCredentialsState + var credentials = CredentialsStateManager.currentCredentialsState while (credentials is CredentialsState.CredentialsRequested) { - credentials = credentialsStateManager.currentCredentialsState + credentials = CredentialsStateManager.currentCredentialsState } if (credentials is CredentialsState.HttpCredentialsAccepted) { diff --git a/src/main/kotlin/app/di/AppComponent.kt b/src/main/kotlin/com/jetpackduba/gitnuro/di/AppComponent.kt similarity index 55% rename from src/main/kotlin/app/di/AppComponent.kt rename to src/main/kotlin/com/jetpackduba/gitnuro/di/AppComponent.kt index eabc353..89d009c 100644 --- a/src/main/kotlin/app/di/AppComponent.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/di/AppComponent.kt @@ -1,8 +1,8 @@ -package app.di +package com.jetpackduba.gitnuro.di -import app.App -import app.AppStateManager -import app.preferences.AppSettings +import com.jetpackduba.gitnuro.App +import com.jetpackduba.gitnuro.AppStateManager +import com.jetpackduba.gitnuro.preferences.AppSettings import dagger.Component import javax.inject.Singleton diff --git a/src/main/kotlin/app/di/TabComponent.kt b/src/main/kotlin/com/jetpackduba/gitnuro/di/TabComponent.kt similarity index 60% rename from src/main/kotlin/app/di/TabComponent.kt rename to src/main/kotlin/com/jetpackduba/gitnuro/di/TabComponent.kt index 99f11ae..a70f43c 100644 --- a/src/main/kotlin/app/di/TabComponent.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/di/TabComponent.kt @@ -1,7 +1,7 @@ -package app.di +package com.jetpackduba.gitnuro.di -import app.di.modules.NetworkModule -import app.ui.components.TabInformation +import com.jetpackduba.gitnuro.di.modules.NetworkModule +import com.jetpackduba.gitnuro.ui.components.TabInformation import dagger.Component @TabScope diff --git a/src/main/kotlin/app/di/TabScope.kt b/src/main/kotlin/com/jetpackduba/gitnuro/di/TabScope.kt similarity index 74% rename from src/main/kotlin/app/di/TabScope.kt rename to src/main/kotlin/com/jetpackduba/gitnuro/di/TabScope.kt index 0ca01d8..b0af544 100644 --- a/src/main/kotlin/app/di/TabScope.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/di/TabScope.kt @@ -1,4 +1,4 @@ -package app.di +package com.jetpackduba.gitnuro.di import javax.inject.Scope diff --git a/src/main/kotlin/app/di/modules/NetworkModule.kt b/src/main/kotlin/com/jetpackduba/gitnuro/di/modules/NetworkModule.kt similarity index 81% rename from src/main/kotlin/app/di/modules/NetworkModule.kt rename to src/main/kotlin/com/jetpackduba/gitnuro/di/modules/NetworkModule.kt index c464c00..2294039 100644 --- a/src/main/kotlin/app/di/modules/NetworkModule.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/di/modules/NetworkModule.kt @@ -1,6 +1,6 @@ -package app.di.modules +package com.jetpackduba.gitnuro.di.modules -import app.updates.UpdatesService +import com.jetpackduba.gitnuro.updates.UpdatesService import dagger.Provides import retrofit2.Retrofit import retrofit2.converter.scalars.ScalarsConverterFactory diff --git a/src/main/kotlin/app/exceptions/GitnuroException.kt b/src/main/kotlin/com/jetpackduba/gitnuro/exceptions/GitnuroException.kt similarity index 61% rename from src/main/kotlin/app/exceptions/GitnuroException.kt rename to src/main/kotlin/com/jetpackduba/gitnuro/exceptions/GitnuroException.kt index 6562632..6037daf 100644 --- a/src/main/kotlin/app/exceptions/GitnuroException.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/exceptions/GitnuroException.kt @@ -1,3 +1,3 @@ -package app.exceptions +package com.jetpackduba.gitnuro.exceptions abstract class GitnuroException(msg: String) : RuntimeException(msg) \ No newline at end of file diff --git a/src/main/kotlin/app/exceptions/InvalidDirectoryException.kt b/src/main/kotlin/com/jetpackduba/gitnuro/exceptions/InvalidDirectoryException.kt similarity index 61% rename from src/main/kotlin/app/exceptions/InvalidDirectoryException.kt rename to src/main/kotlin/com/jetpackduba/gitnuro/exceptions/InvalidDirectoryException.kt index d09210d..78f052a 100644 --- a/src/main/kotlin/app/exceptions/InvalidDirectoryException.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/exceptions/InvalidDirectoryException.kt @@ -1,3 +1,3 @@ -package app.exceptions +package com.jetpackduba.gitnuro.exceptions class InvalidDirectoryException(msg: String) : GitnuroException(msg) \ No newline at end of file diff --git a/src/main/kotlin/app/exceptions/InvalidMessageException.kt b/src/main/kotlin/com/jetpackduba/gitnuro/exceptions/InvalidMessageException.kt similarity index 60% rename from src/main/kotlin/app/exceptions/InvalidMessageException.kt rename to src/main/kotlin/com/jetpackduba/gitnuro/exceptions/InvalidMessageException.kt index bce5e9a..3895424 100644 --- a/src/main/kotlin/app/exceptions/InvalidMessageException.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/exceptions/InvalidMessageException.kt @@ -1,3 +1,3 @@ -package app.exceptions +package com.jetpackduba.gitnuro.exceptions class InvalidMessageException(msg: String) : GitnuroException(msg) \ No newline at end of file diff --git a/src/main/kotlin/app/exceptions/InvalidRemoteUrlException.kt b/src/main/kotlin/com/jetpackduba/gitnuro/exceptions/InvalidRemoteUrlException.kt similarity index 61% rename from src/main/kotlin/app/exceptions/InvalidRemoteUrlException.kt rename to src/main/kotlin/com/jetpackduba/gitnuro/exceptions/InvalidRemoteUrlException.kt index b77b5a2..f318882 100644 --- a/src/main/kotlin/app/exceptions/InvalidRemoteUrlException.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/exceptions/InvalidRemoteUrlException.kt @@ -1,3 +1,3 @@ -package app.exceptions +package com.jetpackduba.gitnuro.exceptions class InvalidRemoteUrlException(msg: String) : GitnuroException(msg) \ No newline at end of file diff --git a/src/main/kotlin/app/exceptions/MissingDiffEntryException.kt b/src/main/kotlin/com/jetpackduba/gitnuro/exceptions/MissingDiffEntryException.kt similarity index 61% rename from src/main/kotlin/app/exceptions/MissingDiffEntryException.kt rename to src/main/kotlin/com/jetpackduba/gitnuro/exceptions/MissingDiffEntryException.kt index 294a3ee..3bc55c2 100644 --- a/src/main/kotlin/app/exceptions/MissingDiffEntryException.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/exceptions/MissingDiffEntryException.kt @@ -1,3 +1,3 @@ -package app.exceptions +package com.jetpackduba.gitnuro.exceptions class MissingDiffEntryException(msg: String) : GitnuroException(msg) \ No newline at end of file diff --git a/src/main/kotlin/app/exceptions/RebaseCancelledException.kt b/src/main/kotlin/com/jetpackduba/gitnuro/exceptions/RebaseCancelledException.kt similarity index 61% rename from src/main/kotlin/app/exceptions/RebaseCancelledException.kt rename to src/main/kotlin/com/jetpackduba/gitnuro/exceptions/RebaseCancelledException.kt index 8dce0f8..3c8928c 100644 --- a/src/main/kotlin/app/exceptions/RebaseCancelledException.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/exceptions/RebaseCancelledException.kt @@ -1,3 +1,3 @@ -package app.exceptions +package com.jetpackduba.gitnuro.exceptions class RebaseCancelledException(msg: String) : GitnuroException(msg) \ No newline at end of file diff --git a/src/main/kotlin/app/exceptions/UncommitedChangesDetectedException.kt b/src/main/kotlin/com/jetpackduba/gitnuro/exceptions/UncommitedChangesDetectedException.kt similarity index 64% rename from src/main/kotlin/app/exceptions/UncommitedChangesDetectedException.kt rename to src/main/kotlin/com/jetpackduba/gitnuro/exceptions/UncommitedChangesDetectedException.kt index f7f7229..0611e66 100644 --- a/src/main/kotlin/app/exceptions/UncommitedChangesDetectedException.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/exceptions/UncommitedChangesDetectedException.kt @@ -1,3 +1,3 @@ -package app.exceptions +package com.jetpackduba.gitnuro.exceptions class UncommitedChangesDetectedException(msg: String) : GitnuroException(msg) \ No newline at end of file diff --git a/src/main/kotlin/app/extensions/DateExtensions.kt b/src/main/kotlin/com/jetpackduba/gitnuro/extensions/DateExtensions.kt similarity index 96% rename from src/main/kotlin/app/extensions/DateExtensions.kt rename to src/main/kotlin/com/jetpackduba/gitnuro/extensions/DateExtensions.kt index 0d19a4d..acb930b 100644 --- a/src/main/kotlin/app/extensions/DateExtensions.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/extensions/DateExtensions.kt @@ -1,4 +1,4 @@ -package app.extensions +package com.jetpackduba.gitnuro.extensions import java.text.DateFormat import java.time.LocalDate diff --git a/src/main/kotlin/app/extensions/DiffEntryExtensions.kt b/src/main/kotlin/com/jetpackduba/gitnuro/extensions/DiffEntryExtensions.kt similarity index 92% rename from src/main/kotlin/app/extensions/DiffEntryExtensions.kt rename to src/main/kotlin/com/jetpackduba/gitnuro/extensions/DiffEntryExtensions.kt index b8c9e98..bb5ede8 100644 --- a/src/main/kotlin/app/extensions/DiffEntryExtensions.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/extensions/DiffEntryExtensions.kt @@ -1,4 +1,4 @@ -package app.extensions +package com.jetpackduba.gitnuro.extensions import androidx.compose.material.MaterialTheme import androidx.compose.material.icons.Icons @@ -6,11 +6,11 @@ import androidx.compose.material.icons.filled.* import androidx.compose.runtime.Composable import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.vector.ImageVector -import app.git.workspace.StatusEntry -import app.git.workspace.StatusType -import app.theme.addFile -import app.theme.conflictFile -import app.theme.modifyFile +import com.jetpackduba.gitnuro.git.workspace.StatusEntry +import com.jetpackduba.gitnuro.git.workspace.StatusType +import com.jetpackduba.gitnuro.theme.addFile +import com.jetpackduba.gitnuro.theme.conflictFile +import com.jetpackduba.gitnuro.theme.modifyFile import org.eclipse.jgit.diff.DiffEntry val DiffEntry.parentDirectoryPath: String diff --git a/src/main/kotlin/app/extensions/InputStreamExtensions.kt b/src/main/kotlin/com/jetpackduba/gitnuro/extensions/InputStreamExtensions.kt similarity index 88% rename from src/main/kotlin/app/extensions/InputStreamExtensions.kt rename to src/main/kotlin/com/jetpackduba/gitnuro/extensions/InputStreamExtensions.kt index 9ee5b57..a06abd5 100644 --- a/src/main/kotlin/app/extensions/InputStreamExtensions.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/extensions/InputStreamExtensions.kt @@ -1,4 +1,4 @@ -package app.extensions +package com.jetpackduba.gitnuro.extensions import java.io.ByteArrayOutputStream import java.io.InputStream diff --git a/src/main/kotlin/app/extensions/IntExtensions.kt b/src/main/kotlin/com/jetpackduba/gitnuro/extensions/IntExtensions.kt similarity index 91% rename from src/main/kotlin/app/extensions/IntExtensions.kt rename to src/main/kotlin/com/jetpackduba/gitnuro/extensions/IntExtensions.kt index 2958e84..45fe997 100644 --- a/src/main/kotlin/app/extensions/IntExtensions.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/extensions/IntExtensions.kt @@ -1,4 +1,4 @@ -package app.extensions +package com.jetpackduba.gitnuro.extensions fun Int.toStringWithSpaces(charactersCount: Int): String { val numberStr = this.toString() diff --git a/src/main/kotlin/app/extensions/LazyListStateExtensions.kt b/src/main/kotlin/com/jetpackduba/gitnuro/extensions/LazyListStateExtensions.kt similarity index 87% rename from src/main/kotlin/app/extensions/LazyListStateExtensions.kt rename to src/main/kotlin/com/jetpackduba/gitnuro/extensions/LazyListStateExtensions.kt index 92cf460..df6c431 100644 --- a/src/main/kotlin/app/extensions/LazyListStateExtensions.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/extensions/LazyListStateExtensions.kt @@ -1,4 +1,4 @@ -package app.extensions +package com.jetpackduba.gitnuro.extensions import androidx.compose.foundation.lazy.LazyListState diff --git a/src/main/kotlin/app/extensions/ListExtensions.kt b/src/main/kotlin/com/jetpackduba/gitnuro/extensions/ListExtensions.kt similarity index 85% rename from src/main/kotlin/app/extensions/ListExtensions.kt rename to src/main/kotlin/com/jetpackduba/gitnuro/extensions/ListExtensions.kt index f9e7bc0..ec2563b 100644 --- a/src/main/kotlin/app/extensions/ListExtensions.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/extensions/ListExtensions.kt @@ -1,4 +1,4 @@ -package app.extensions +package com.jetpackduba.gitnuro.extensions fun List?.countOrZero(): Int { return this?.count() ?: 0 diff --git a/src/main/kotlin/app/extensions/ModifierExtensions.kt b/src/main/kotlin/com/jetpackduba/gitnuro/extensions/ModifierExtensions.kt similarity index 94% rename from src/main/kotlin/app/extensions/ModifierExtensions.kt rename to src/main/kotlin/com/jetpackduba/gitnuro/extensions/ModifierExtensions.kt index b79000e..4cd6873 100644 --- a/src/main/kotlin/app/extensions/ModifierExtensions.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/extensions/ModifierExtensions.kt @@ -1,4 +1,4 @@ -package app.extensions +package com.jetpackduba.gitnuro.extensions import androidx.compose.foundation.background import androidx.compose.foundation.clickable diff --git a/src/main/kotlin/app/extensions/RawTextExtensions.kt b/src/main/kotlin/com/jetpackduba/gitnuro/extensions/RawTextExtensions.kt similarity index 85% rename from src/main/kotlin/app/extensions/RawTextExtensions.kt rename to src/main/kotlin/com/jetpackduba/gitnuro/extensions/RawTextExtensions.kt index 0abd2ea..700465c 100644 --- a/src/main/kotlin/app/extensions/RawTextExtensions.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/extensions/RawTextExtensions.kt @@ -1,4 +1,4 @@ -package app.extensions +package com.jetpackduba.gitnuro.extensions import org.eclipse.jgit.diff.RawText import java.io.ByteArrayOutputStream diff --git a/src/main/kotlin/app/extensions/RefExtensions.kt b/src/main/kotlin/com/jetpackduba/gitnuro/extensions/RefExtensions.kt similarity index 98% rename from src/main/kotlin/app/extensions/RefExtensions.kt rename to src/main/kotlin/com/jetpackduba/gitnuro/extensions/RefExtensions.kt index eaa51b0..2a6692b 100644 --- a/src/main/kotlin/app/extensions/RefExtensions.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/extensions/RefExtensions.kt @@ -1,4 +1,4 @@ -package app.extensions +package com.jetpackduba.gitnuro.extensions import org.eclipse.jgit.lib.Constants import org.eclipse.jgit.lib.ObjectIdRef diff --git a/src/main/kotlin/app/extensions/RepositoryStateExtensions.kt b/src/main/kotlin/com/jetpackduba/gitnuro/extensions/RepositoryStateExtensions.kt similarity index 90% rename from src/main/kotlin/app/extensions/RepositoryStateExtensions.kt rename to src/main/kotlin/com/jetpackduba/gitnuro/extensions/RepositoryStateExtensions.kt index b309ca9..a481f5c 100644 --- a/src/main/kotlin/app/extensions/RepositoryStateExtensions.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/extensions/RepositoryStateExtensions.kt @@ -1,4 +1,4 @@ -package app.extensions +package com.jetpackduba.gitnuro.extensions import org.eclipse.jgit.lib.RepositoryState diff --git a/src/main/kotlin/app/extensions/RevCommitExtensions.kt b/src/main/kotlin/com/jetpackduba/gitnuro/extensions/RevCommitExtensions.kt similarity index 84% rename from src/main/kotlin/app/extensions/RevCommitExtensions.kt rename to src/main/kotlin/com/jetpackduba/gitnuro/extensions/RevCommitExtensions.kt index 00c88d5..7d2d3d0 100644 --- a/src/main/kotlin/app/extensions/RevCommitExtensions.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/extensions/RevCommitExtensions.kt @@ -1,4 +1,4 @@ -package app.extensions +package com.jetpackduba.gitnuro.extensions import org.eclipse.jgit.lib.Repository import org.eclipse.jgit.revwalk.RevCommit diff --git a/src/main/kotlin/app/extensions/SemaphoreExtensions.kt b/src/main/kotlin/com/jetpackduba/gitnuro/extensions/SemaphoreExtensions.kt similarity index 85% rename from src/main/kotlin/app/extensions/SemaphoreExtensions.kt rename to src/main/kotlin/com/jetpackduba/gitnuro/extensions/SemaphoreExtensions.kt index ac90875..882b562 100644 --- a/src/main/kotlin/app/extensions/SemaphoreExtensions.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/extensions/SemaphoreExtensions.kt @@ -1,4 +1,4 @@ -package app.extensions +package com.jetpackduba.gitnuro.extensions import androidx.compose.runtime.Composable import kotlinx.coroutines.sync.Semaphore diff --git a/src/main/kotlin/app/extensions/Shell.kt b/src/main/kotlin/com/jetpackduba/gitnuro/extensions/Shell.kt similarity index 95% rename from src/main/kotlin/app/extensions/Shell.kt rename to src/main/kotlin/com/jetpackduba/gitnuro/extensions/Shell.kt index 2c25278..82fe5c2 100644 --- a/src/main/kotlin/app/extensions/Shell.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/extensions/Shell.kt @@ -1,6 +1,6 @@ -package app.extensions +package com.jetpackduba.gitnuro.extensions -import app.logging.printLog +import com.jetpackduba.gitnuro.logging.printLog import java.io.IOException import java.util.* diff --git a/src/main/kotlin/app/extensions/StateManagementUtils.kt b/src/main/kotlin/com/jetpackduba/gitnuro/extensions/StateManagementUtils.kt similarity index 94% rename from src/main/kotlin/app/extensions/StateManagementUtils.kt rename to src/main/kotlin/com/jetpackduba/gitnuro/extensions/StateManagementUtils.kt index 8121afc..5104584 100644 --- a/src/main/kotlin/app/extensions/StateManagementUtils.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/extensions/StateManagementUtils.kt @@ -1,4 +1,4 @@ -package app.extensions +package com.jetpackduba.gitnuro.extensions import kotlinx.coroutines.* diff --git a/src/main/kotlin/app/extensions/StatusExtensions.kt b/src/main/kotlin/com/jetpackduba/gitnuro/extensions/StatusExtensions.kt similarity index 73% rename from src/main/kotlin/app/extensions/StatusExtensions.kt rename to src/main/kotlin/com/jetpackduba/gitnuro/extensions/StatusExtensions.kt index 091de42..f1f2718 100644 --- a/src/main/kotlin/app/extensions/StatusExtensions.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/extensions/StatusExtensions.kt @@ -1,4 +1,4 @@ -package app.extensions +package com.jetpackduba.gitnuro.extensions import org.eclipse.jgit.api.Status diff --git a/src/main/kotlin/app/extensions/StringExtensions.kt b/src/main/kotlin/com/jetpackduba/gitnuro/extensions/StringExtensions.kt similarity index 96% rename from src/main/kotlin/app/extensions/StringExtensions.kt rename to src/main/kotlin/com/jetpackduba/gitnuro/extensions/StringExtensions.kt index 918ed69..26bb5f4 100644 --- a/src/main/kotlin/app/extensions/StringExtensions.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/extensions/StringExtensions.kt @@ -1,4 +1,4 @@ -package app.extensions +package com.jetpackduba.gitnuro.extensions import java.math.BigInteger import java.security.MessageDigest diff --git a/src/main/kotlin/app/extensions/SystemUtils.kt b/src/main/kotlin/com/jetpackduba/gitnuro/extensions/SystemUtils.kt similarity index 96% rename from src/main/kotlin/app/extensions/SystemUtils.kt rename to src/main/kotlin/com/jetpackduba/gitnuro/extensions/SystemUtils.kt index 2a86523..3a4d2d6 100644 --- a/src/main/kotlin/app/extensions/SystemUtils.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/extensions/SystemUtils.kt @@ -1,6 +1,6 @@ -package app.extensions +package com.jetpackduba.gitnuro.extensions -import app.logging.printLog +import com.jetpackduba.gitnuro.logging.printLog import java.awt.Desktop import java.awt.Toolkit import java.awt.datatransfer.Clipboard diff --git a/src/main/kotlin/app/extensions/WindowPlacement.kt b/src/main/kotlin/com/jetpackduba/gitnuro/extensions/WindowPlacement.kt similarity index 89% rename from src/main/kotlin/app/extensions/WindowPlacement.kt rename to src/main/kotlin/com/jetpackduba/gitnuro/extensions/WindowPlacement.kt index 7052907..fb2e544 100644 --- a/src/main/kotlin/app/extensions/WindowPlacement.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/extensions/WindowPlacement.kt @@ -1,7 +1,7 @@ -package app.extensions +package com.jetpackduba.gitnuro.extensions import androidx.compose.ui.window.WindowPlacement -import app.preferences.WindowsPlacementPreference +import com.jetpackduba.gitnuro.preferences.WindowsPlacementPreference private val windowPlacementFloating = WindowsPlacementPreference(0) diff --git a/src/main/kotlin/app/git/CloneStatus.kt b/src/main/kotlin/com/jetpackduba/gitnuro/git/CloneStatus.kt similarity index 97% rename from src/main/kotlin/app/git/CloneStatus.kt rename to src/main/kotlin/com/jetpackduba/gitnuro/git/CloneStatus.kt index 7102187..335d106 100644 --- a/src/main/kotlin/app/git/CloneStatus.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/git/CloneStatus.kt @@ -1,4 +1,4 @@ -package app.git +package com.jetpackduba.gitnuro.git import org.eclipse.jgit.transport.RemoteRefUpdate import java.io.File diff --git a/src/main/kotlin/app/git/DiffEntryType.kt b/src/main/kotlin/com/jetpackduba/gitnuro/git/DiffEntryType.kt similarity index 84% rename from src/main/kotlin/app/git/DiffEntryType.kt rename to src/main/kotlin/com/jetpackduba/gitnuro/git/DiffEntryType.kt index bea3c5c..d05e01e 100644 --- a/src/main/kotlin/app/git/DiffEntryType.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/git/DiffEntryType.kt @@ -1,9 +1,9 @@ -package app.git +package com.jetpackduba.gitnuro.git -import app.extensions.filePath -import app.extensions.toStatusType -import app.git.workspace.StatusEntry -import app.git.workspace.StatusType +import com.jetpackduba.gitnuro.extensions.filePath +import com.jetpackduba.gitnuro.extensions.toStatusType +import com.jetpackduba.gitnuro.git.workspace.StatusEntry +import com.jetpackduba.gitnuro.git.workspace.StatusType import org.eclipse.jgit.diff.DiffEntry sealed class DiffEntryType { diff --git a/src/main/kotlin/app/git/FileChangesWatcher.kt b/src/main/kotlin/com/jetpackduba/gitnuro/git/FileChangesWatcher.kt similarity index 95% rename from src/main/kotlin/app/git/FileChangesWatcher.kt rename to src/main/kotlin/com/jetpackduba/gitnuro/git/FileChangesWatcher.kt index b919d09..78e9c78 100644 --- a/src/main/kotlin/app/git/FileChangesWatcher.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/git/FileChangesWatcher.kt @@ -1,7 +1,7 @@ -package app.git +package com.jetpackduba.gitnuro.git -import app.extensions.systemSeparator -import app.logging.printLog +import com.jetpackduba.gitnuro.extensions.systemSeparator +import com.jetpackduba.gitnuro.logging.printLog import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.flow.MutableSharedFlow import kotlinx.coroutines.flow.SharedFlow @@ -100,7 +100,7 @@ class FileChangesWatcher @Inject constructor() { } private fun isGitMessageFile(repoPath: String, fullPathOfFileChanged: String): Boolean { - val gitDir = "$repoPath$systemSeparator.git${systemSeparator}" + val gitDir = "$repoPath$systemSeparator.git$systemSeparator" return fullPathOfFileChanged == "${gitDir}COMMIT_EDITMSG" || fullPathOfFileChanged == "${gitDir}MERGE_MSG" } diff --git a/src/main/kotlin/app/git/RawFileManager.kt b/src/main/kotlin/com/jetpackduba/gitnuro/git/RawFileManager.kt similarity index 96% rename from src/main/kotlin/app/git/RawFileManager.kt rename to src/main/kotlin/com/jetpackduba/gitnuro/git/RawFileManager.kt index 7e4075e..85ac034 100644 --- a/src/main/kotlin/app/git/RawFileManager.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/git/RawFileManager.kt @@ -1,7 +1,7 @@ -package app.git +package com.jetpackduba.gitnuro.git -import app.TempFilesManager -import app.extensions.systemSeparator +import com.jetpackduba.gitnuro.TempFilesManager +import com.jetpackduba.gitnuro.extensions.systemSeparator import org.eclipse.jgit.diff.ContentSource import org.eclipse.jgit.diff.DiffEntry import org.eclipse.jgit.diff.RawText diff --git a/src/main/kotlin/app/git/TabState.kt b/src/main/kotlin/com/jetpackduba/gitnuro/git/TabState.kt similarity index 96% rename from src/main/kotlin/app/git/TabState.kt rename to src/main/kotlin/com/jetpackduba/gitnuro/git/TabState.kt index 77cf3b9..277f9e0 100644 --- a/src/main/kotlin/app/git/TabState.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/git/TabState.kt @@ -1,10 +1,10 @@ -package app.git +package com.jetpackduba.gitnuro.git -import app.ErrorsManager -import app.di.TabScope -import app.extensions.delayedStateChange -import app.newErrorNow -import app.ui.SelectedItem +import com.jetpackduba.gitnuro.ErrorsManager +import com.jetpackduba.gitnuro.di.TabScope +import com.jetpackduba.gitnuro.extensions.delayedStateChange +import com.jetpackduba.gitnuro.newErrorNow +import com.jetpackduba.gitnuro.ui.SelectedItem import kotlinx.coroutines.* import kotlinx.coroutines.flow.* import org.eclipse.jgit.api.Git diff --git a/src/main/kotlin/app/git/TaskEvent.kt b/src/main/kotlin/com/jetpackduba/gitnuro/git/TaskEvent.kt similarity index 80% rename from src/main/kotlin/app/git/TaskEvent.kt rename to src/main/kotlin/com/jetpackduba/gitnuro/git/TaskEvent.kt index 89a1635..472ff68 100644 --- a/src/main/kotlin/app/git/TaskEvent.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/git/TaskEvent.kt @@ -1,4 +1,4 @@ -package app.git +package com.jetpackduba.gitnuro.git import org.eclipse.jgit.revwalk.RevCommit diff --git a/src/main/kotlin/app/git/author/LoadAuthorUseCase.kt b/src/main/kotlin/com/jetpackduba/gitnuro/git/author/LoadAuthorUseCase.kt similarity index 91% rename from src/main/kotlin/app/git/author/LoadAuthorUseCase.kt rename to src/main/kotlin/com/jetpackduba/gitnuro/git/author/LoadAuthorUseCase.kt index 437c2d6..3178a90 100644 --- a/src/main/kotlin/app/git/author/LoadAuthorUseCase.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/git/author/LoadAuthorUseCase.kt @@ -1,6 +1,6 @@ -package app.git.author +package com.jetpackduba.gitnuro.git.author -import app.models.AuthorInfo +import com.jetpackduba.gitnuro.models.AuthorInfo import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext import org.eclipse.jgit.api.Git diff --git a/src/main/kotlin/app/git/author/SaveAuthorUseCase.kt b/src/main/kotlin/com/jetpackduba/gitnuro/git/author/SaveAuthorUseCase.kt similarity index 93% rename from src/main/kotlin/app/git/author/SaveAuthorUseCase.kt rename to src/main/kotlin/com/jetpackduba/gitnuro/git/author/SaveAuthorUseCase.kt index 51f66fc..e100b15 100644 --- a/src/main/kotlin/app/git/author/SaveAuthorUseCase.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/git/author/SaveAuthorUseCase.kt @@ -1,6 +1,6 @@ -package app.git.author +package com.jetpackduba.gitnuro.git.author -import app.models.AuthorInfo +import com.jetpackduba.gitnuro.models.AuthorInfo import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext import org.eclipse.jgit.api.Git diff --git a/src/main/kotlin/app/git/branches/CheckoutRefUseCase.kt b/src/main/kotlin/com/jetpackduba/gitnuro/git/branches/CheckoutRefUseCase.kt similarity index 83% rename from src/main/kotlin/app/git/branches/CheckoutRefUseCase.kt rename to src/main/kotlin/com/jetpackduba/gitnuro/git/branches/CheckoutRefUseCase.kt index a3ff904..5e60587 100644 --- a/src/main/kotlin/app/git/branches/CheckoutRefUseCase.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/git/branches/CheckoutRefUseCase.kt @@ -1,7 +1,7 @@ -package app.git.branches +package com.jetpackduba.gitnuro.git.branches -import app.extensions.isBranch -import app.extensions.simpleName +import com.jetpackduba.gitnuro.extensions.isBranch +import com.jetpackduba.gitnuro.extensions.simpleName import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext import org.eclipse.jgit.api.CreateBranchCommand diff --git a/src/main/kotlin/app/git/branches/CreateBranchOnCommitUseCase.kt b/src/main/kotlin/com/jetpackduba/gitnuro/git/branches/CreateBranchOnCommitUseCase.kt similarity index 92% rename from src/main/kotlin/app/git/branches/CreateBranchOnCommitUseCase.kt rename to src/main/kotlin/com/jetpackduba/gitnuro/git/branches/CreateBranchOnCommitUseCase.kt index 8129b14..3c79248 100644 --- a/src/main/kotlin/app/git/branches/CreateBranchOnCommitUseCase.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/git/branches/CreateBranchOnCommitUseCase.kt @@ -1,4 +1,4 @@ -package app.git.branches +package com.jetpackduba.gitnuro.git.branches import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext diff --git a/src/main/kotlin/app/git/branches/CreateBranchUseCase.kt b/src/main/kotlin/com/jetpackduba/gitnuro/git/branches/CreateBranchUseCase.kt similarity index 90% rename from src/main/kotlin/app/git/branches/CreateBranchUseCase.kt rename to src/main/kotlin/com/jetpackduba/gitnuro/git/branches/CreateBranchUseCase.kt index 8543e4f..f8e7ca6 100644 --- a/src/main/kotlin/app/git/branches/CreateBranchUseCase.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/git/branches/CreateBranchUseCase.kt @@ -1,4 +1,4 @@ -package app.git.branches +package com.jetpackduba.gitnuro.git.branches import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext diff --git a/src/main/kotlin/app/git/branches/DeleteBranchUseCase.kt b/src/main/kotlin/com/jetpackduba/gitnuro/git/branches/DeleteBranchUseCase.kt similarity index 91% rename from src/main/kotlin/app/git/branches/DeleteBranchUseCase.kt rename to src/main/kotlin/com/jetpackduba/gitnuro/git/branches/DeleteBranchUseCase.kt index 8696d6c..b073baf 100644 --- a/src/main/kotlin/app/git/branches/DeleteBranchUseCase.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/git/branches/DeleteBranchUseCase.kt @@ -1,4 +1,4 @@ -package app.git.branches +package com.jetpackduba.gitnuro.git.branches import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext diff --git a/src/main/kotlin/app/git/branches/DeleteLocallyRemoteBranchesUseCase.kt b/src/main/kotlin/com/jetpackduba/gitnuro/git/branches/DeleteLocallyRemoteBranchesUseCase.kt similarity index 91% rename from src/main/kotlin/app/git/branches/DeleteLocallyRemoteBranchesUseCase.kt rename to src/main/kotlin/com/jetpackduba/gitnuro/git/branches/DeleteLocallyRemoteBranchesUseCase.kt index b8faa83..253a1b8 100644 --- a/src/main/kotlin/app/git/branches/DeleteLocallyRemoteBranchesUseCase.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/git/branches/DeleteLocallyRemoteBranchesUseCase.kt @@ -1,4 +1,4 @@ -package app.git.branches +package com.jetpackduba.gitnuro.git.branches import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext diff --git a/src/main/kotlin/app/git/branches/GetBranchesUseCase.kt b/src/main/kotlin/com/jetpackduba/gitnuro/git/branches/GetBranchesUseCase.kt similarity index 89% rename from src/main/kotlin/app/git/branches/GetBranchesUseCase.kt rename to src/main/kotlin/com/jetpackduba/gitnuro/git/branches/GetBranchesUseCase.kt index d8a5b98..d9175fc 100644 --- a/src/main/kotlin/app/git/branches/GetBranchesUseCase.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/git/branches/GetBranchesUseCase.kt @@ -1,4 +1,4 @@ -package app.git.branches +package com.jetpackduba.gitnuro.git.branches import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext diff --git a/src/main/kotlin/app/git/branches/GetCurrentBranchUseCase.kt b/src/main/kotlin/com/jetpackduba/gitnuro/git/branches/GetCurrentBranchUseCase.kt similarity index 94% rename from src/main/kotlin/app/git/branches/GetCurrentBranchUseCase.kt rename to src/main/kotlin/com/jetpackduba/gitnuro/git/branches/GetCurrentBranchUseCase.kt index bd7932c..095833b 100644 --- a/src/main/kotlin/app/git/branches/GetCurrentBranchUseCase.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/git/branches/GetCurrentBranchUseCase.kt @@ -1,4 +1,4 @@ -package app.git.branches +package com.jetpackduba.gitnuro.git.branches import org.eclipse.jgit.api.Git import org.eclipse.jgit.lib.Ref diff --git a/src/main/kotlin/app/git/branches/GetRemoteBranchesUseCase.kt b/src/main/kotlin/com/jetpackduba/gitnuro/git/branches/GetRemoteBranchesUseCase.kt similarity index 91% rename from src/main/kotlin/app/git/branches/GetRemoteBranchesUseCase.kt rename to src/main/kotlin/com/jetpackduba/gitnuro/git/branches/GetRemoteBranchesUseCase.kt index ce57c78..448697a 100644 --- a/src/main/kotlin/app/git/branches/GetRemoteBranchesUseCase.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/git/branches/GetRemoteBranchesUseCase.kt @@ -1,4 +1,4 @@ -package app.git.branches +package com.jetpackduba.gitnuro.git.branches import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext diff --git a/src/main/kotlin/app/git/branches/MergeBranchUseCase.kt b/src/main/kotlin/com/jetpackduba/gitnuro/git/branches/MergeBranchUseCase.kt similarity index 88% rename from src/main/kotlin/app/git/branches/MergeBranchUseCase.kt rename to src/main/kotlin/com/jetpackduba/gitnuro/git/branches/MergeBranchUseCase.kt index 43f804c..ae9276b 100644 --- a/src/main/kotlin/app/git/branches/MergeBranchUseCase.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/git/branches/MergeBranchUseCase.kt @@ -1,6 +1,6 @@ -package app.git.branches +package com.jetpackduba.gitnuro.git.branches -import app.exceptions.UncommitedChangesDetectedException +import com.jetpackduba.gitnuro.exceptions.UncommitedChangesDetectedException import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext import org.eclipse.jgit.api.Git diff --git a/src/main/kotlin/app/git/diff/FormatDiffUseCase.kt b/src/main/kotlin/com/jetpackduba/gitnuro/git/diff/FormatDiffUseCase.kt similarity index 95% rename from src/main/kotlin/app/git/diff/FormatDiffUseCase.kt rename to src/main/kotlin/com/jetpackduba/gitnuro/git/diff/FormatDiffUseCase.kt index 322e5fc..fa94467 100644 --- a/src/main/kotlin/app/git/diff/FormatDiffUseCase.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/git/diff/FormatDiffUseCase.kt @@ -1,6 +1,6 @@ -package app.git.diff +package com.jetpackduba.gitnuro.git.diff -import app.git.DiffEntryType +import com.jetpackduba.gitnuro.git.DiffEntryType import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext import org.eclipse.jgit.api.Git diff --git a/src/main/kotlin/app/git/diff/GenerateSplitHunkFromDiffResultUseCase.kt b/src/main/kotlin/com/jetpackduba/gitnuro/git/diff/GenerateSplitHunkFromDiffResultUseCase.kt similarity index 98% rename from src/main/kotlin/app/git/diff/GenerateSplitHunkFromDiffResultUseCase.kt rename to src/main/kotlin/com/jetpackduba/gitnuro/git/diff/GenerateSplitHunkFromDiffResultUseCase.kt index 96eec69..fbd5421 100644 --- a/src/main/kotlin/app/git/diff/GenerateSplitHunkFromDiffResultUseCase.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/git/diff/GenerateSplitHunkFromDiffResultUseCase.kt @@ -1,4 +1,4 @@ -package app.git.diff +package com.jetpackduba.gitnuro.git.diff import javax.inject.Inject import kotlin.math.abs diff --git a/src/main/kotlin/app/git/diff/GetCommitDiffEntriesUseCase.kt b/src/main/kotlin/com/jetpackduba/gitnuro/git/diff/GetCommitDiffEntriesUseCase.kt similarity index 94% rename from src/main/kotlin/app/git/diff/GetCommitDiffEntriesUseCase.kt rename to src/main/kotlin/com/jetpackduba/gitnuro/git/diff/GetCommitDiffEntriesUseCase.kt index 551d99c..862fac0 100644 --- a/src/main/kotlin/app/git/diff/GetCommitDiffEntriesUseCase.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/git/diff/GetCommitDiffEntriesUseCase.kt @@ -1,6 +1,6 @@ -package app.git.diff +package com.jetpackduba.gitnuro.git.diff -import app.extensions.fullData +import com.jetpackduba.gitnuro.extensions.fullData import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext import org.eclipse.jgit.api.Git diff --git a/src/main/kotlin/app/git/diff/GetDiffEntryForUncommitedDiffUseCase.kt b/src/main/kotlin/com/jetpackduba/gitnuro/git/diff/GetDiffEntryForUncommitedDiffUseCase.kt similarity index 80% rename from src/main/kotlin/app/git/diff/GetDiffEntryForUncommitedDiffUseCase.kt rename to src/main/kotlin/com/jetpackduba/gitnuro/git/diff/GetDiffEntryForUncommitedDiffUseCase.kt index cb4130d..c77194b 100644 --- a/src/main/kotlin/app/git/diff/GetDiffEntryForUncommitedDiffUseCase.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/git/diff/GetDiffEntryForUncommitedDiffUseCase.kt @@ -1,10 +1,10 @@ -package app.git.diff +package com.jetpackduba.gitnuro.git.diff -import app.exceptions.MissingDiffEntryException -import app.extensions.isMerging -import app.git.DiffEntryType -import app.git.branches.GetCurrentBranchUseCase -import app.git.repository.GetRepositoryStateUseCase +import com.jetpackduba.gitnuro.exceptions.MissingDiffEntryException +import com.jetpackduba.gitnuro.extensions.isMerging +import com.jetpackduba.gitnuro.git.DiffEntryType +import com.jetpackduba.gitnuro.git.branches.GetCurrentBranchUseCase +import com.jetpackduba.gitnuro.git.repository.GetRepositoryStateUseCase import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext import org.eclipse.jgit.api.Git diff --git a/src/main/kotlin/app/git/diff/Hunk.kt b/src/main/kotlin/com/jetpackduba/gitnuro/git/diff/Hunk.kt similarity index 92% rename from src/main/kotlin/app/git/diff/Hunk.kt rename to src/main/kotlin/com/jetpackduba/gitnuro/git/diff/Hunk.kt index 58bd984..bf3705c 100644 --- a/src/main/kotlin/app/git/diff/Hunk.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/git/diff/Hunk.kt @@ -1,4 +1,4 @@ -package app.git.diff +package com.jetpackduba.gitnuro.git.diff data class Hunk(val header: String, val lines: List) diff --git a/src/main/kotlin/app/git/diff/HunkDiffGenerator.kt b/src/main/kotlin/com/jetpackduba/gitnuro/git/diff/HunkDiffGenerator.kt similarity index 97% rename from src/main/kotlin/app/git/diff/HunkDiffGenerator.kt rename to src/main/kotlin/com/jetpackduba/gitnuro/git/diff/HunkDiffGenerator.kt index 0c881f2..9a673d3 100644 --- a/src/main/kotlin/app/git/diff/HunkDiffGenerator.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/git/diff/HunkDiffGenerator.kt @@ -1,8 +1,8 @@ -package app.git.diff +package com.jetpackduba.gitnuro.git.diff -import app.extensions.lineAt -import app.git.EntryContent -import app.git.RawFileManager +import com.jetpackduba.gitnuro.extensions.lineAt +import com.jetpackduba.gitnuro.git.EntryContent +import com.jetpackduba.gitnuro.git.RawFileManager import org.eclipse.jgit.diff.* import org.eclipse.jgit.lib.Repository import org.eclipse.jgit.patch.FileHeader diff --git a/src/main/kotlin/app/git/graph/GraphCommitList.kt b/src/main/kotlin/com/jetpackduba/gitnuro/git/graph/GraphCommitList.kt similarity index 99% rename from src/main/kotlin/app/git/graph/GraphCommitList.kt rename to src/main/kotlin/com/jetpackduba/gitnuro/git/graph/GraphCommitList.kt index 633130b..cd1e59b 100644 --- a/src/main/kotlin/app/git/graph/GraphCommitList.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/git/graph/GraphCommitList.kt @@ -1,4 +1,4 @@ -package app.git.graph +package com.jetpackduba.gitnuro.git.graph import org.eclipse.jgit.internal.JGitText import org.eclipse.jgit.lib.AnyObjectId diff --git a/src/main/kotlin/app/git/graph/GraphLane.kt b/src/main/kotlin/com/jetpackduba/gitnuro/git/graph/GraphLane.kt similarity index 64% rename from src/main/kotlin/app/git/graph/GraphLane.kt rename to src/main/kotlin/com/jetpackduba/gitnuro/git/graph/GraphLane.kt index c61d545..724909e 100644 --- a/src/main/kotlin/app/git/graph/GraphLane.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/git/graph/GraphLane.kt @@ -1,4 +1,4 @@ -package app.git.graph +package com.jetpackduba.gitnuro.git.graph const val INVALID_LANE_POSITION = -1 diff --git a/src/main/kotlin/app/git/graph/GraphNode.kt b/src/main/kotlin/com/jetpackduba/gitnuro/git/graph/GraphNode.kt similarity index 98% rename from src/main/kotlin/app/git/graph/GraphNode.kt rename to src/main/kotlin/com/jetpackduba/gitnuro/git/graph/GraphNode.kt index bc31cde..fef03af 100644 --- a/src/main/kotlin/app/git/graph/GraphNode.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/git/graph/GraphNode.kt @@ -1,4 +1,4 @@ -package app.git.graph +package com.jetpackduba.gitnuro.git.graph import org.eclipse.jgit.lib.AnyObjectId import org.eclipse.jgit.lib.Ref diff --git a/src/main/kotlin/app/git/graph/GraphWalk.kt b/src/main/kotlin/com/jetpackduba/gitnuro/git/graph/GraphWalk.kt similarity index 99% rename from src/main/kotlin/app/git/graph/GraphWalk.kt rename to src/main/kotlin/com/jetpackduba/gitnuro/git/graph/GraphWalk.kt index 0ff143a..fbd74d4 100644 --- a/src/main/kotlin/app/git/graph/GraphWalk.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/git/graph/GraphWalk.kt @@ -1,4 +1,4 @@ -package app.git.graph +package com.jetpackduba.gitnuro.git.graph import org.eclipse.jgit.errors.MissingObjectException import org.eclipse.jgit.internal.JGitText diff --git a/src/main/kotlin/app/git/graph/IGraphNode.kt b/src/main/kotlin/com/jetpackduba/gitnuro/git/graph/IGraphNode.kt similarity index 70% rename from src/main/kotlin/app/git/graph/IGraphNode.kt rename to src/main/kotlin/com/jetpackduba/gitnuro/git/graph/IGraphNode.kt index 3b08da5..f47323b 100644 --- a/src/main/kotlin/app/git/graph/IGraphNode.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/git/graph/IGraphNode.kt @@ -1,4 +1,4 @@ -package app.git.graph +package com.jetpackduba.gitnuro.git.graph interface IGraphNode { val graphParentCount: Int diff --git a/src/main/kotlin/app/git/graph/UncommitedChangesGraphNode.kt b/src/main/kotlin/com/jetpackduba/gitnuro/git/graph/UncommitedChangesGraphNode.kt similarity index 89% rename from src/main/kotlin/app/git/graph/UncommitedChangesGraphNode.kt rename to src/main/kotlin/com/jetpackduba/gitnuro/git/graph/UncommitedChangesGraphNode.kt index f8c1db6..2df3c2a 100644 --- a/src/main/kotlin/app/git/graph/UncommitedChangesGraphNode.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/git/graph/UncommitedChangesGraphNode.kt @@ -1,4 +1,4 @@ -package app.git.graph +package com.jetpackduba.gitnuro.git.graph import org.eclipse.jgit.lib.ObjectId diff --git a/src/main/kotlin/app/git/log/CheckHasPreviousCommitsUseCase.kt b/src/main/kotlin/com/jetpackduba/gitnuro/git/log/CheckHasPreviousCommitsUseCase.kt similarity index 93% rename from src/main/kotlin/app/git/log/CheckHasPreviousCommitsUseCase.kt rename to src/main/kotlin/com/jetpackduba/gitnuro/git/log/CheckHasPreviousCommitsUseCase.kt index 4a27c24..0820b3c 100644 --- a/src/main/kotlin/app/git/log/CheckHasPreviousCommitsUseCase.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/git/log/CheckHasPreviousCommitsUseCase.kt @@ -1,4 +1,4 @@ -package app.git.log +package com.jetpackduba.gitnuro.git.log import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext diff --git a/src/main/kotlin/app/git/log/CheckoutCommitUseCase.kt b/src/main/kotlin/com/jetpackduba/gitnuro/git/log/CheckoutCommitUseCase.kt similarity index 91% rename from src/main/kotlin/app/git/log/CheckoutCommitUseCase.kt rename to src/main/kotlin/com/jetpackduba/gitnuro/git/log/CheckoutCommitUseCase.kt index 0586ce8..47c2412 100644 --- a/src/main/kotlin/app/git/log/CheckoutCommitUseCase.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/git/log/CheckoutCommitUseCase.kt @@ -1,4 +1,4 @@ -package app.git.log +package com.jetpackduba.gitnuro.git.log import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext diff --git a/src/main/kotlin/app/git/log/CherryPickCommitUseCase.kt b/src/main/kotlin/com/jetpackduba/gitnuro/git/log/CherryPickCommitUseCase.kt similarity index 92% rename from src/main/kotlin/app/git/log/CherryPickCommitUseCase.kt rename to src/main/kotlin/com/jetpackduba/gitnuro/git/log/CherryPickCommitUseCase.kt index 61b5e65..3ae39bd 100644 --- a/src/main/kotlin/app/git/log/CherryPickCommitUseCase.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/git/log/CherryPickCommitUseCase.kt @@ -1,4 +1,4 @@ -package app.git.log +package com.jetpackduba.gitnuro.git.log import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext diff --git a/src/main/kotlin/app/git/log/GetLastCommitMessageUseCase.kt b/src/main/kotlin/com/jetpackduba/gitnuro/git/log/GetLastCommitMessageUseCase.kt similarity index 94% rename from src/main/kotlin/app/git/log/GetLastCommitMessageUseCase.kt rename to src/main/kotlin/com/jetpackduba/gitnuro/git/log/GetLastCommitMessageUseCase.kt index d3fe839..4f806c5 100644 --- a/src/main/kotlin/app/git/log/GetLastCommitMessageUseCase.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/git/log/GetLastCommitMessageUseCase.kt @@ -1,4 +1,4 @@ -package app.git.log +package com.jetpackduba.gitnuro.git.log import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext diff --git a/src/main/kotlin/app/git/log/GetLogUseCase.kt b/src/main/kotlin/com/jetpackduba/gitnuro/git/log/GetLogUseCase.kt similarity index 91% rename from src/main/kotlin/app/git/log/GetLogUseCase.kt rename to src/main/kotlin/com/jetpackduba/gitnuro/git/log/GetLogUseCase.kt index 69a3b83..a8f29c9 100644 --- a/src/main/kotlin/app/git/log/GetLogUseCase.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/git/log/GetLogUseCase.kt @@ -1,8 +1,8 @@ -package app.git.log +package com.jetpackduba.gitnuro.git.log -import app.git.graph.GraphCommitList -import app.git.graph.GraphWalk +import com.jetpackduba.gitnuro.git.graph.GraphCommitList +import com.jetpackduba.gitnuro.git.graph.GraphWalk import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.ensureActive import kotlinx.coroutines.withContext diff --git a/src/main/kotlin/app/git/log/ResetToCommitUseCase.kt b/src/main/kotlin/com/jetpackduba/gitnuro/git/log/ResetToCommitUseCase.kt similarity index 95% rename from src/main/kotlin/app/git/log/ResetToCommitUseCase.kt rename to src/main/kotlin/com/jetpackduba/gitnuro/git/log/ResetToCommitUseCase.kt index 76ba9bf..c338135 100644 --- a/src/main/kotlin/app/git/log/ResetToCommitUseCase.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/git/log/ResetToCommitUseCase.kt @@ -1,4 +1,4 @@ -package app.git.log +package com.jetpackduba.gitnuro.git.log import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext diff --git a/src/main/kotlin/app/git/log/RevertCommitUseCase.kt b/src/main/kotlin/com/jetpackduba/gitnuro/git/log/RevertCommitUseCase.kt similarity index 91% rename from src/main/kotlin/app/git/log/RevertCommitUseCase.kt rename to src/main/kotlin/com/jetpackduba/gitnuro/git/log/RevertCommitUseCase.kt index f06a2fc..676a684 100644 --- a/src/main/kotlin/app/git/log/RevertCommitUseCase.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/git/log/RevertCommitUseCase.kt @@ -1,4 +1,4 @@ -package app.git.log +package com.jetpackduba.gitnuro.git.log import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext diff --git a/src/main/kotlin/app/git/rebase/AbortRebaseUseCase.kt b/src/main/kotlin/com/jetpackduba/gitnuro/git/rebase/AbortRebaseUseCase.kt similarity index 90% rename from src/main/kotlin/app/git/rebase/AbortRebaseUseCase.kt rename to src/main/kotlin/com/jetpackduba/gitnuro/git/rebase/AbortRebaseUseCase.kt index 117344f..9ce1e57 100644 --- a/src/main/kotlin/app/git/rebase/AbortRebaseUseCase.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/git/rebase/AbortRebaseUseCase.kt @@ -1,4 +1,4 @@ -package app.git.rebase +package com.jetpackduba.gitnuro.git.rebase import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext diff --git a/src/main/kotlin/app/git/rebase/ContinueRebaseUseCase.kt b/src/main/kotlin/com/jetpackduba/gitnuro/git/rebase/ContinueRebaseUseCase.kt similarity index 90% rename from src/main/kotlin/app/git/rebase/ContinueRebaseUseCase.kt rename to src/main/kotlin/com/jetpackduba/gitnuro/git/rebase/ContinueRebaseUseCase.kt index 633e2b2..03aa974 100644 --- a/src/main/kotlin/app/git/rebase/ContinueRebaseUseCase.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/git/rebase/ContinueRebaseUseCase.kt @@ -1,4 +1,4 @@ -package app.git.rebase +package com.jetpackduba.gitnuro.git.rebase import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext diff --git a/src/main/kotlin/app/git/rebase/GetRebaseLinesFullMessageUseCase.kt b/src/main/kotlin/com/jetpackduba/gitnuro/git/rebase/GetRebaseLinesFullMessageUseCase.kt similarity index 97% rename from src/main/kotlin/app/git/rebase/GetRebaseLinesFullMessageUseCase.kt rename to src/main/kotlin/com/jetpackduba/gitnuro/git/rebase/GetRebaseLinesFullMessageUseCase.kt index 274c34c..d6595b6 100644 --- a/src/main/kotlin/app/git/rebase/GetRebaseLinesFullMessageUseCase.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/git/rebase/GetRebaseLinesFullMessageUseCase.kt @@ -1,4 +1,4 @@ -package app.git.rebase +package com.jetpackduba.gitnuro.git.rebase import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext diff --git a/src/main/kotlin/app/git/rebase/RebaseBranchUseCase.kt b/src/main/kotlin/com/jetpackduba/gitnuro/git/rebase/RebaseBranchUseCase.kt similarity index 86% rename from src/main/kotlin/app/git/rebase/RebaseBranchUseCase.kt rename to src/main/kotlin/com/jetpackduba/gitnuro/git/rebase/RebaseBranchUseCase.kt index acf4810..fd7b4bf 100644 --- a/src/main/kotlin/app/git/rebase/RebaseBranchUseCase.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/git/rebase/RebaseBranchUseCase.kt @@ -1,6 +1,6 @@ -package app.git.rebase +package com.jetpackduba.gitnuro.git.rebase -import app.exceptions.UncommitedChangesDetectedException +import com.jetpackduba.gitnuro.exceptions.UncommitedChangesDetectedException import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext import org.eclipse.jgit.api.Git diff --git a/src/main/kotlin/app/git/rebase/ResumeRebaseInteractiveUseCase.kt b/src/main/kotlin/com/jetpackduba/gitnuro/git/rebase/ResumeRebaseInteractiveUseCase.kt similarity index 86% rename from src/main/kotlin/app/git/rebase/ResumeRebaseInteractiveUseCase.kt rename to src/main/kotlin/com/jetpackduba/gitnuro/git/rebase/ResumeRebaseInteractiveUseCase.kt index 9a05fb6..60332da 100644 --- a/src/main/kotlin/app/git/rebase/ResumeRebaseInteractiveUseCase.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/git/rebase/ResumeRebaseInteractiveUseCase.kt @@ -1,6 +1,6 @@ -package app.git.rebase +package com.jetpackduba.gitnuro.git.rebase -import app.exceptions.UncommitedChangesDetectedException +import com.jetpackduba.gitnuro.exceptions.UncommitedChangesDetectedException import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext import org.eclipse.jgit.api.Git diff --git a/src/main/kotlin/app/git/rebase/SkipRebaseUseCase.kt b/src/main/kotlin/com/jetpackduba/gitnuro/git/rebase/SkipRebaseUseCase.kt similarity index 90% rename from src/main/kotlin/app/git/rebase/SkipRebaseUseCase.kt rename to src/main/kotlin/com/jetpackduba/gitnuro/git/rebase/SkipRebaseUseCase.kt index 97e01f1..bb85e11 100644 --- a/src/main/kotlin/app/git/rebase/SkipRebaseUseCase.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/git/rebase/SkipRebaseUseCase.kt @@ -1,4 +1,4 @@ -package app.git.rebase +package com.jetpackduba.gitnuro.git.rebase import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext diff --git a/src/main/kotlin/app/git/rebase/StartRebaseInteractiveUseCase.kt b/src/main/kotlin/com/jetpackduba/gitnuro/git/rebase/StartRebaseInteractiveUseCase.kt similarity index 87% rename from src/main/kotlin/app/git/rebase/StartRebaseInteractiveUseCase.kt rename to src/main/kotlin/com/jetpackduba/gitnuro/git/rebase/StartRebaseInteractiveUseCase.kt index 2aadc7b..fc39033 100644 --- a/src/main/kotlin/app/git/rebase/StartRebaseInteractiveUseCase.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/git/rebase/StartRebaseInteractiveUseCase.kt @@ -1,6 +1,6 @@ -package app.git.rebase +package com.jetpackduba.gitnuro.git.rebase -import app.exceptions.UncommitedChangesDetectedException +import com.jetpackduba.gitnuro.exceptions.UncommitedChangesDetectedException import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext import org.eclipse.jgit.api.Git diff --git a/src/main/kotlin/app/git/remote_operations/CloneRepositoryUseCase.kt b/src/main/kotlin/com/jetpackduba/gitnuro/git/remote_operations/CloneRepositoryUseCase.kt similarity index 96% rename from src/main/kotlin/app/git/remote_operations/CloneRepositoryUseCase.kt rename to src/main/kotlin/com/jetpackduba/gitnuro/git/remote_operations/CloneRepositoryUseCase.kt index d3c7e6e..b821832 100644 --- a/src/main/kotlin/app/git/remote_operations/CloneRepositoryUseCase.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/git/remote_operations/CloneRepositoryUseCase.kt @@ -1,6 +1,6 @@ -package app.git.remote_operations +package com.jetpackduba.gitnuro.git.remote_operations -import app.git.CloneStatus +import com.jetpackduba.gitnuro.git.CloneStatus import kotlinx.coroutines.CancellationException import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.channels.awaitClose diff --git a/src/main/kotlin/app/git/remote_operations/DeleteRemoteBranchUseCase.kt b/src/main/kotlin/com/jetpackduba/gitnuro/git/remote_operations/DeleteRemoteBranchUseCase.kt similarity index 88% rename from src/main/kotlin/app/git/remote_operations/DeleteRemoteBranchUseCase.kt rename to src/main/kotlin/com/jetpackduba/gitnuro/git/remote_operations/DeleteRemoteBranchUseCase.kt index a647623..b0c9ec6 100644 --- a/src/main/kotlin/app/git/remote_operations/DeleteRemoteBranchUseCase.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/git/remote_operations/DeleteRemoteBranchUseCase.kt @@ -1,8 +1,8 @@ -package app.git.remote_operations +package com.jetpackduba.gitnuro.git.remote_operations -import app.git.branches.DeleteBranchUseCase -import app.git.isRejected -import app.git.statusMessage +import com.jetpackduba.gitnuro.git.branches.DeleteBranchUseCase +import com.jetpackduba.gitnuro.git.isRejected +import com.jetpackduba.gitnuro.git.statusMessage import org.eclipse.jgit.api.Git import org.eclipse.jgit.lib.Ref import org.eclipse.jgit.transport.RefSpec diff --git a/src/main/kotlin/app/git/remote_operations/FetchAllBranchesUseCase.kt b/src/main/kotlin/com/jetpackduba/gitnuro/git/remote_operations/FetchAllBranchesUseCase.kt similarity index 93% rename from src/main/kotlin/app/git/remote_operations/FetchAllBranchesUseCase.kt rename to src/main/kotlin/com/jetpackduba/gitnuro/git/remote_operations/FetchAllBranchesUseCase.kt index 68afa64..b20ab6d 100644 --- a/src/main/kotlin/app/git/remote_operations/FetchAllBranchesUseCase.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/git/remote_operations/FetchAllBranchesUseCase.kt @@ -1,4 +1,4 @@ -package app.git.remote_operations +package com.jetpackduba.gitnuro.git.remote_operations import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext diff --git a/src/main/kotlin/app/git/remote_operations/HandleTransportUseCase.kt b/src/main/kotlin/com/jetpackduba/gitnuro/git/remote_operations/HandleTransportUseCase.kt similarity index 76% rename from src/main/kotlin/app/git/remote_operations/HandleTransportUseCase.kt rename to src/main/kotlin/com/jetpackduba/gitnuro/git/remote_operations/HandleTransportUseCase.kt index a310559..6bf145b 100644 --- a/src/main/kotlin/app/git/remote_operations/HandleTransportUseCase.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/git/remote_operations/HandleTransportUseCase.kt @@ -1,7 +1,7 @@ -package app.git.remote_operations +package com.jetpackduba.gitnuro.git.remote_operations -import app.credentials.GSessionManager -import app.credentials.HttpCredentialsProvider +import com.jetpackduba.gitnuro.credentials.GSessionManager +import com.jetpackduba.gitnuro.credentials.HttpCredentialsProvider import org.eclipse.jgit.transport.HttpTransport import org.eclipse.jgit.transport.SshTransport import org.eclipse.jgit.transport.Transport diff --git a/src/main/kotlin/app/git/remote_operations/PullBranchUseCase.kt b/src/main/kotlin/com/jetpackduba/gitnuro/git/remote_operations/PullBranchUseCase.kt similarity index 95% rename from src/main/kotlin/app/git/remote_operations/PullBranchUseCase.kt rename to src/main/kotlin/com/jetpackduba/gitnuro/git/remote_operations/PullBranchUseCase.kt index 6b3681f..bb1f27c 100644 --- a/src/main/kotlin/app/git/remote_operations/PullBranchUseCase.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/git/remote_operations/PullBranchUseCase.kt @@ -1,4 +1,4 @@ -package app.git.remote_operations +package com.jetpackduba.gitnuro.git.remote_operations import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext diff --git a/src/main/kotlin/app/git/remote_operations/PullFromSpecificBranchUseCase.kt b/src/main/kotlin/com/jetpackduba/gitnuro/git/remote_operations/PullFromSpecificBranchUseCase.kt similarity index 90% rename from src/main/kotlin/app/git/remote_operations/PullFromSpecificBranchUseCase.kt rename to src/main/kotlin/com/jetpackduba/gitnuro/git/remote_operations/PullFromSpecificBranchUseCase.kt index ba34224..5187109 100644 --- a/src/main/kotlin/app/git/remote_operations/PullFromSpecificBranchUseCase.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/git/remote_operations/PullFromSpecificBranchUseCase.kt @@ -1,7 +1,7 @@ -package app.git.remote_operations +package com.jetpackduba.gitnuro.git.remote_operations -import app.extensions.remoteName -import app.extensions.simpleName +import com.jetpackduba.gitnuro.extensions.remoteName +import com.jetpackduba.gitnuro.extensions.simpleName import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext import org.eclipse.jgit.api.Git diff --git a/src/main/kotlin/app/git/remote_operations/PushBranchUseCase.kt b/src/main/kotlin/com/jetpackduba/gitnuro/git/remote_operations/PushBranchUseCase.kt similarity index 89% rename from src/main/kotlin/app/git/remote_operations/PushBranchUseCase.kt rename to src/main/kotlin/com/jetpackduba/gitnuro/git/remote_operations/PushBranchUseCase.kt index 7012360..5bed992 100644 --- a/src/main/kotlin/app/git/remote_operations/PushBranchUseCase.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/git/remote_operations/PushBranchUseCase.kt @@ -1,7 +1,7 @@ -package app.git.remote_operations +package com.jetpackduba.gitnuro.git.remote_operations -import app.git.isRejected -import app.git.statusMessage +import com.jetpackduba.gitnuro.git.isRejected +import com.jetpackduba.gitnuro.git.statusMessage import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext import org.eclipse.jgit.api.Git diff --git a/src/main/kotlin/app/git/remote_operations/PushToSpecificBranchUseCase.kt b/src/main/kotlin/com/jetpackduba/gitnuro/git/remote_operations/PushToSpecificBranchUseCase.kt similarity index 85% rename from src/main/kotlin/app/git/remote_operations/PushToSpecificBranchUseCase.kt rename to src/main/kotlin/com/jetpackduba/gitnuro/git/remote_operations/PushToSpecificBranchUseCase.kt index 2524d74..0b0e5d0 100644 --- a/src/main/kotlin/app/git/remote_operations/PushToSpecificBranchUseCase.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/git/remote_operations/PushToSpecificBranchUseCase.kt @@ -1,9 +1,9 @@ -package app.git.remote_operations +package com.jetpackduba.gitnuro.git.remote_operations -import app.extensions.remoteName -import app.extensions.simpleName -import app.git.isRejected -import app.git.statusMessage +import com.jetpackduba.gitnuro.extensions.remoteName +import com.jetpackduba.gitnuro.extensions.simpleName +import com.jetpackduba.gitnuro.git.isRejected +import com.jetpackduba.gitnuro.git.statusMessage import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext import org.eclipse.jgit.api.Git diff --git a/src/main/kotlin/app/git/remotes/AddRemoteUseCase.kt b/src/main/kotlin/com/jetpackduba/gitnuro/git/remotes/AddRemoteUseCase.kt similarity index 91% rename from src/main/kotlin/app/git/remotes/AddRemoteUseCase.kt rename to src/main/kotlin/com/jetpackduba/gitnuro/git/remotes/AddRemoteUseCase.kt index ab35c73..9df378b 100644 --- a/src/main/kotlin/app/git/remotes/AddRemoteUseCase.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/git/remotes/AddRemoteUseCase.kt @@ -1,4 +1,4 @@ -package app.git.remotes +package com.jetpackduba.gitnuro.git.remotes import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext diff --git a/src/main/kotlin/app/git/remotes/DeleteRemoteUseCase.kt b/src/main/kotlin/com/jetpackduba/gitnuro/git/remotes/DeleteRemoteUseCase.kt similarity index 89% rename from src/main/kotlin/app/git/remotes/DeleteRemoteUseCase.kt rename to src/main/kotlin/com/jetpackduba/gitnuro/git/remotes/DeleteRemoteUseCase.kt index 7a353b3..619cbec 100644 --- a/src/main/kotlin/app/git/remotes/DeleteRemoteUseCase.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/git/remotes/DeleteRemoteUseCase.kt @@ -1,4 +1,4 @@ -package app.git.remotes +package com.jetpackduba.gitnuro.git.remotes import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext diff --git a/src/main/kotlin/app/git/remotes/GetRemotesUseCase.kt b/src/main/kotlin/com/jetpackduba/gitnuro/git/remotes/GetRemotesUseCase.kt similarity index 94% rename from src/main/kotlin/app/git/remotes/GetRemotesUseCase.kt rename to src/main/kotlin/com/jetpackduba/gitnuro/git/remotes/GetRemotesUseCase.kt index 2ce86be..e6eebc1 100644 --- a/src/main/kotlin/app/git/remotes/GetRemotesUseCase.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/git/remotes/GetRemotesUseCase.kt @@ -1,4 +1,4 @@ -package app.git.remotes +package com.jetpackduba.gitnuro.git.remotes import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext diff --git a/src/main/kotlin/app/git/remotes/RemoteInfo.kt b/src/main/kotlin/com/jetpackduba/gitnuro/git/remotes/RemoteInfo.kt similarity index 78% rename from src/main/kotlin/app/git/remotes/RemoteInfo.kt rename to src/main/kotlin/com/jetpackduba/gitnuro/git/remotes/RemoteInfo.kt index 58a8ab0..6e43091 100644 --- a/src/main/kotlin/app/git/remotes/RemoteInfo.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/git/remotes/RemoteInfo.kt @@ -1,4 +1,4 @@ -package app.git.remotes +package com.jetpackduba.gitnuro.git.remotes import org.eclipse.jgit.lib.Ref import org.eclipse.jgit.transport.RemoteConfig diff --git a/src/main/kotlin/app/git/remotes/UpdateRemoteUseCase.kt b/src/main/kotlin/com/jetpackduba/gitnuro/git/remotes/UpdateRemoteUseCase.kt similarity index 93% rename from src/main/kotlin/app/git/remotes/UpdateRemoteUseCase.kt rename to src/main/kotlin/com/jetpackduba/gitnuro/git/remotes/UpdateRemoteUseCase.kt index c1f8555..d8d1f63 100644 --- a/src/main/kotlin/app/git/remotes/UpdateRemoteUseCase.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/git/remotes/UpdateRemoteUseCase.kt @@ -1,4 +1,4 @@ -package app.git.remotes +package com.jetpackduba.gitnuro.git.remotes import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext diff --git a/src/main/kotlin/app/git/repository/GetRepositoryStateUseCase.kt b/src/main/kotlin/com/jetpackduba/gitnuro/git/repository/GetRepositoryStateUseCase.kt similarity index 89% rename from src/main/kotlin/app/git/repository/GetRepositoryStateUseCase.kt rename to src/main/kotlin/com/jetpackduba/gitnuro/git/repository/GetRepositoryStateUseCase.kt index 2f57609..ed0c950 100644 --- a/src/main/kotlin/app/git/repository/GetRepositoryStateUseCase.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/git/repository/GetRepositoryStateUseCase.kt @@ -1,4 +1,4 @@ -package app.git.repository +package com.jetpackduba.gitnuro.git.repository import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext diff --git a/src/main/kotlin/app/git/repository/InitLocalRepositoryUseCase.kt b/src/main/kotlin/com/jetpackduba/gitnuro/git/repository/InitLocalRepositoryUseCase.kt similarity index 91% rename from src/main/kotlin/app/git/repository/InitLocalRepositoryUseCase.kt rename to src/main/kotlin/com/jetpackduba/gitnuro/git/repository/InitLocalRepositoryUseCase.kt index b6eb991..fa80efb 100644 --- a/src/main/kotlin/app/git/repository/InitLocalRepositoryUseCase.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/git/repository/InitLocalRepositoryUseCase.kt @@ -1,4 +1,4 @@ -package app.git.repository +package com.jetpackduba.gitnuro.git.repository import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext diff --git a/src/main/kotlin/app/git/repository/OpenRepositoryUseCase.kt b/src/main/kotlin/com/jetpackduba/gitnuro/git/repository/OpenRepositoryUseCase.kt similarity index 95% rename from src/main/kotlin/app/git/repository/OpenRepositoryUseCase.kt rename to src/main/kotlin/com/jetpackduba/gitnuro/git/repository/OpenRepositoryUseCase.kt index 3a3d6f7..f491bb8 100644 --- a/src/main/kotlin/app/git/repository/OpenRepositoryUseCase.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/git/repository/OpenRepositoryUseCase.kt @@ -1,4 +1,4 @@ -package app.git.repository +package com.jetpackduba.gitnuro.git.repository import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext diff --git a/src/main/kotlin/app/git/repository/ResetRepositoryStateUseCase.kt b/src/main/kotlin/com/jetpackduba/gitnuro/git/repository/ResetRepositoryStateUseCase.kt similarity index 91% rename from src/main/kotlin/app/git/repository/ResetRepositoryStateUseCase.kt rename to src/main/kotlin/com/jetpackduba/gitnuro/git/repository/ResetRepositoryStateUseCase.kt index ea5ca17..b98718d 100644 --- a/src/main/kotlin/app/git/repository/ResetRepositoryStateUseCase.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/git/repository/ResetRepositoryStateUseCase.kt @@ -1,4 +1,4 @@ -package app.git.repository +package com.jetpackduba.gitnuro.git.repository import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext diff --git a/src/main/kotlin/app/git/stash/ApplyStashUseCase.kt b/src/main/kotlin/com/jetpackduba/gitnuro/git/stash/ApplyStashUseCase.kt similarity index 90% rename from src/main/kotlin/app/git/stash/ApplyStashUseCase.kt rename to src/main/kotlin/com/jetpackduba/gitnuro/git/stash/ApplyStashUseCase.kt index 58cb65c..ffa09cc 100644 --- a/src/main/kotlin/app/git/stash/ApplyStashUseCase.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/git/stash/ApplyStashUseCase.kt @@ -1,4 +1,4 @@ -package app.git.stash +package com.jetpackduba.gitnuro.git.stash import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext diff --git a/src/main/kotlin/app/git/stash/DeleteStashUseCase.kt b/src/main/kotlin/com/jetpackduba/gitnuro/git/stash/DeleteStashUseCase.kt similarity index 93% rename from src/main/kotlin/app/git/stash/DeleteStashUseCase.kt rename to src/main/kotlin/com/jetpackduba/gitnuro/git/stash/DeleteStashUseCase.kt index 36cc5c1..9894ac1 100644 --- a/src/main/kotlin/app/git/stash/DeleteStashUseCase.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/git/stash/DeleteStashUseCase.kt @@ -1,4 +1,4 @@ -package app.git.stash +package com.jetpackduba.gitnuro.git.stash import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext diff --git a/src/main/kotlin/app/git/stash/GetStashListUseCase.kt b/src/main/kotlin/com/jetpackduba/gitnuro/git/stash/GetStashListUseCase.kt similarity index 91% rename from src/main/kotlin/app/git/stash/GetStashListUseCase.kt rename to src/main/kotlin/com/jetpackduba/gitnuro/git/stash/GetStashListUseCase.kt index bb47b04..45c9514 100644 --- a/src/main/kotlin/app/git/stash/GetStashListUseCase.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/git/stash/GetStashListUseCase.kt @@ -1,4 +1,4 @@ -package app.git.stash +package com.jetpackduba.gitnuro.git.stash import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext diff --git a/src/main/kotlin/app/git/stash/PopLastStashUseCase.kt b/src/main/kotlin/com/jetpackduba/gitnuro/git/stash/PopLastStashUseCase.kt similarity index 89% rename from src/main/kotlin/app/git/stash/PopLastStashUseCase.kt rename to src/main/kotlin/com/jetpackduba/gitnuro/git/stash/PopLastStashUseCase.kt index b9ea4b1..9906dfe 100644 --- a/src/main/kotlin/app/git/stash/PopLastStashUseCase.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/git/stash/PopLastStashUseCase.kt @@ -1,4 +1,4 @@ -package app.git.stash +package com.jetpackduba.gitnuro.git.stash import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext diff --git a/src/main/kotlin/app/git/stash/PopStashUseCase.kt b/src/main/kotlin/com/jetpackduba/gitnuro/git/stash/PopStashUseCase.kt similarity index 92% rename from src/main/kotlin/app/git/stash/PopStashUseCase.kt rename to src/main/kotlin/com/jetpackduba/gitnuro/git/stash/PopStashUseCase.kt index 7475205..b9398bd 100644 --- a/src/main/kotlin/app/git/stash/PopStashUseCase.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/git/stash/PopStashUseCase.kt @@ -1,4 +1,4 @@ -package app.git.stash +package com.jetpackduba.gitnuro.git.stash import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext diff --git a/src/main/kotlin/app/git/stash/StashChangesUseCase.kt b/src/main/kotlin/com/jetpackduba/gitnuro/git/stash/StashChangesUseCase.kt similarity index 92% rename from src/main/kotlin/app/git/stash/StashChangesUseCase.kt rename to src/main/kotlin/com/jetpackduba/gitnuro/git/stash/StashChangesUseCase.kt index cb626e8..4d7cd2d 100644 --- a/src/main/kotlin/app/git/stash/StashChangesUseCase.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/git/stash/StashChangesUseCase.kt @@ -1,4 +1,4 @@ -package app.git.stash +package com.jetpackduba.gitnuro.git.stash import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext diff --git a/src/main/kotlin/app/git/submodules/GetSubmodulesUseCase.kt b/src/main/kotlin/com/jetpackduba/gitnuro/git/submodules/GetSubmodulesUseCase.kt similarity index 90% rename from src/main/kotlin/app/git/submodules/GetSubmodulesUseCase.kt rename to src/main/kotlin/com/jetpackduba/gitnuro/git/submodules/GetSubmodulesUseCase.kt index 627f822..b8c92c8 100644 --- a/src/main/kotlin/app/git/submodules/GetSubmodulesUseCase.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/git/submodules/GetSubmodulesUseCase.kt @@ -1,4 +1,4 @@ -package app.git.submodules +package com.jetpackduba.gitnuro.git.submodules import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext diff --git a/src/main/kotlin/app/git/submodules/InitalizeSubmoduleUseCase.kt b/src/main/kotlin/com/jetpackduba/gitnuro/git/submodules/InitalizeSubmoduleUseCase.kt similarity index 88% rename from src/main/kotlin/app/git/submodules/InitalizeSubmoduleUseCase.kt rename to src/main/kotlin/com/jetpackduba/gitnuro/git/submodules/InitalizeSubmoduleUseCase.kt index f9e4414..81451fe 100644 --- a/src/main/kotlin/app/git/submodules/InitalizeSubmoduleUseCase.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/git/submodules/InitalizeSubmoduleUseCase.kt @@ -1,4 +1,4 @@ -package app.git.submodules +package com.jetpackduba.gitnuro.git.submodules import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext diff --git a/src/main/kotlin/app/git/submodules/UpdateSubmoduleUseCase.kt b/src/main/kotlin/com/jetpackduba/gitnuro/git/submodules/UpdateSubmoduleUseCase.kt similarity index 94% rename from src/main/kotlin/app/git/submodules/UpdateSubmoduleUseCase.kt rename to src/main/kotlin/com/jetpackduba/gitnuro/git/submodules/UpdateSubmoduleUseCase.kt index bd25378..1bc49df 100644 --- a/src/main/kotlin/app/git/submodules/UpdateSubmoduleUseCase.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/git/submodules/UpdateSubmoduleUseCase.kt @@ -1,6 +1,6 @@ -package app.git.submodules +package com.jetpackduba.gitnuro.git.submodules -import app.logging.printLog +import com.jetpackduba.gitnuro.logging.printLog import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext import org.eclipse.jgit.api.CloneCommand diff --git a/src/main/kotlin/app/git/tags/CreateTagOnCommitUseCase.kt b/src/main/kotlin/com/jetpackduba/gitnuro/git/tags/CreateTagOnCommitUseCase.kt similarity index 92% rename from src/main/kotlin/app/git/tags/CreateTagOnCommitUseCase.kt rename to src/main/kotlin/com/jetpackduba/gitnuro/git/tags/CreateTagOnCommitUseCase.kt index a5f9070..f1e79af 100644 --- a/src/main/kotlin/app/git/tags/CreateTagOnCommitUseCase.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/git/tags/CreateTagOnCommitUseCase.kt @@ -1,4 +1,4 @@ -package app.git.tags +package com.jetpackduba.gitnuro.git.tags import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext diff --git a/src/main/kotlin/app/git/tags/DeleteTagUseCase.kt b/src/main/kotlin/com/jetpackduba/gitnuro/git/tags/DeleteTagUseCase.kt similarity index 90% rename from src/main/kotlin/app/git/tags/DeleteTagUseCase.kt rename to src/main/kotlin/com/jetpackduba/gitnuro/git/tags/DeleteTagUseCase.kt index 96ee244..45b3ee5 100644 --- a/src/main/kotlin/app/git/tags/DeleteTagUseCase.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/git/tags/DeleteTagUseCase.kt @@ -1,4 +1,4 @@ -package app.git.tags +package com.jetpackduba.gitnuro.git.tags import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext diff --git a/src/main/kotlin/app/git/tags/GetTagsUseCase.kt b/src/main/kotlin/com/jetpackduba/gitnuro/git/tags/GetTagsUseCase.kt similarity index 89% rename from src/main/kotlin/app/git/tags/GetTagsUseCase.kt rename to src/main/kotlin/com/jetpackduba/gitnuro/git/tags/GetTagsUseCase.kt index a3283ed..ef533ce 100644 --- a/src/main/kotlin/app/git/tags/GetTagsUseCase.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/git/tags/GetTagsUseCase.kt @@ -1,4 +1,4 @@ -package app.git.tags +package com.jetpackduba.gitnuro.git.tags import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext diff --git a/src/main/kotlin/app/git/workspace/CheckHasUncommitedChangedUseCase.kt b/src/main/kotlin/com/jetpackduba/gitnuro/git/workspace/CheckHasUncommitedChangedUseCase.kt similarity index 80% rename from src/main/kotlin/app/git/workspace/CheckHasUncommitedChangedUseCase.kt rename to src/main/kotlin/com/jetpackduba/gitnuro/git/workspace/CheckHasUncommitedChangedUseCase.kt index 4a82a65..2d6a59d 100644 --- a/src/main/kotlin/app/git/workspace/CheckHasUncommitedChangedUseCase.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/git/workspace/CheckHasUncommitedChangedUseCase.kt @@ -1,6 +1,6 @@ -package app.git.workspace +package com.jetpackduba.gitnuro.git.workspace -import app.extensions.hasUntrackedChanges +import com.jetpackduba.gitnuro.extensions.hasUntrackedChanges import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext import org.eclipse.jgit.api.Git diff --git a/src/main/kotlin/app/git/workspace/DoCommitUseCase.kt b/src/main/kotlin/com/jetpackduba/gitnuro/git/workspace/DoCommitUseCase.kt similarity index 91% rename from src/main/kotlin/app/git/workspace/DoCommitUseCase.kt rename to src/main/kotlin/com/jetpackduba/gitnuro/git/workspace/DoCommitUseCase.kt index 921bf99..fbab270 100644 --- a/src/main/kotlin/app/git/workspace/DoCommitUseCase.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/git/workspace/DoCommitUseCase.kt @@ -1,4 +1,4 @@ -package app.git.workspace +package com.jetpackduba.gitnuro.git.workspace import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext diff --git a/src/main/kotlin/app/git/workspace/GetLinesFromRawTextUseCase.kt b/src/main/kotlin/com/jetpackduba/gitnuro/git/workspace/GetLinesFromRawTextUseCase.kt similarity index 91% rename from src/main/kotlin/app/git/workspace/GetLinesFromRawTextUseCase.kt rename to src/main/kotlin/com/jetpackduba/gitnuro/git/workspace/GetLinesFromRawTextUseCase.kt index d0011de..54ec42c 100644 --- a/src/main/kotlin/app/git/workspace/GetLinesFromRawTextUseCase.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/git/workspace/GetLinesFromRawTextUseCase.kt @@ -1,4 +1,4 @@ -package app.git.workspace +package com.jetpackduba.gitnuro.git.workspace import org.eclipse.jgit.diff.RawText import javax.inject.Inject diff --git a/src/main/kotlin/app/git/workspace/GetLinesFromTextUseCase.kt b/src/main/kotlin/com/jetpackduba/gitnuro/git/workspace/GetLinesFromTextUseCase.kt similarity index 94% rename from src/main/kotlin/app/git/workspace/GetLinesFromTextUseCase.kt rename to src/main/kotlin/com/jetpackduba/gitnuro/git/workspace/GetLinesFromTextUseCase.kt index 28339cc..9b7d3b8 100644 --- a/src/main/kotlin/app/git/workspace/GetLinesFromTextUseCase.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/git/workspace/GetLinesFromTextUseCase.kt @@ -1,4 +1,4 @@ -package app.git.workspace +package com.jetpackduba.gitnuro.git.workspace import javax.inject.Inject diff --git a/src/main/kotlin/app/git/workspace/GetStagedUseCase.kt b/src/main/kotlin/com/jetpackduba/gitnuro/git/workspace/GetStagedUseCase.kt similarity index 88% rename from src/main/kotlin/app/git/workspace/GetStagedUseCase.kt rename to src/main/kotlin/com/jetpackduba/gitnuro/git/workspace/GetStagedUseCase.kt index 4e150ef..fb20ddf 100644 --- a/src/main/kotlin/app/git/workspace/GetStagedUseCase.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/git/workspace/GetStagedUseCase.kt @@ -1,6 +1,6 @@ -package app.git.workspace +package com.jetpackduba.gitnuro.git.workspace -import app.extensions.flatListOf +import com.jetpackduba.gitnuro.extensions.flatListOf import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext import org.eclipse.jgit.api.Status diff --git a/src/main/kotlin/app/git/workspace/GetStatusSummaryUseCase.kt b/src/main/kotlin/com/jetpackduba/gitnuro/git/workspace/GetStatusSummaryUseCase.kt similarity index 91% rename from src/main/kotlin/app/git/workspace/GetStatusSummaryUseCase.kt rename to src/main/kotlin/com/jetpackduba/gitnuro/git/workspace/GetStatusSummaryUseCase.kt index 6ff3208..820ff3d 100644 --- a/src/main/kotlin/app/git/workspace/GetStatusSummaryUseCase.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/git/workspace/GetStatusSummaryUseCase.kt @@ -1,6 +1,6 @@ -package app.git.workspace +package com.jetpackduba.gitnuro.git.workspace -import app.extensions.countOrZero +import com.jetpackduba.gitnuro.extensions.countOrZero import org.eclipse.jgit.api.Git import javax.inject.Inject diff --git a/src/main/kotlin/app/git/workspace/GetStatusUseCase.kt b/src/main/kotlin/com/jetpackduba/gitnuro/git/workspace/GetStatusUseCase.kt similarity index 89% rename from src/main/kotlin/app/git/workspace/GetStatusUseCase.kt rename to src/main/kotlin/com/jetpackduba/gitnuro/git/workspace/GetStatusUseCase.kt index 3def83c..904c87b 100644 --- a/src/main/kotlin/app/git/workspace/GetStatusUseCase.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/git/workspace/GetStatusUseCase.kt @@ -1,4 +1,4 @@ -package app.git.workspace +package com.jetpackduba.gitnuro.git.workspace import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext diff --git a/src/main/kotlin/app/git/workspace/GetUnstagedUseCase.kt b/src/main/kotlin/com/jetpackduba/gitnuro/git/workspace/GetUnstagedUseCase.kt similarity index 90% rename from src/main/kotlin/app/git/workspace/GetUnstagedUseCase.kt rename to src/main/kotlin/com/jetpackduba/gitnuro/git/workspace/GetUnstagedUseCase.kt index 46711e4..d630b5e 100644 --- a/src/main/kotlin/app/git/workspace/GetUnstagedUseCase.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/git/workspace/GetUnstagedUseCase.kt @@ -1,6 +1,6 @@ -package app.git.workspace +package com.jetpackduba.gitnuro.git.workspace -import app.extensions.flatListOf +import com.jetpackduba.gitnuro.extensions.flatListOf import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext import org.eclipse.jgit.api.Status diff --git a/src/main/kotlin/app/git/workspace/HunkEdit.kt b/src/main/kotlin/com/jetpackduba/gitnuro/git/workspace/HunkEdit.kt similarity index 96% rename from src/main/kotlin/app/git/workspace/HunkEdit.kt rename to src/main/kotlin/com/jetpackduba/gitnuro/git/workspace/HunkEdit.kt index 8bdf9e1..cdb657d 100644 --- a/src/main/kotlin/app/git/workspace/HunkEdit.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/git/workspace/HunkEdit.kt @@ -1,4 +1,4 @@ -package app.git.workspace +package com.jetpackduba.gitnuro.git.workspace import org.eclipse.jgit.dircache.DirCacheEditor import org.eclipse.jgit.dircache.DirCacheEntry diff --git a/src/main/kotlin/app/git/workspace/ResetEntryUseCase.kt b/src/main/kotlin/com/jetpackduba/gitnuro/git/workspace/ResetEntryUseCase.kt similarity index 93% rename from src/main/kotlin/app/git/workspace/ResetEntryUseCase.kt rename to src/main/kotlin/com/jetpackduba/gitnuro/git/workspace/ResetEntryUseCase.kt index 9b7bda8..9a63743 100644 --- a/src/main/kotlin/app/git/workspace/ResetEntryUseCase.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/git/workspace/ResetEntryUseCase.kt @@ -1,4 +1,4 @@ -package app.git.workspace +package com.jetpackduba.gitnuro.git.workspace import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext diff --git a/src/main/kotlin/app/git/workspace/ResetHunkUseCase.kt b/src/main/kotlin/com/jetpackduba/gitnuro/git/workspace/ResetHunkUseCase.kt similarity index 91% rename from src/main/kotlin/app/git/workspace/ResetHunkUseCase.kt rename to src/main/kotlin/com/jetpackduba/gitnuro/git/workspace/ResetHunkUseCase.kt index e09682c..69ff015 100644 --- a/src/main/kotlin/app/git/workspace/ResetHunkUseCase.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/git/workspace/ResetHunkUseCase.kt @@ -1,8 +1,8 @@ -package app.git.workspace +package com.jetpackduba.gitnuro.git.workspace -import app.extensions.lineDelimiter -import app.git.diff.Hunk -import app.git.diff.LineType +import com.jetpackduba.gitnuro.extensions.lineDelimiter +import com.jetpackduba.gitnuro.git.diff.Hunk +import com.jetpackduba.gitnuro.git.diff.LineType import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext import org.eclipse.jgit.api.Git diff --git a/src/main/kotlin/app/git/workspace/StageAllUseCase.kt b/src/main/kotlin/com/jetpackduba/gitnuro/git/workspace/StageAllUseCase.kt similarity index 92% rename from src/main/kotlin/app/git/workspace/StageAllUseCase.kt rename to src/main/kotlin/com/jetpackduba/gitnuro/git/workspace/StageAllUseCase.kt index 0e32c85..c85f3a4 100644 --- a/src/main/kotlin/app/git/workspace/StageAllUseCase.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/git/workspace/StageAllUseCase.kt @@ -1,4 +1,4 @@ -package app.git.workspace +package com.jetpackduba.gitnuro.git.workspace import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext diff --git a/src/main/kotlin/app/git/workspace/StageEntryUseCase.kt b/src/main/kotlin/com/jetpackduba/gitnuro/git/workspace/StageEntryUseCase.kt similarity index 90% rename from src/main/kotlin/app/git/workspace/StageEntryUseCase.kt rename to src/main/kotlin/com/jetpackduba/gitnuro/git/workspace/StageEntryUseCase.kt index 9751748..776c1b5 100644 --- a/src/main/kotlin/app/git/workspace/StageEntryUseCase.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/git/workspace/StageEntryUseCase.kt @@ -1,4 +1,4 @@ -package app.git.workspace +package com.jetpackduba.gitnuro.git.workspace import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext diff --git a/src/main/kotlin/app/git/workspace/StageHunkUseCase.kt b/src/main/kotlin/com/jetpackduba/gitnuro/git/workspace/StageHunkUseCase.kt similarity index 90% rename from src/main/kotlin/app/git/workspace/StageHunkUseCase.kt rename to src/main/kotlin/com/jetpackduba/gitnuro/git/workspace/StageHunkUseCase.kt index bc527a9..3212437 100644 --- a/src/main/kotlin/app/git/workspace/StageHunkUseCase.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/git/workspace/StageHunkUseCase.kt @@ -1,9 +1,9 @@ -package app.git.workspace +package com.jetpackduba.gitnuro.git.workspace -import app.git.EntryContent -import app.git.RawFileManager -import app.git.diff.Hunk -import app.git.diff.LineType +import com.jetpackduba.gitnuro.git.EntryContent +import com.jetpackduba.gitnuro.git.RawFileManager +import com.jetpackduba.gitnuro.git.diff.Hunk +import com.jetpackduba.gitnuro.git.diff.LineType import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext import org.eclipse.jgit.api.Git diff --git a/src/main/kotlin/app/git/workspace/StageUntrackedFileUseCase.kt b/src/main/kotlin/com/jetpackduba/gitnuro/git/workspace/StageUntrackedFileUseCase.kt similarity index 94% rename from src/main/kotlin/app/git/workspace/StageUntrackedFileUseCase.kt rename to src/main/kotlin/com/jetpackduba/gitnuro/git/workspace/StageUntrackedFileUseCase.kt index 4ceb74c..143bf1a 100644 --- a/src/main/kotlin/app/git/workspace/StageUntrackedFileUseCase.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/git/workspace/StageUntrackedFileUseCase.kt @@ -1,4 +1,4 @@ -package app.git.workspace +package com.jetpackduba.gitnuro.git.workspace import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext diff --git a/src/main/kotlin/app/git/workspace/Status.kt b/src/main/kotlin/com/jetpackduba/gitnuro/git/workspace/Status.kt similarity index 82% rename from src/main/kotlin/app/git/workspace/Status.kt rename to src/main/kotlin/com/jetpackduba/gitnuro/git/workspace/Status.kt index c9db0f0..c6620a7 100644 --- a/src/main/kotlin/app/git/workspace/Status.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/git/workspace/Status.kt @@ -1,9 +1,10 @@ -package app.git.workspace +package com.jetpackduba.gitnuro.git.workspace import androidx.compose.runtime.Composable import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.vector.ImageVector -import app.extensions.* +import com.jetpackduba.gitnuro.extensions.icon +import com.jetpackduba.gitnuro.extensions.iconColor data class StatusEntry(val filePath: String, val statusType: StatusType) { val icon: ImageVector diff --git a/src/main/kotlin/app/git/workspace/UnstageAllUseCase.kt b/src/main/kotlin/com/jetpackduba/gitnuro/git/workspace/UnstageAllUseCase.kt similarity index 87% rename from src/main/kotlin/app/git/workspace/UnstageAllUseCase.kt rename to src/main/kotlin/com/jetpackduba/gitnuro/git/workspace/UnstageAllUseCase.kt index 4d6d244..954f97f 100644 --- a/src/main/kotlin/app/git/workspace/UnstageAllUseCase.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/git/workspace/UnstageAllUseCase.kt @@ -1,4 +1,4 @@ -package app.git.workspace +package com.jetpackduba.gitnuro.git.workspace import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext diff --git a/src/main/kotlin/app/git/workspace/UnstageEntryUseCase.kt b/src/main/kotlin/com/jetpackduba/gitnuro/git/workspace/UnstageEntryUseCase.kt similarity index 90% rename from src/main/kotlin/app/git/workspace/UnstageEntryUseCase.kt rename to src/main/kotlin/com/jetpackduba/gitnuro/git/workspace/UnstageEntryUseCase.kt index cd74357..18dfa42 100644 --- a/src/main/kotlin/app/git/workspace/UnstageEntryUseCase.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/git/workspace/UnstageEntryUseCase.kt @@ -1,4 +1,4 @@ -package app.git.workspace +package com.jetpackduba.gitnuro.git.workspace import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext diff --git a/src/main/kotlin/app/git/workspace/UnstageHunkUseCase.kt b/src/main/kotlin/com/jetpackduba/gitnuro/git/workspace/UnstageHunkUseCase.kt similarity index 90% rename from src/main/kotlin/app/git/workspace/UnstageHunkUseCase.kt rename to src/main/kotlin/com/jetpackduba/gitnuro/git/workspace/UnstageHunkUseCase.kt index 4ab1091..d94fade 100644 --- a/src/main/kotlin/app/git/workspace/UnstageHunkUseCase.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/git/workspace/UnstageHunkUseCase.kt @@ -1,9 +1,9 @@ -package app.git.workspace +package com.jetpackduba.gitnuro.git.workspace -import app.git.EntryContent -import app.git.RawFileManager -import app.git.diff.Hunk -import app.git.diff.LineType +import com.jetpackduba.gitnuro.git.EntryContent +import com.jetpackduba.gitnuro.git.RawFileManager +import com.jetpackduba.gitnuro.git.diff.Hunk +import com.jetpackduba.gitnuro.git.diff.LineType import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext import org.eclipse.jgit.api.Git diff --git a/src/main/kotlin/app/images/ImagesCache.kt b/src/main/kotlin/com/jetpackduba/gitnuro/images/ImagesCache.kt similarity index 77% rename from src/main/kotlin/app/images/ImagesCache.kt rename to src/main/kotlin/com/jetpackduba/gitnuro/images/ImagesCache.kt index 90c6d04..9d006b3 100644 --- a/src/main/kotlin/app/images/ImagesCache.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/images/ImagesCache.kt @@ -1,4 +1,4 @@ -package app.images +package com.jetpackduba.gitnuro.images interface ImagesCache { fun getCachedImage(urlSource: String): ByteArray? diff --git a/src/main/kotlin/app/images/InMemoryImagesCache.kt b/src/main/kotlin/com/jetpackduba/gitnuro/images/InMemoryImagesCache.kt similarity index 89% rename from src/main/kotlin/app/images/InMemoryImagesCache.kt rename to src/main/kotlin/com/jetpackduba/gitnuro/images/InMemoryImagesCache.kt index 73e3a1a..ee60e20 100644 --- a/src/main/kotlin/app/images/InMemoryImagesCache.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/images/InMemoryImagesCache.kt @@ -1,4 +1,4 @@ -package app.images +package com.jetpackduba.gitnuro.images object InMemoryImagesCache : ImagesCache { private val cachedImages = hashMapOf() diff --git a/src/main/kotlin/app/images/NetworkImageLoader.kt b/src/main/kotlin/com/jetpackduba/gitnuro/images/NetworkImageLoader.kt similarity index 91% rename from src/main/kotlin/app/images/NetworkImageLoader.kt rename to src/main/kotlin/com/jetpackduba/gitnuro/images/NetworkImageLoader.kt index c5e7806..f5b542a 100644 --- a/src/main/kotlin/app/images/NetworkImageLoader.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/images/NetworkImageLoader.kt @@ -1,11 +1,11 @@ -package app.images +package com.jetpackduba.gitnuro.images import androidx.compose.runtime.* import androidx.compose.ui.graphics.ImageBitmap import androidx.compose.ui.graphics.toComposeImageBitmap import androidx.compose.ui.res.useResource -import app.extensions.acquireAndUse -import app.extensions.toByteArray +import com.jetpackduba.gitnuro.extensions.acquireAndUse +import com.jetpackduba.gitnuro.extensions.toByteArray import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.sync.Semaphore import kotlinx.coroutines.withContext @@ -63,7 +63,7 @@ fun rememberNetworkImageOrNull(url: String, placeHolderImageRes: String? = null) val cacheImageUsed = remember { ValueHolder(false) } var image by remember(url) { - val cachedImage = networkImageLoader.loadCachedImage(url) + val cachedImage = NetworkImageLoader.loadCachedImage(url) val image: ImageBitmap? = when { cachedImage != null -> { @@ -81,7 +81,7 @@ fun rememberNetworkImageOrNull(url: String, placeHolderImageRes: String? = null) LaunchedEffect(url) { if (!cacheImageUsed.value) { - val networkImage = networkImageLoader.loadImageNetwork(url) + val networkImage = NetworkImageLoader.loadImageNetwork(url) if (networkImage != null && !cacheImageUsed.value) { image = networkImage diff --git a/src/main/kotlin/app/keybindings/Keybinding.kt b/src/main/kotlin/com/jetpackduba/gitnuro/keybindings/Keybinding.kt similarity index 94% rename from src/main/kotlin/app/keybindings/Keybinding.kt rename to src/main/kotlin/com/jetpackduba/gitnuro/keybindings/Keybinding.kt index fd4de16..124cd02 100644 --- a/src/main/kotlin/app/keybindings/Keybinding.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/keybindings/Keybinding.kt @@ -1,11 +1,11 @@ @file:OptIn(ExperimentalComposeUiApi::class) -package app.keybindings +package com.jetpackduba.gitnuro.keybindings import androidx.compose.ui.ExperimentalComposeUiApi import androidx.compose.ui.input.key.* -import app.extensions.OS -import app.extensions.getCurrentOs +import com.jetpackduba.gitnuro.extensions.OS +import com.jetpackduba.gitnuro.extensions.getCurrentOs data class Keybinding( val alt: Boolean = false, diff --git a/src/main/kotlin/app/logging/logger.kt b/src/main/kotlin/com/jetpackduba/gitnuro/logging/logger.kt similarity index 66% rename from src/main/kotlin/app/logging/logger.kt rename to src/main/kotlin/com/jetpackduba/gitnuro/logging/logger.kt index c4c1791..1b87b33 100644 --- a/src/main/kotlin/app/logging/logger.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/logging/logger.kt @@ -1,4 +1,4 @@ -package app.logging +package com.jetpackduba.gitnuro.logging fun printLog(tag: String, message: String) { println("$tag - $message") diff --git a/src/main/kotlin/main.kt b/src/main/kotlin/com/jetpackduba/gitnuro/main.kt similarity index 60% rename from src/main/kotlin/main.kt rename to src/main/kotlin/com/jetpackduba/gitnuro/main.kt index 6d09a7e..ab92ee3 100644 --- a/src/main/kotlin/main.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/main.kt @@ -1,4 +1,4 @@ -import app.App +import com.jetpackduba.gitnuro.App fun main() { val main = App() diff --git a/src/main/kotlin/app/models/AuthorInfo.kt b/src/main/kotlin/com/jetpackduba/gitnuro/models/AuthorInfo.kt similarity index 77% rename from src/main/kotlin/app/models/AuthorInfo.kt rename to src/main/kotlin/com/jetpackduba/gitnuro/models/AuthorInfo.kt index 06c83f9..74e35f1 100644 --- a/src/main/kotlin/app/models/AuthorInfo.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/models/AuthorInfo.kt @@ -1,4 +1,4 @@ -package app.models +package com.jetpackduba.gitnuro.models data class AuthorInfo( val globalName: String?, diff --git a/src/main/kotlin/app/models/AuthorInfoSimple.kt b/src/main/kotlin/com/jetpackduba/gitnuro/models/AuthorInfoSimple.kt similarity index 66% rename from src/main/kotlin/app/models/AuthorInfoSimple.kt rename to src/main/kotlin/com/jetpackduba/gitnuro/models/AuthorInfoSimple.kt index 7bf2fde..97952bd 100644 --- a/src/main/kotlin/app/models/AuthorInfoSimple.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/models/AuthorInfoSimple.kt @@ -1,4 +1,4 @@ -package app.models +package com.jetpackduba.gitnuro.models data class AuthorInfoSimple( val name: String?, diff --git a/src/main/kotlin/app/preferences/AppSettings.kt b/src/main/kotlin/com/jetpackduba/gitnuro/preferences/AppSettings.kt similarity index 94% rename from src/main/kotlin/app/preferences/AppSettings.kt rename to src/main/kotlin/com/jetpackduba/gitnuro/preferences/AppSettings.kt index be992e5..df60913 100644 --- a/src/main/kotlin/app/preferences/AppSettings.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/preferences/AppSettings.kt @@ -1,10 +1,10 @@ -package app.preferences +package com.jetpackduba.gitnuro.preferences -import app.extensions.defaultWindowPlacement -import app.viewmodels.TextDiffType -import app.viewmodels.textDiffTypeFromValue -import app.theme.ColorsScheme -import app.theme.Theme +import com.jetpackduba.gitnuro.extensions.defaultWindowPlacement +import com.jetpackduba.gitnuro.viewmodels.TextDiffType +import com.jetpackduba.gitnuro.viewmodels.textDiffTypeFromValue +import com.jetpackduba.gitnuro.theme.ColorsScheme +import com.jetpackduba.gitnuro.theme.Theme import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.StateFlow import kotlinx.serialization.decodeFromString diff --git a/src/main/kotlin/app/preferences/WindowsPlacementPreference.kt b/src/main/kotlin/com/jetpackduba/gitnuro/preferences/WindowsPlacementPreference.kt similarity index 60% rename from src/main/kotlin/app/preferences/WindowsPlacementPreference.kt rename to src/main/kotlin/com/jetpackduba/gitnuro/preferences/WindowsPlacementPreference.kt index 8c27f62..9f2822d 100644 --- a/src/main/kotlin/app/preferences/WindowsPlacementPreference.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/preferences/WindowsPlacementPreference.kt @@ -1,4 +1,4 @@ -package app.preferences +package com.jetpackduba.gitnuro.preferences @JvmInline value class WindowsPlacementPreference(val value: Int) \ No newline at end of file diff --git a/src/main/kotlin/app/theme/Color.kt b/src/main/kotlin/com/jetpackduba/gitnuro/theme/Color.kt similarity index 98% rename from src/main/kotlin/app/theme/Color.kt rename to src/main/kotlin/com/jetpackduba/gitnuro/theme/Color.kt index 3617948..2aa9072 100644 --- a/src/main/kotlin/app/theme/Color.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/theme/Color.kt @@ -1,4 +1,4 @@ -package app.theme +package com.jetpackduba.gitnuro.theme import androidx.compose.ui.graphics.Color diff --git a/src/main/kotlin/app/theme/ColorsScheme.kt b/src/main/kotlin/com/jetpackduba/gitnuro/theme/ColorsScheme.kt similarity index 98% rename from src/main/kotlin/app/theme/ColorsScheme.kt rename to src/main/kotlin/com/jetpackduba/gitnuro/theme/ColorsScheme.kt index 8c2f8d2..6588972 100644 --- a/src/main/kotlin/app/theme/ColorsScheme.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/theme/ColorsScheme.kt @@ -1,6 +1,6 @@ @file:UseSerializers(ColorAsStringSerializer::class) -package app.theme +package com.jetpackduba.gitnuro.theme import androidx.compose.material.Colors import androidx.compose.ui.graphics.Color diff --git a/src/main/kotlin/app/theme/ComponentsColors.kt b/src/main/kotlin/com/jetpackduba/gitnuro/theme/ComponentsColors.kt similarity index 97% rename from src/main/kotlin/app/theme/ComponentsColors.kt rename to src/main/kotlin/com/jetpackduba/gitnuro/theme/ComponentsColors.kt index 9e66545..d6c66f1 100644 --- a/src/main/kotlin/app/theme/ComponentsColors.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/theme/ComponentsColors.kt @@ -1,4 +1,4 @@ -package app.theme +package com.jetpackduba.gitnuro.theme import androidx.compose.material.ButtonDefaults import androidx.compose.material.MaterialTheme diff --git a/src/main/kotlin/app/theme/Theme.kt b/src/main/kotlin/com/jetpackduba/gitnuro/theme/Theme.kt similarity index 96% rename from src/main/kotlin/app/theme/Theme.kt rename to src/main/kotlin/com/jetpackduba/gitnuro/theme/Theme.kt index 90b1691..c97be8e 100644 --- a/src/main/kotlin/app/theme/Theme.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/theme/Theme.kt @@ -1,12 +1,12 @@ @file:Suppress("unused") -package app.theme +package com.jetpackduba.gitnuro.theme import androidx.compose.material.Colors import androidx.compose.material.MaterialTheme import androidx.compose.runtime.Composable import androidx.compose.ui.graphics.Color -import app.ui.dropdowns.DropDownOption +import com.jetpackduba.gitnuro.ui.dropdowns.DropDownOption private val defaultAppTheme: ColorsScheme = darkBlueTheme private var appTheme: ColorsScheme = defaultAppTheme diff --git a/src/main/kotlin/app/theme/Typography.kt b/src/main/kotlin/com/jetpackduba/gitnuro/theme/Typography.kt similarity index 98% rename from src/main/kotlin/app/theme/Typography.kt rename to src/main/kotlin/com/jetpackduba/gitnuro/theme/Typography.kt index 86bec26..a80576f 100644 --- a/src/main/kotlin/app/theme/Typography.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/theme/Typography.kt @@ -1,4 +1,4 @@ -package app.theme +package com.jetpackduba.gitnuro.theme import androidx.compose.material.MaterialTheme import androidx.compose.material.Typography diff --git a/src/main/kotlin/app/ui/AppTab.kt b/src/main/kotlin/com/jetpackduba/gitnuro/ui/AppTab.kt similarity index 93% rename from src/main/kotlin/app/ui/AppTab.kt rename to src/main/kotlin/com/jetpackduba/gitnuro/ui/AppTab.kt index b95a110..6bbc906 100644 --- a/src/main/kotlin/app/ui/AppTab.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/ui/AppTab.kt @@ -1,4 +1,4 @@ -package app.ui +package com.jetpackduba.gitnuro.ui import androidx.compose.animation.AnimatedVisibility import androidx.compose.animation.Crossfade @@ -20,12 +20,12 @@ import androidx.compose.ui.graphics.DefaultAlpha import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp -import app.LoadingRepository -import app.credentials.CredentialsState -import app.ui.dialogs.PasswordDialog -import app.ui.dialogs.UserPasswordDialog -import app.viewmodels.RepositorySelectionStatus -import app.viewmodels.TabViewModel +import com.jetpackduba.gitnuro.LoadingRepository +import com.jetpackduba.gitnuro.credentials.CredentialsState +import com.jetpackduba.gitnuro.ui.dialogs.PasswordDialog +import com.jetpackduba.gitnuro.ui.dialogs.UserPasswordDialog +import com.jetpackduba.gitnuro.viewmodels.RepositorySelectionStatus +import com.jetpackduba.gitnuro.viewmodels.TabViewModel import kotlinx.coroutines.delay @Composable diff --git a/src/main/kotlin/app/ui/Blame.kt b/src/main/kotlin/com/jetpackduba/gitnuro/ui/Blame.kt similarity index 92% rename from src/main/kotlin/app/ui/Blame.kt rename to src/main/kotlin/com/jetpackduba/gitnuro/ui/Blame.kt index 527bf17..307ba29 100644 --- a/src/main/kotlin/app/ui/Blame.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/ui/Blame.kt @@ -1,6 +1,6 @@ @file:OptIn(ExperimentalComposeUiApi::class) -package app.ui +package com.jetpackduba.gitnuro.ui import androidx.compose.foundation.Image import androidx.compose.foundation.background @@ -26,16 +26,16 @@ import androidx.compose.ui.input.pointer.pointerHoverIcon import androidx.compose.ui.res.painterResource import androidx.compose.ui.text.font.FontFamily import androidx.compose.ui.unit.dp -import app.extensions.handMouseClickable -import app.extensions.lineAt -import app.extensions.toStringWithSpaces -import app.keybindings.KeybindingOption -import app.keybindings.matchesBinding -import app.theme.headerBackground -import app.theme.primaryTextColor -import app.theme.secondarySurface -import app.ui.components.PrimaryButton -import app.ui.components.ScrollableLazyColumn +import com.jetpackduba.gitnuro.extensions.handMouseClickable +import com.jetpackduba.gitnuro.extensions.lineAt +import com.jetpackduba.gitnuro.extensions.toStringWithSpaces +import com.jetpackduba.gitnuro.keybindings.KeybindingOption +import com.jetpackduba.gitnuro.keybindings.matchesBinding +import com.jetpackduba.gitnuro.theme.headerBackground +import com.jetpackduba.gitnuro.theme.primaryTextColor +import com.jetpackduba.gitnuro.theme.secondarySurface +import com.jetpackduba.gitnuro.ui.components.PrimaryButton +import com.jetpackduba.gitnuro.ui.components.ScrollableLazyColumn import org.eclipse.jgit.blame.BlameResult import org.eclipse.jgit.revwalk.RevCommit diff --git a/src/main/kotlin/app/ui/Branches.kt b/src/main/kotlin/com/jetpackduba/gitnuro/ui/Branches.kt similarity index 89% rename from src/main/kotlin/app/ui/Branches.kt rename to src/main/kotlin/com/jetpackduba/gitnuro/ui/Branches.kt index 43e755b..e454ca6 100644 --- a/src/main/kotlin/app/ui/Branches.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/ui/Branches.kt @@ -1,4 +1,4 @@ -package app.ui +package com.jetpackduba.gitnuro.ui import androidx.compose.foundation.ContextMenuArea import androidx.compose.foundation.ExperimentalFoundationApi @@ -11,13 +11,13 @@ import androidx.compose.runtime.getValue import androidx.compose.ui.Modifier import androidx.compose.ui.res.painterResource import androidx.compose.ui.unit.dp -import app.extensions.isLocal -import app.extensions.simpleName -import app.theme.secondaryTextColor -import app.ui.components.SideMenuPanel -import app.ui.components.SideMenuSubentry -import app.ui.context_menu.branchContextMenuItems -import app.viewmodels.BranchesViewModel +import com.jetpackduba.gitnuro.extensions.isLocal +import com.jetpackduba.gitnuro.extensions.simpleName +import com.jetpackduba.gitnuro.theme.secondaryTextColor +import com.jetpackduba.gitnuro.ui.components.SideMenuPanel +import com.jetpackduba.gitnuro.ui.components.SideMenuSubentry +import com.jetpackduba.gitnuro.ui.context_menu.branchContextMenuItems +import com.jetpackduba.gitnuro.viewmodels.BranchesViewModel import org.eclipse.jgit.lib.Ref @OptIn(ExperimentalFoundationApi::class) diff --git a/src/main/kotlin/app/ui/CommitChanges.kt b/src/main/kotlin/com/jetpackduba/gitnuro/ui/CommitChanges.kt similarity index 94% rename from src/main/kotlin/app/ui/CommitChanges.kt rename to src/main/kotlin/com/jetpackduba/gitnuro/ui/CommitChanges.kt index c2c8b8d..26e8abb 100644 --- a/src/main/kotlin/app/ui/CommitChanges.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/ui/CommitChanges.kt @@ -1,4 +1,4 @@ -package app.ui +package com.jetpackduba.gitnuro.ui import androidx.compose.foundation.* import androidx.compose.foundation.layout.* @@ -12,15 +12,15 @@ import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.dp -import app.extensions.* -import app.git.DiffEntryType -import app.theme.* -import app.ui.components.AvatarImage -import app.ui.components.ScrollableLazyColumn -import app.ui.components.TooltipText -import app.ui.context_menu.commitedChangesEntriesContextMenuItems -import app.viewmodels.CommitChangesStatus -import app.viewmodels.CommitChangesViewModel +import com.jetpackduba.gitnuro.git.DiffEntryType +import com.jetpackduba.gitnuro.ui.components.AvatarImage +import com.jetpackduba.gitnuro.ui.components.ScrollableLazyColumn +import com.jetpackduba.gitnuro.ui.components.TooltipText +import com.jetpackduba.gitnuro.ui.context_menu.commitedChangesEntriesContextMenuItems +import com.jetpackduba.gitnuro.viewmodels.CommitChangesStatus +import com.jetpackduba.gitnuro.viewmodels.CommitChangesViewModel +import com.jetpackduba.gitnuro.extensions.* +import com.jetpackduba.gitnuro.theme.* import kotlinx.coroutines.delay import kotlinx.coroutines.launch import org.eclipse.jgit.diff.DiffEntry diff --git a/src/main/kotlin/app/ui/FileHistory.kt b/src/main/kotlin/com/jetpackduba/gitnuro/ui/FileHistory.kt similarity index 88% rename from src/main/kotlin/app/ui/FileHistory.kt rename to src/main/kotlin/com/jetpackduba/gitnuro/ui/FileHistory.kt index 4862342..6e1b8d8 100644 --- a/src/main/kotlin/app/ui/FileHistory.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/ui/FileHistory.kt @@ -1,6 +1,6 @@ @file:OptIn(ExperimentalComposeUiApi::class, ExperimentalSplitPaneApi::class) -package app.ui +package com.jetpackduba.gitnuro.ui import androidx.compose.foundation.Image import androidx.compose.foundation.background @@ -23,22 +23,22 @@ import androidx.compose.ui.input.pointer.PointerIconDefaults import androidx.compose.ui.input.pointer.pointerHoverIcon import androidx.compose.ui.res.painterResource import androidx.compose.ui.unit.dp -import app.extensions.handMouseClickable -import app.extensions.toSmartSystemString -import app.git.diff.DiffResult -import app.keybindings.KeybindingOption -import app.keybindings.matchesBinding -import app.theme.headerBackground -import app.theme.primaryTextColor -import app.theme.secondaryTextColor -import app.ui.components.AvatarImage -import app.ui.components.ScrollableLazyColumn -import app.ui.components.TooltipText -import app.ui.diff.HunkSplitTextDiff -import app.ui.diff.HunkUnifiedTextDiff -import app.viewmodels.HistoryState -import app.viewmodels.HistoryViewModel -import app.viewmodels.ViewDiffResult +import com.jetpackduba.gitnuro.extensions.handMouseClickable +import com.jetpackduba.gitnuro.extensions.toSmartSystemString +import com.jetpackduba.gitnuro.git.diff.DiffResult +import com.jetpackduba.gitnuro.keybindings.KeybindingOption +import com.jetpackduba.gitnuro.keybindings.matchesBinding +import com.jetpackduba.gitnuro.theme.headerBackground +import com.jetpackduba.gitnuro.theme.primaryTextColor +import com.jetpackduba.gitnuro.theme.secondaryTextColor +import com.jetpackduba.gitnuro.ui.components.AvatarImage +import com.jetpackduba.gitnuro.ui.components.ScrollableLazyColumn +import com.jetpackduba.gitnuro.ui.components.TooltipText +import com.jetpackduba.gitnuro.ui.diff.HunkSplitTextDiff +import com.jetpackduba.gitnuro.ui.diff.HunkUnifiedTextDiff +import com.jetpackduba.gitnuro.viewmodels.HistoryState +import com.jetpackduba.gitnuro.viewmodels.HistoryViewModel +import com.jetpackduba.gitnuro.viewmodels.ViewDiffResult import org.eclipse.jgit.revwalk.RevCommit import org.jetbrains.compose.splitpane.ExperimentalSplitPaneApi diff --git a/src/main/kotlin/app/ui/Menu.kt b/src/main/kotlin/com/jetpackduba/gitnuro/ui/Menu.kt similarity index 97% rename from src/main/kotlin/app/ui/Menu.kt rename to src/main/kotlin/com/jetpackduba/gitnuro/ui/Menu.kt index 5393e7f..975fda3 100644 --- a/src/main/kotlin/app/ui/Menu.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/ui/Menu.kt @@ -1,6 +1,6 @@ @file:OptIn(ExperimentalComposeUiApi::class, ExperimentalFoundationApi::class) -package app.ui +package com.jetpackduba.gitnuro.ui import androidx.compose.foundation.ExperimentalFoundationApi import androidx.compose.foundation.Image @@ -20,10 +20,10 @@ import androidx.compose.ui.input.pointer.PointerIconDefaults import androidx.compose.ui.input.pointer.pointerHoverIcon import androidx.compose.ui.res.painterResource import androidx.compose.ui.unit.dp -import app.extensions.handMouseClickable -import app.theme.primaryTextColor -import app.ui.context_menu.* -import app.viewmodels.MenuViewModel +import com.jetpackduba.gitnuro.extensions.handMouseClickable +import com.jetpackduba.gitnuro.theme.primaryTextColor +import com.jetpackduba.gitnuro.ui.context_menu.* +import com.jetpackduba.gitnuro.viewmodels.MenuViewModel // TODO Add tooltips to all the buttons @Composable diff --git a/src/main/kotlin/app/ui/RebaseInteractive.kt b/src/main/kotlin/com/jetpackduba/gitnuro/ui/RebaseInteractive.kt similarity index 92% rename from src/main/kotlin/app/ui/RebaseInteractive.kt rename to src/main/kotlin/com/jetpackduba/gitnuro/ui/RebaseInteractive.kt index f54e5d9..3afb623 100644 --- a/src/main/kotlin/app/ui/RebaseInteractive.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/ui/RebaseInteractive.kt @@ -1,4 +1,4 @@ -package app.ui +package com.jetpackduba.gitnuro.ui import androidx.compose.foundation.background import androidx.compose.foundation.layout.* @@ -9,13 +9,13 @@ import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp -import app.theme.primaryTextColor -import app.theme.textButtonColors -import app.ui.components.AdjustableOutlinedTextField -import app.ui.components.PrimaryButton -import app.ui.components.ScrollableLazyColumn -import app.viewmodels.RebaseInteractiveState -import app.viewmodels.RebaseInteractiveViewModel +import com.jetpackduba.gitnuro.theme.primaryTextColor +import com.jetpackduba.gitnuro.theme.textButtonColors +import com.jetpackduba.gitnuro.ui.components.AdjustableOutlinedTextField +import com.jetpackduba.gitnuro.ui.components.PrimaryButton +import com.jetpackduba.gitnuro.ui.components.ScrollableLazyColumn +import com.jetpackduba.gitnuro.viewmodels.RebaseInteractiveState +import com.jetpackduba.gitnuro.viewmodels.RebaseInteractiveViewModel import org.eclipse.jgit.lib.RebaseTodoLine import org.eclipse.jgit.lib.RebaseTodoLine.Action diff --git a/src/main/kotlin/app/ui/Remotes.kt b/src/main/kotlin/com/jetpackduba/gitnuro/ui/Remotes.kt similarity index 85% rename from src/main/kotlin/app/ui/Remotes.kt rename to src/main/kotlin/com/jetpackduba/gitnuro/ui/Remotes.kt index c75a21a..a91ff27 100644 --- a/src/main/kotlin/app/ui/Remotes.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/ui/Remotes.kt @@ -1,6 +1,6 @@ @file:OptIn(ExperimentalFoundationApi::class, ExperimentalComposeUiApi::class) -package app.ui +package com.jetpackduba.gitnuro.ui import androidx.compose.foundation.ContextMenuArea import androidx.compose.foundation.ExperimentalFoundationApi @@ -18,16 +18,16 @@ import androidx.compose.ui.input.pointer.PointerIconDefaults import androidx.compose.ui.input.pointer.pointerHoverIcon import androidx.compose.ui.res.painterResource import androidx.compose.ui.unit.dp -import app.extensions.simpleName -import app.theme.primaryTextColor -import app.ui.components.SideMenuPanel -import app.ui.components.SideMenuSubentry -import app.ui.components.VerticalExpandable -import app.ui.context_menu.remoteBranchesContextMenu -import app.ui.context_menu.remoteContextMenu -import app.ui.dialogs.EditRemotesDialog -import app.viewmodels.RemoteView -import app.viewmodels.RemotesViewModel +import com.jetpackduba.gitnuro.extensions.simpleName +import com.jetpackduba.gitnuro.theme.primaryTextColor +import com.jetpackduba.gitnuro.ui.components.SideMenuPanel +import com.jetpackduba.gitnuro.ui.components.SideMenuSubentry +import com.jetpackduba.gitnuro.ui.components.VerticalExpandable +import com.jetpackduba.gitnuro.ui.context_menu.remoteBranchesContextMenu +import com.jetpackduba.gitnuro.ui.context_menu.remoteContextMenu +import com.jetpackduba.gitnuro.ui.dialogs.EditRemotesDialog +import com.jetpackduba.gitnuro.viewmodels.RemoteView +import com.jetpackduba.gitnuro.viewmodels.RemotesViewModel import org.eclipse.jgit.lib.Ref @Composable diff --git a/src/main/kotlin/app/ui/RepositoryOpen.kt b/src/main/kotlin/com/jetpackduba/gitnuro/ui/RepositoryOpen.kt similarity index 95% rename from src/main/kotlin/app/ui/RepositoryOpen.kt rename to src/main/kotlin/com/jetpackduba/gitnuro/ui/RepositoryOpen.kt index 55e9273..54cd53c 100644 --- a/src/main/kotlin/app/ui/RepositoryOpen.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/ui/RepositoryOpen.kt @@ -1,6 +1,6 @@ @file:OptIn(ExperimentalSplitPaneApi::class) -package app.ui +package com.jetpackduba.gitnuro.ui import androidx.compose.foundation.background import androidx.compose.foundation.focusable @@ -17,18 +17,18 @@ import androidx.compose.ui.input.key.onKeyEvent import androidx.compose.ui.input.pointer.PointerIcon import androidx.compose.ui.input.pointer.pointerHoverIcon import androidx.compose.ui.unit.dp -import app.extensions.handMouseClickable -import app.git.DiffEntryType -import app.keybindings.KeybindingOption -import app.keybindings.matchesBinding -import app.ui.components.ScrollableColumn -import app.ui.dialogs.AuthorDialog -import app.ui.dialogs.NewBranchDialog -import app.ui.dialogs.StashWithMessageDialog -import app.ui.diff.Diff -import app.ui.log.Log -import app.viewmodels.BlameState -import app.viewmodels.TabViewModel +import com.jetpackduba.gitnuro.extensions.handMouseClickable +import com.jetpackduba.gitnuro.git.DiffEntryType +import com.jetpackduba.gitnuro.keybindings.KeybindingOption +import com.jetpackduba.gitnuro.keybindings.matchesBinding +import com.jetpackduba.gitnuro.ui.components.ScrollableColumn +import com.jetpackduba.gitnuro.ui.dialogs.AuthorDialog +import com.jetpackduba.gitnuro.ui.dialogs.NewBranchDialog +import com.jetpackduba.gitnuro.ui.dialogs.StashWithMessageDialog +import com.jetpackduba.gitnuro.ui.diff.Diff +import com.jetpackduba.gitnuro.ui.log.Log +import com.jetpackduba.gitnuro.viewmodels.BlameState +import com.jetpackduba.gitnuro.viewmodels.TabViewModel import org.eclipse.jgit.lib.RepositoryState import org.eclipse.jgit.revwalk.RevCommit import org.jetbrains.compose.splitpane.ExperimentalSplitPaneApi diff --git a/src/main/kotlin/app/ui/SideMenuUtils.kt b/src/main/kotlin/com/jetpackduba/gitnuro/ui/SideMenuUtils.kt similarity index 89% rename from src/main/kotlin/app/ui/SideMenuUtils.kt rename to src/main/kotlin/com/jetpackduba/gitnuro/ui/SideMenuUtils.kt index a60cc8f..03e4a31 100644 --- a/src/main/kotlin/app/ui/SideMenuUtils.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/ui/SideMenuUtils.kt @@ -1,4 +1,4 @@ -package app +package com.jetpackduba.gitnuro.ui const val MAX_SIDE_PANEL_ITEMS_HEIGHT = 300 const val ENTRY_HEIGHT = 40 diff --git a/src/main/kotlin/app/ui/Stashes.kt b/src/main/kotlin/com/jetpackduba/gitnuro/ui/Stashes.kt similarity index 84% rename from src/main/kotlin/app/ui/Stashes.kt rename to src/main/kotlin/com/jetpackduba/gitnuro/ui/Stashes.kt index 3019e70..ca8c96d 100644 --- a/src/main/kotlin/app/ui/Stashes.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/ui/Stashes.kt @@ -1,6 +1,6 @@ @file:OptIn(ExperimentalFoundationApi::class) -package app.ui +package com.jetpackduba.gitnuro.ui import androidx.compose.foundation.ContextMenuArea import androidx.compose.foundation.ContextMenuItem @@ -9,11 +9,11 @@ import androidx.compose.runtime.Composable import androidx.compose.runtime.collectAsState import androidx.compose.runtime.getValue import androidx.compose.ui.res.painterResource -import app.ui.components.SideMenuPanel -import app.ui.components.SideMenuSubentry -import app.ui.context_menu.stashesContextMenuItems -import app.viewmodels.StashStatus -import app.viewmodels.StashesViewModel +import com.jetpackduba.gitnuro.ui.components.SideMenuPanel +import com.jetpackduba.gitnuro.ui.components.SideMenuSubentry +import com.jetpackduba.gitnuro.ui.context_menu.stashesContextMenuItems +import com.jetpackduba.gitnuro.viewmodels.StashStatus +import com.jetpackduba.gitnuro.viewmodels.StashesViewModel import org.eclipse.jgit.revwalk.RevCommit @Composable diff --git a/src/main/kotlin/app/ui/Submodules.kt b/src/main/kotlin/com/jetpackduba/gitnuro/ui/Submodules.kt similarity index 84% rename from src/main/kotlin/app/ui/Submodules.kt rename to src/main/kotlin/com/jetpackduba/gitnuro/ui/Submodules.kt index 0a01460..f502094 100644 --- a/src/main/kotlin/app/ui/Submodules.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/ui/Submodules.kt @@ -1,4 +1,4 @@ -package app.ui +package com.jetpackduba.gitnuro.ui import androidx.compose.foundation.ContextMenuArea import androidx.compose.foundation.ExperimentalFoundationApi @@ -11,12 +11,12 @@ import androidx.compose.runtime.getValue import androidx.compose.ui.Modifier import androidx.compose.ui.res.painterResource import androidx.compose.ui.unit.dp -import app.theme.secondaryTextColor -import app.ui.components.SideMenuPanel -import app.ui.components.SideMenuSubentry -import app.ui.components.Tooltip -import app.ui.context_menu.submoduleContextMenuItems -import app.viewmodels.SubmodulesViewModel +import com.jetpackduba.gitnuro.theme.secondaryTextColor +import com.jetpackduba.gitnuro.ui.components.SideMenuPanel +import com.jetpackduba.gitnuro.ui.components.SideMenuSubentry +import com.jetpackduba.gitnuro.ui.components.Tooltip +import com.jetpackduba.gitnuro.ui.context_menu.submoduleContextMenuItems +import com.jetpackduba.gitnuro.viewmodels.SubmodulesViewModel import org.eclipse.jgit.submodule.SubmoduleStatus @OptIn(ExperimentalFoundationApi::class) diff --git a/src/main/kotlin/app/ui/SystemDialogs.kt b/src/main/kotlin/com/jetpackduba/gitnuro/ui/SystemDialogs.kt similarity index 91% rename from src/main/kotlin/app/ui/SystemDialogs.kt rename to src/main/kotlin/com/jetpackduba/gitnuro/ui/SystemDialogs.kt index c0cba39..e04ed88 100644 --- a/src/main/kotlin/app/ui/SystemDialogs.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/ui/SystemDialogs.kt @@ -1,9 +1,9 @@ -package app.ui +package com.jetpackduba.gitnuro.ui -import app.extensions.getCurrentOs -import app.extensions.runCommand -import app.logging.printLog -import app.viewmodels.TabViewModel +import com.jetpackduba.gitnuro.extensions.getCurrentOs +import com.jetpackduba.gitnuro.extensions.runCommand +import com.jetpackduba.gitnuro.logging.printLog +import com.jetpackduba.gitnuro.viewmodels.TabViewModel import javax.swing.JFileChooser import javax.swing.UIManager diff --git a/src/main/kotlin/app/ui/Tags.kt b/src/main/kotlin/com/jetpackduba/gitnuro/ui/Tags.kt similarity index 82% rename from src/main/kotlin/app/ui/Tags.kt rename to src/main/kotlin/com/jetpackduba/gitnuro/ui/Tags.kt index 1fb23a8..7862727 100644 --- a/src/main/kotlin/app/ui/Tags.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/ui/Tags.kt @@ -1,4 +1,4 @@ -package app.ui +package com.jetpackduba.gitnuro.ui import androidx.compose.foundation.ContextMenuArea import androidx.compose.foundation.ExperimentalFoundationApi @@ -6,11 +6,11 @@ import androidx.compose.runtime.Composable import androidx.compose.runtime.collectAsState import androidx.compose.runtime.getValue import androidx.compose.ui.res.painterResource -import app.extensions.simpleName -import app.ui.components.SideMenuPanel -import app.ui.components.SideMenuSubentry -import app.ui.context_menu.tagContextMenuItems -import app.viewmodels.TagsViewModel +import com.jetpackduba.gitnuro.extensions.simpleName +import com.jetpackduba.gitnuro.ui.components.SideMenuPanel +import com.jetpackduba.gitnuro.ui.components.SideMenuSubentry +import com.jetpackduba.gitnuro.ui.context_menu.tagContextMenuItems +import com.jetpackduba.gitnuro.viewmodels.TagsViewModel import org.eclipse.jgit.lib.Ref @OptIn(ExperimentalFoundationApi::class) diff --git a/src/main/kotlin/app/ui/UncommitedChanges.kt b/src/main/kotlin/com/jetpackduba/gitnuro/ui/UncommitedChanges.kt similarity index 95% rename from src/main/kotlin/app/ui/UncommitedChanges.kt rename to src/main/kotlin/com/jetpackduba/gitnuro/ui/UncommitedChanges.kt index 1571ff6..c168ef8 100644 --- a/src/main/kotlin/app/ui/UncommitedChanges.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/ui/UncommitedChanges.kt @@ -1,6 +1,6 @@ @file:OptIn(ExperimentalAnimationApi::class, ExperimentalComposeUiApi::class, ExperimentalFoundationApi::class) -package app.ui +package com.jetpackduba.gitnuro.ui import androidx.compose.animation.AnimatedVisibility import androidx.compose.animation.ExperimentalAnimationApi @@ -28,21 +28,21 @@ import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.dp -import app.extensions.* -import app.git.DiffEntryType -import app.git.workspace.StatusEntry -import app.git.workspace.StatusType -import app.keybindings.KeybindingOption -import app.keybindings.matchesBinding -import app.theme.* -import app.ui.components.ScrollableLazyColumn -import app.ui.components.SecondaryButton -import app.ui.context_menu.DropDownContent -import app.ui.context_menu.DropDownContentData -import app.ui.context_menu.EntryType -import app.ui.context_menu.statusEntriesContextMenuItems -import app.viewmodels.StageStatus -import app.viewmodels.StatusViewModel +import com.jetpackduba.gitnuro.git.DiffEntryType +import com.jetpackduba.gitnuro.git.workspace.StatusEntry +import com.jetpackduba.gitnuro.git.workspace.StatusType +import com.jetpackduba.gitnuro.keybindings.KeybindingOption +import com.jetpackduba.gitnuro.keybindings.matchesBinding +import com.jetpackduba.gitnuro.ui.components.ScrollableLazyColumn +import com.jetpackduba.gitnuro.ui.components.SecondaryButton +import com.jetpackduba.gitnuro.ui.context_menu.DropDownContent +import com.jetpackduba.gitnuro.ui.context_menu.DropDownContentData +import com.jetpackduba.gitnuro.ui.context_menu.EntryType +import com.jetpackduba.gitnuro.ui.context_menu.statusEntriesContextMenuItems +import com.jetpackduba.gitnuro.viewmodels.StageStatus +import com.jetpackduba.gitnuro.viewmodels.StatusViewModel +import com.jetpackduba.gitnuro.extensions.* +import com.jetpackduba.gitnuro.theme.* import org.eclipse.jgit.lib.RepositoryState @Composable diff --git a/src/main/kotlin/app/ui/WelcomePage.kt b/src/main/kotlin/com/jetpackduba/gitnuro/ui/WelcomePage.kt similarity index 93% rename from src/main/kotlin/app/ui/WelcomePage.kt rename to src/main/kotlin/com/jetpackduba/gitnuro/ui/WelcomePage.kt index 24cb928..621a85b 100644 --- a/src/main/kotlin/app/ui/WelcomePage.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/ui/WelcomePage.kt @@ -1,6 +1,6 @@ @file:OptIn(ExperimentalComposeUiApi::class) -package app.ui +package com.jetpackduba.gitnuro.ui import androidx.compose.foundation.Image import androidx.compose.foundation.background @@ -18,17 +18,17 @@ import androidx.compose.ui.graphics.ColorFilter import androidx.compose.ui.graphics.painter.Painter import androidx.compose.ui.res.painterResource import androidx.compose.ui.unit.dp -import app.AppConstants -import app.AppStateManager -import app.extensions.dirName -import app.extensions.dirPath -import app.extensions.openUrlInBrowser -import app.theme.secondaryTextColor -import app.theme.textButtonColors -import app.ui.dialogs.AppInfoDialog -import app.ui.dialogs.CloneDialog -import app.updates.Update -import app.viewmodels.TabViewModel +import com.jetpackduba.gitnuro.AppConstants +import com.jetpackduba.gitnuro.AppStateManager +import com.jetpackduba.gitnuro.extensions.dirName +import com.jetpackduba.gitnuro.extensions.dirPath +import com.jetpackduba.gitnuro.extensions.openUrlInBrowser +import com.jetpackduba.gitnuro.theme.secondaryTextColor +import com.jetpackduba.gitnuro.theme.textButtonColors +import com.jetpackduba.gitnuro.ui.dialogs.AppInfoDialog +import com.jetpackduba.gitnuro.ui.dialogs.CloneDialog +import com.jetpackduba.gitnuro.updates.Update +import com.jetpackduba.gitnuro.viewmodels.TabViewModel @OptIn(ExperimentalMaterialApi::class) diff --git a/src/main/kotlin/app/ui/components/AdjustableOutlinedTextField.kt b/src/main/kotlin/com/jetpackduba/gitnuro/ui/components/AdjustableOutlinedTextField.kt similarity index 92% rename from src/main/kotlin/app/ui/components/AdjustableOutlinedTextField.kt rename to src/main/kotlin/com/jetpackduba/gitnuro/ui/components/AdjustableOutlinedTextField.kt index b7b2bb6..6af3ad3 100644 --- a/src/main/kotlin/app/ui/components/AdjustableOutlinedTextField.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/ui/components/AdjustableOutlinedTextField.kt @@ -1,9 +1,8 @@ -package app.ui.components +package com.jetpackduba.gitnuro.ui.components import androidx.compose.foundation.border import androidx.compose.foundation.interaction.MutableInteractionSource import androidx.compose.foundation.layout.Box -import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.heightIn import androidx.compose.foundation.layout.padding import androidx.compose.foundation.shape.RoundedCornerShape @@ -17,14 +16,12 @@ import androidx.compose.runtime.getValue import androidx.compose.runtime.remember import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier -import androidx.compose.ui.focus.FocusProperties -import androidx.compose.ui.focus.FocusRequester import androidx.compose.ui.graphics.Shape import androidx.compose.ui.graphics.SolidColor import androidx.compose.ui.graphics.takeOrElse import androidx.compose.ui.text.TextStyle import androidx.compose.ui.unit.dp -import app.theme.outlinedTextFieldColors +import com.jetpackduba.gitnuro.theme.outlinedTextFieldColors @Composable fun AdjustableOutlinedTextField( diff --git a/src/main/kotlin/app/ui/components/AvatarImage.kt b/src/main/kotlin/com/jetpackduba/gitnuro/ui/components/AvatarImage.kt similarity index 91% rename from src/main/kotlin/app/ui/components/AvatarImage.kt rename to src/main/kotlin/com/jetpackduba/gitnuro/ui/components/AvatarImage.kt index 5aef16e..5d9776b 100644 --- a/src/main/kotlin/app/ui/components/AvatarImage.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/ui/components/AvatarImage.kt @@ -1,4 +1,4 @@ -package app.ui.components +package com.jetpackduba.gitnuro.ui.components import androidx.compose.foundation.Image import androidx.compose.foundation.background @@ -13,8 +13,8 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.draw.clip import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.ImageBitmap -import app.extensions.md5 -import app.images.rememberNetworkImageOrNull +import com.jetpackduba.gitnuro.extensions.md5 +import com.jetpackduba.gitnuro.images.rememberNetworkImageOrNull import org.eclipse.jgit.lib.PersonIdent @Composable diff --git a/src/main/kotlin/app/ui/components/DialogBox.kt b/src/main/kotlin/com/jetpackduba/gitnuro/ui/components/DialogBox.kt similarity index 93% rename from src/main/kotlin/app/ui/components/DialogBox.kt rename to src/main/kotlin/com/jetpackduba/gitnuro/ui/components/DialogBox.kt index c199071..469019f 100644 --- a/src/main/kotlin/app/ui/components/DialogBox.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/ui/components/DialogBox.kt @@ -1,4 +1,4 @@ -package app.ui.components +package com.jetpackduba.gitnuro.ui.components import androidx.compose.foundation.background import androidx.compose.foundation.layout.Box diff --git a/src/main/kotlin/app/ui/components/Expandable.kt b/src/main/kotlin/com/jetpackduba/gitnuro/ui/components/Expandable.kt similarity index 86% rename from src/main/kotlin/app/ui/components/Expandable.kt rename to src/main/kotlin/com/jetpackduba/gitnuro/ui/components/Expandable.kt index 3c12080..116b169 100644 --- a/src/main/kotlin/app/ui/components/Expandable.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/ui/components/Expandable.kt @@ -1,11 +1,11 @@ -package app.ui.components +package com.jetpackduba.gitnuro.ui.components import androidx.compose.animation.ExperimentalAnimationApi import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Column import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier -import app.extensions.handMouseClickable +import com.jetpackduba.gitnuro.extensions.handMouseClickable @OptIn(ExperimentalAnimationApi::class) @Composable diff --git a/src/main/kotlin/app/ui/components/PrimaryButton.kt b/src/main/kotlin/com/jetpackduba/gitnuro/ui/components/PrimaryButton.kt similarity index 90% rename from src/main/kotlin/app/ui/components/PrimaryButton.kt rename to src/main/kotlin/com/jetpackduba/gitnuro/ui/components/PrimaryButton.kt index ba50700..7181b04 100644 --- a/src/main/kotlin/app/ui/components/PrimaryButton.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/ui/components/PrimaryButton.kt @@ -1,4 +1,4 @@ -package app.ui.components +package com.jetpackduba.gitnuro.ui.components import androidx.compose.material.Button import androidx.compose.material.ButtonDefaults @@ -7,7 +7,7 @@ import androidx.compose.material.Text import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.Color -import app.theme.primaryTextColor +import com.jetpackduba.gitnuro.theme.primaryTextColor @Composable fun PrimaryButton( diff --git a/src/main/kotlin/app/ui/components/RepositoriesTabPanel.kt b/src/main/kotlin/com/jetpackduba/gitnuro/ui/components/RepositoriesTabPanel.kt similarity index 94% rename from src/main/kotlin/app/ui/components/RepositoriesTabPanel.kt rename to src/main/kotlin/com/jetpackduba/gitnuro/ui/components/RepositoriesTabPanel.kt index 0159780..875a2ea 100644 --- a/src/main/kotlin/app/ui/components/RepositoriesTabPanel.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/ui/components/RepositoriesTabPanel.kt @@ -1,6 +1,6 @@ @file:OptIn(ExperimentalComposeUiApi::class) -package app.ui.components +package com.jetpackduba.gitnuro.ui.components import androidx.compose.foundation.background import androidx.compose.foundation.layout.* @@ -25,12 +25,12 @@ import androidx.compose.ui.input.pointer.PointerIconDefaults import androidx.compose.ui.input.pointer.pointerHoverIcon import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.dp -import app.AppStateManager -import app.di.AppComponent -import app.di.DaggerTabComponent -import app.extensions.handMouseClickable -import app.theme.primaryTextColor -import app.viewmodels.TabViewModel +import com.jetpackduba.gitnuro.AppStateManager +import com.jetpackduba.gitnuro.di.AppComponent +import com.jetpackduba.gitnuro.di.DaggerTabComponent +import com.jetpackduba.gitnuro.extensions.handMouseClickable +import com.jetpackduba.gitnuro.theme.primaryTextColor +import com.jetpackduba.gitnuro.viewmodels.TabViewModel import javax.inject.Inject import kotlin.io.path.Path import kotlin.io.path.name diff --git a/src/main/kotlin/app/ui/components/ScrollableColumn.kt b/src/main/kotlin/com/jetpackduba/gitnuro/ui/components/ScrollableColumn.kt similarity index 88% rename from src/main/kotlin/app/ui/components/ScrollableColumn.kt rename to src/main/kotlin/com/jetpackduba/gitnuro/ui/components/ScrollableColumn.kt index d236e68..62e3267 100644 --- a/src/main/kotlin/app/ui/components/ScrollableColumn.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/ui/components/ScrollableColumn.kt @@ -1,4 +1,4 @@ -package app.ui.components +package com.jetpackduba.gitnuro.ui.components import androidx.compose.foundation.* import androidx.compose.foundation.layout.* @@ -7,8 +7,8 @@ import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.unit.dp -import app.theme.scrollbarHover -import app.theme.scrollbarNormal +import com.jetpackduba.gitnuro.theme.scrollbarHover +import com.jetpackduba.gitnuro.theme.scrollbarNormal @Composable fun ScrollableColumn( diff --git a/src/main/kotlin/app/ui/components/ScrollableLazyColumn.kt b/src/main/kotlin/com/jetpackduba/gitnuro/ui/components/ScrollableLazyColumn.kt similarity index 90% rename from src/main/kotlin/app/ui/components/ScrollableLazyColumn.kt rename to src/main/kotlin/com/jetpackduba/gitnuro/ui/components/ScrollableLazyColumn.kt index ad630c9..8a73e1e 100644 --- a/src/main/kotlin/app/ui/components/ScrollableLazyColumn.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/ui/components/ScrollableLazyColumn.kt @@ -1,4 +1,4 @@ -package app.ui.components +package com.jetpackduba.gitnuro.ui.components import androidx.compose.foundation.LocalScrollbarStyle import androidx.compose.foundation.VerticalScrollbar @@ -15,8 +15,8 @@ import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.unit.dp -import app.theme.scrollbarHover -import app.theme.scrollbarNormal +import com.jetpackduba.gitnuro.theme.scrollbarHover +import com.jetpackduba.gitnuro.theme.scrollbarNormal @Composable fun ScrollableLazyColumn( diff --git a/src/main/kotlin/app/ui/components/SecondaryButton.kt b/src/main/kotlin/com/jetpackduba/gitnuro/ui/components/SecondaryButton.kt similarity index 91% rename from src/main/kotlin/app/ui/components/SecondaryButton.kt rename to src/main/kotlin/com/jetpackduba/gitnuro/ui/components/SecondaryButton.kt index 8ffc71d..8d5ea02 100644 --- a/src/main/kotlin/app/ui/components/SecondaryButton.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/ui/components/SecondaryButton.kt @@ -1,4 +1,4 @@ -package app.ui.components +package com.jetpackduba.gitnuro.ui.components import androidx.compose.foundation.background import androidx.compose.foundation.layout.Box @@ -11,7 +11,7 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.draw.clip import androidx.compose.ui.graphics.Color import androidx.compose.ui.unit.dp -import app.extensions.handMouseClickable +import com.jetpackduba.gitnuro.extensions.handMouseClickable @Composable fun SecondaryButton( diff --git a/src/main/kotlin/app/ui/components/SideMenuEntry.kt b/src/main/kotlin/com/jetpackduba/gitnuro/ui/components/SideMenuEntry.kt similarity index 91% rename from src/main/kotlin/app/ui/components/SideMenuEntry.kt rename to src/main/kotlin/com/jetpackduba/gitnuro/ui/components/SideMenuEntry.kt index eb29a2e..9fc625a 100644 --- a/src/main/kotlin/app/ui/components/SideMenuEntry.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/ui/components/SideMenuEntry.kt @@ -1,4 +1,4 @@ -package app.ui.components +package com.jetpackduba.gitnuro.ui.components import androidx.compose.foundation.background import androidx.compose.foundation.hoverable @@ -16,9 +16,9 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.painter.Painter import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.dp -import app.theme.headerBackground -import app.theme.primaryTextColor -import app.theme.secondaryTextColor +import com.jetpackduba.gitnuro.theme.headerBackground +import com.jetpackduba.gitnuro.theme.primaryTextColor +import com.jetpackduba.gitnuro.theme.secondaryTextColor @Composable fun SideMenuEntry( diff --git a/src/main/kotlin/app/ui/components/SideMenuPanel.kt b/src/main/kotlin/com/jetpackduba/gitnuro/ui/components/SideMenuPanel.kt similarity index 97% rename from src/main/kotlin/app/ui/components/SideMenuPanel.kt rename to src/main/kotlin/com/jetpackduba/gitnuro/ui/components/SideMenuPanel.kt index a79c709..695a5f4 100644 --- a/src/main/kotlin/app/ui/components/SideMenuPanel.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/ui/components/SideMenuPanel.kt @@ -1,4 +1,4 @@ -package app.ui.components +package com.jetpackduba.gitnuro.ui.components import androidx.compose.foundation.ContextMenuArea import androidx.compose.foundation.ContextMenuItem diff --git a/src/main/kotlin/app/ui/components/SideMenuSubentry.kt b/src/main/kotlin/com/jetpackduba/gitnuro/ui/components/SideMenuSubentry.kt similarity index 93% rename from src/main/kotlin/app/ui/components/SideMenuSubentry.kt rename to src/main/kotlin/com/jetpackduba/gitnuro/ui/components/SideMenuSubentry.kt index fd5e9b5..273d6ed 100644 --- a/src/main/kotlin/app/ui/components/SideMenuSubentry.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/ui/components/SideMenuSubentry.kt @@ -1,6 +1,6 @@ @file:OptIn(ExperimentalComposeUiApi::class) -package app.ui.components +package com.jetpackduba.gitnuro.ui.components import androidx.compose.foundation.ExperimentalFoundationApi import androidx.compose.foundation.background @@ -17,8 +17,8 @@ import androidx.compose.ui.graphics.Color import androidx.compose.ui.res.painterResource import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.dp -import app.ENTRY_HEIGHT -import app.theme.primaryTextColor +import com.jetpackduba.gitnuro.ui.ENTRY_HEIGHT +import com.jetpackduba.gitnuro.theme.primaryTextColor @OptIn(ExperimentalFoundationApi::class) @Composable diff --git a/src/main/kotlin/app/ui/components/TextLink.kt b/src/main/kotlin/com/jetpackduba/gitnuro/ui/components/TextLink.kt similarity index 83% rename from src/main/kotlin/app/ui/components/TextLink.kt rename to src/main/kotlin/com/jetpackduba/gitnuro/ui/components/TextLink.kt index 86505f9..6ce340c 100644 --- a/src/main/kotlin/app/ui/components/TextLink.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/ui/components/TextLink.kt @@ -1,4 +1,4 @@ -package app.ui.components +package com.jetpackduba.gitnuro.ui.components import androidx.compose.foundation.hoverable import androidx.compose.foundation.interaction.MutableInteractionSource @@ -9,9 +9,9 @@ import androidx.compose.runtime.Composable import androidx.compose.runtime.getValue import androidx.compose.runtime.remember import androidx.compose.ui.Modifier -import app.extensions.handMouseClickable -import app.extensions.openUrlInBrowser -import app.theme.primaryTextColor +import com.jetpackduba.gitnuro.extensions.handMouseClickable +import com.jetpackduba.gitnuro.extensions.openUrlInBrowser +import com.jetpackduba.gitnuro.theme.primaryTextColor @Composable fun TextLink( diff --git a/src/main/kotlin/app/ui/components/Tooltip.kt b/src/main/kotlin/com/jetpackduba/gitnuro/ui/components/Tooltip.kt similarity index 94% rename from src/main/kotlin/app/ui/components/Tooltip.kt rename to src/main/kotlin/com/jetpackduba/gitnuro/ui/components/Tooltip.kt index b03a8f6..d9e32d4 100644 --- a/src/main/kotlin/app/ui/components/Tooltip.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/ui/components/Tooltip.kt @@ -1,4 +1,4 @@ -package app.ui.components +package com.jetpackduba.gitnuro.ui.components import androidx.compose.foundation.ExperimentalFoundationApi import androidx.compose.foundation.TooltipArea diff --git a/src/main/kotlin/app/ui/components/TooltipText.kt b/src/main/kotlin/com/jetpackduba/gitnuro/ui/components/TooltipText.kt similarity index 97% rename from src/main/kotlin/app/ui/components/TooltipText.kt rename to src/main/kotlin/com/jetpackduba/gitnuro/ui/components/TooltipText.kt index 4890f2f..093d1e2 100644 --- a/src/main/kotlin/app/ui/components/TooltipText.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/ui/components/TooltipText.kt @@ -1,4 +1,4 @@ -package app.ui.components +package com.jetpackduba.gitnuro.ui.components import androidx.compose.foundation.ExperimentalFoundationApi import androidx.compose.material.LocalTextStyle diff --git a/src/main/kotlin/app/ui/context_menu/BranchContextMenu.kt b/src/main/kotlin/com/jetpackduba/gitnuro/ui/context_menu/BranchContextMenu.kt similarity index 93% rename from src/main/kotlin/app/ui/context_menu/BranchContextMenu.kt rename to src/main/kotlin/com/jetpackduba/gitnuro/ui/context_menu/BranchContextMenu.kt index 24b9f48..fdad43b 100644 --- a/src/main/kotlin/app/ui/context_menu/BranchContextMenu.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/ui/context_menu/BranchContextMenu.kt @@ -1,9 +1,9 @@ -package app.ui.context_menu +package com.jetpackduba.gitnuro.ui.context_menu import androidx.compose.foundation.ContextMenuItem import androidx.compose.foundation.ExperimentalFoundationApi -import app.extensions.isHead -import app.extensions.simpleLogName +import com.jetpackduba.gitnuro.extensions.isHead +import com.jetpackduba.gitnuro.extensions.simpleLogName import org.eclipse.jgit.lib.Ref @OptIn(ExperimentalFoundationApi::class) diff --git a/src/main/kotlin/app/ui/context_menu/CommitedChangesEntriesContextMenu.kt b/src/main/kotlin/com/jetpackduba/gitnuro/ui/context_menu/CommitedChangesEntriesContextMenu.kt similarity index 94% rename from src/main/kotlin/app/ui/context_menu/CommitedChangesEntriesContextMenu.kt rename to src/main/kotlin/com/jetpackduba/gitnuro/ui/context_menu/CommitedChangesEntriesContextMenu.kt index 6de93dc..117a5a1 100644 --- a/src/main/kotlin/app/ui/context_menu/CommitedChangesEntriesContextMenu.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/ui/context_menu/CommitedChangesEntriesContextMenu.kt @@ -1,4 +1,4 @@ -package app.ui.context_menu +package com.jetpackduba.gitnuro.ui.context_menu import androidx.compose.foundation.ContextMenuItem import androidx.compose.foundation.ExperimentalFoundationApi diff --git a/src/main/kotlin/app/ui/context_menu/DropDownContent.kt b/src/main/kotlin/com/jetpackduba/gitnuro/ui/context_menu/DropDownContent.kt similarity index 96% rename from src/main/kotlin/app/ui/context_menu/DropDownContent.kt rename to src/main/kotlin/com/jetpackduba/gitnuro/ui/context_menu/DropDownContent.kt index e8d3dad..667e6b6 100644 --- a/src/main/kotlin/app/ui/context_menu/DropDownContent.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/ui/context_menu/DropDownContent.kt @@ -1,4 +1,4 @@ -package app.ui.context_menu +package com.jetpackduba.gitnuro.ui.context_menu import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.padding diff --git a/src/main/kotlin/app/ui/context_menu/DropDownContentData.kt b/src/main/kotlin/com/jetpackduba/gitnuro/ui/context_menu/DropDownContentData.kt similarity index 70% rename from src/main/kotlin/app/ui/context_menu/DropDownContentData.kt rename to src/main/kotlin/com/jetpackduba/gitnuro/ui/context_menu/DropDownContentData.kt index f104cf6..0d93938 100644 --- a/src/main/kotlin/app/ui/context_menu/DropDownContentData.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/ui/context_menu/DropDownContentData.kt @@ -1,4 +1,4 @@ -package app.ui.context_menu +package com.jetpackduba.gitnuro.ui.context_menu data class DropDownContentData( val label: String, diff --git a/src/main/kotlin/app/ui/context_menu/LogContextMenu.kt b/src/main/kotlin/com/jetpackduba/gitnuro/ui/context_menu/LogContextMenu.kt similarity index 94% rename from src/main/kotlin/app/ui/context_menu/LogContextMenu.kt rename to src/main/kotlin/com/jetpackduba/gitnuro/ui/context_menu/LogContextMenu.kt index 37d2255..b6f7236 100644 --- a/src/main/kotlin/app/ui/context_menu/LogContextMenu.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/ui/context_menu/LogContextMenu.kt @@ -1,9 +1,8 @@ -package app.ui.context_menu +package com.jetpackduba.gitnuro.ui.context_menu import androidx.compose.foundation.ContextMenuItem import androidx.compose.foundation.ExperimentalFoundationApi -@OptIn(ExperimentalFoundationApi::class) fun logContextMenu( onCheckoutCommit: () -> Unit, onCreateNewBranch: () -> Unit, diff --git a/src/main/kotlin/app/ui/context_menu/PullContextMenu.kt b/src/main/kotlin/com/jetpackduba/gitnuro/ui/context_menu/PullContextMenu.kt similarity index 90% rename from src/main/kotlin/app/ui/context_menu/PullContextMenu.kt rename to src/main/kotlin/com/jetpackduba/gitnuro/ui/context_menu/PullContextMenu.kt index 424836b..f0b0b22 100644 --- a/src/main/kotlin/app/ui/context_menu/PullContextMenu.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/ui/context_menu/PullContextMenu.kt @@ -1,4 +1,4 @@ -package app.ui.context_menu +package com.jetpackduba.gitnuro.ui.context_menu import androidx.compose.foundation.ExperimentalFoundationApi diff --git a/src/main/kotlin/app/ui/context_menu/PushContextMenu.kt b/src/main/kotlin/com/jetpackduba/gitnuro/ui/context_menu/PushContextMenu.kt similarity index 91% rename from src/main/kotlin/app/ui/context_menu/PushContextMenu.kt rename to src/main/kotlin/com/jetpackduba/gitnuro/ui/context_menu/PushContextMenu.kt index 6903b95..68e6a70 100644 --- a/src/main/kotlin/app/ui/context_menu/PushContextMenu.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/ui/context_menu/PushContextMenu.kt @@ -1,4 +1,4 @@ -package app.ui.context_menu +package com.jetpackduba.gitnuro.ui.context_menu import androidx.compose.foundation.ExperimentalFoundationApi diff --git a/src/main/kotlin/app/ui/context_menu/RemoteBranchesContextMenu.kt b/src/main/kotlin/com/jetpackduba/gitnuro/ui/context_menu/RemoteBranchesContextMenu.kt similarity index 89% rename from src/main/kotlin/app/ui/context_menu/RemoteBranchesContextMenu.kt rename to src/main/kotlin/com/jetpackduba/gitnuro/ui/context_menu/RemoteBranchesContextMenu.kt index ab95dc7..44bf769 100644 --- a/src/main/kotlin/app/ui/context_menu/RemoteBranchesContextMenu.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/ui/context_menu/RemoteBranchesContextMenu.kt @@ -1,6 +1,6 @@ @file:OptIn(ExperimentalFoundationApi::class) -package app.ui.context_menu +package com.jetpackduba.gitnuro.ui.context_menu import androidx.compose.foundation.ContextMenuItem import androidx.compose.foundation.ExperimentalFoundationApi diff --git a/src/main/kotlin/app/ui/context_menu/RemoteContextMenu.kt b/src/main/kotlin/com/jetpackduba/gitnuro/ui/context_menu/RemoteContextMenu.kt similarity index 86% rename from src/main/kotlin/app/ui/context_menu/RemoteContextMenu.kt rename to src/main/kotlin/com/jetpackduba/gitnuro/ui/context_menu/RemoteContextMenu.kt index eed717c..9f69829 100644 --- a/src/main/kotlin/app/ui/context_menu/RemoteContextMenu.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/ui/context_menu/RemoteContextMenu.kt @@ -1,4 +1,4 @@ -package app.ui.context_menu +package com.jetpackduba.gitnuro.ui.context_menu import androidx.compose.foundation.ContextMenuItem import androidx.compose.foundation.ExperimentalFoundationApi diff --git a/src/main/kotlin/app/ui/context_menu/RepositoryAdditionalOptionsMenu.kt b/src/main/kotlin/com/jetpackduba/gitnuro/ui/context_menu/RepositoryAdditionalOptionsMenu.kt similarity index 92% rename from src/main/kotlin/app/ui/context_menu/RepositoryAdditionalOptionsMenu.kt rename to src/main/kotlin/com/jetpackduba/gitnuro/ui/context_menu/RepositoryAdditionalOptionsMenu.kt index 3e57092..dd837a3 100644 --- a/src/main/kotlin/app/ui/context_menu/RepositoryAdditionalOptionsMenu.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/ui/context_menu/RepositoryAdditionalOptionsMenu.kt @@ -1,4 +1,4 @@ -package app.ui.context_menu +package com.jetpackduba.gitnuro.ui.context_menu import androidx.compose.foundation.ExperimentalFoundationApi diff --git a/src/main/kotlin/app/ui/context_menu/StagedEntriesContextMenu.kt b/src/main/kotlin/com/jetpackduba/gitnuro/ui/context_menu/StagedEntriesContextMenu.kt similarity index 77% rename from src/main/kotlin/app/ui/context_menu/StagedEntriesContextMenu.kt rename to src/main/kotlin/com/jetpackduba/gitnuro/ui/context_menu/StagedEntriesContextMenu.kt index f5c3874..d082b19 100644 --- a/src/main/kotlin/app/ui/context_menu/StagedEntriesContextMenu.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/ui/context_menu/StagedEntriesContextMenu.kt @@ -1,9 +1,9 @@ -package app.ui.context_menu +package com.jetpackduba.gitnuro.ui.context_menu import androidx.compose.foundation.ContextMenuItem import androidx.compose.foundation.ExperimentalFoundationApi -import app.git.workspace.StatusEntry -import app.git.workspace.StatusType +import com.jetpackduba.gitnuro.git.workspace.StatusEntry +import com.jetpackduba.gitnuro.git.workspace.StatusType @OptIn(ExperimentalFoundationApi::class) fun stagedEntriesContextMenuItems( diff --git a/src/main/kotlin/app/ui/context_menu/StashContextMenu.kt b/src/main/kotlin/com/jetpackduba/gitnuro/ui/context_menu/StashContextMenu.kt similarity index 88% rename from src/main/kotlin/app/ui/context_menu/StashContextMenu.kt rename to src/main/kotlin/com/jetpackduba/gitnuro/ui/context_menu/StashContextMenu.kt index 37653a0..03591a5 100644 --- a/src/main/kotlin/app/ui/context_menu/StashContextMenu.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/ui/context_menu/StashContextMenu.kt @@ -1,4 +1,4 @@ -package app.ui.context_menu +package com.jetpackduba.gitnuro.ui.context_menu import androidx.compose.foundation.ExperimentalFoundationApi diff --git a/src/main/kotlin/app/ui/context_menu/StashesContextMenu.kt b/src/main/kotlin/com/jetpackduba/gitnuro/ui/context_menu/StashesContextMenu.kt similarity index 92% rename from src/main/kotlin/app/ui/context_menu/StashesContextMenu.kt rename to src/main/kotlin/com/jetpackduba/gitnuro/ui/context_menu/StashesContextMenu.kt index fca97c6..c11a1a6 100644 --- a/src/main/kotlin/app/ui/context_menu/StashesContextMenu.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/ui/context_menu/StashesContextMenu.kt @@ -1,4 +1,4 @@ -package app.ui.context_menu +package com.jetpackduba.gitnuro.ui.context_menu import androidx.compose.foundation.ContextMenuItem import androidx.compose.foundation.ExperimentalFoundationApi diff --git a/src/main/kotlin/app/ui/context_menu/StatusEntriesContextMenu.kt b/src/main/kotlin/com/jetpackduba/gitnuro/ui/context_menu/StatusEntriesContextMenu.kt similarity index 90% rename from src/main/kotlin/app/ui/context_menu/StatusEntriesContextMenu.kt rename to src/main/kotlin/com/jetpackduba/gitnuro/ui/context_menu/StatusEntriesContextMenu.kt index c7aac26..41ccb99 100644 --- a/src/main/kotlin/app/ui/context_menu/StatusEntriesContextMenu.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/ui/context_menu/StatusEntriesContextMenu.kt @@ -1,9 +1,9 @@ -package app.ui.context_menu +package com.jetpackduba.gitnuro.ui.context_menu import androidx.compose.foundation.ContextMenuItem import androidx.compose.foundation.ExperimentalFoundationApi -import app.git.workspace.StatusEntry -import app.git.workspace.StatusType +import com.jetpackduba.gitnuro.git.workspace.StatusEntry +import com.jetpackduba.gitnuro.git.workspace.StatusType @OptIn(ExperimentalFoundationApi::class) fun statusEntriesContextMenuItems( diff --git a/src/main/kotlin/app/ui/context_menu/SubmoduleContextMenu.kt b/src/main/kotlin/com/jetpackduba/gitnuro/ui/context_menu/SubmoduleContextMenu.kt similarity index 93% rename from src/main/kotlin/app/ui/context_menu/SubmoduleContextMenu.kt rename to src/main/kotlin/com/jetpackduba/gitnuro/ui/context_menu/SubmoduleContextMenu.kt index 1f381bf..c9abef4 100644 --- a/src/main/kotlin/app/ui/context_menu/SubmoduleContextMenu.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/ui/context_menu/SubmoduleContextMenu.kt @@ -1,4 +1,4 @@ -package app.ui.context_menu +package com.jetpackduba.gitnuro.ui.context_menu import androidx.compose.foundation.ContextMenuItem import androidx.compose.foundation.ExperimentalFoundationApi diff --git a/src/main/kotlin/app/ui/context_menu/TagContextMenu.kt b/src/main/kotlin/com/jetpackduba/gitnuro/ui/context_menu/TagContextMenu.kt similarity index 91% rename from src/main/kotlin/app/ui/context_menu/TagContextMenu.kt rename to src/main/kotlin/com/jetpackduba/gitnuro/ui/context_menu/TagContextMenu.kt index 113476b..34ff54d 100644 --- a/src/main/kotlin/app/ui/context_menu/TagContextMenu.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/ui/context_menu/TagContextMenu.kt @@ -1,4 +1,4 @@ -package app.ui.context_menu +package com.jetpackduba.gitnuro.ui.context_menu import androidx.compose.foundation.ContextMenuItem import androidx.compose.foundation.ExperimentalFoundationApi diff --git a/src/main/kotlin/app/ui/dialogs/AppInfoDialog.kt b/src/main/kotlin/com/jetpackduba/gitnuro/ui/dialogs/AppInfoDialog.kt similarity index 87% rename from src/main/kotlin/app/ui/dialogs/AppInfoDialog.kt rename to src/main/kotlin/com/jetpackduba/gitnuro/ui/dialogs/AppInfoDialog.kt index cbc10ac..9a5f645 100644 --- a/src/main/kotlin/app/ui/dialogs/AppInfoDialog.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/ui/dialogs/AppInfoDialog.kt @@ -1,4 +1,4 @@ -package app.ui.dialogs +package com.jetpackduba.gitnuro.ui.dialogs import androidx.compose.foundation.layout.* import androidx.compose.foundation.lazy.items @@ -9,12 +9,12 @@ import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.unit.dp -import app.AppConstants -import app.AppConstants.openSourceProjects -import app.Project -import app.theme.textButtonColors -import app.ui.components.ScrollableLazyColumn -import app.ui.components.TextLink +import com.jetpackduba.gitnuro.AppConstants +import com.jetpackduba.gitnuro.AppConstants.openSourceProjects +import com.jetpackduba.gitnuro.Project +import com.jetpackduba.gitnuro.theme.textButtonColors +import com.jetpackduba.gitnuro.ui.components.ScrollableLazyColumn +import com.jetpackduba.gitnuro.ui.components.TextLink @Composable fun AppInfoDialog( diff --git a/src/main/kotlin/app/ui/dialogs/AuthorDialog.kt b/src/main/kotlin/com/jetpackduba/gitnuro/ui/dialogs/AuthorDialog.kt similarity index 92% rename from src/main/kotlin/app/ui/dialogs/AuthorDialog.kt rename to src/main/kotlin/com/jetpackduba/gitnuro/ui/dialogs/AuthorDialog.kt index 7065e3e..91b2b68 100644 --- a/src/main/kotlin/app/ui/dialogs/AuthorDialog.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/ui/dialogs/AuthorDialog.kt @@ -1,4 +1,4 @@ -package app.ui.dialogs +package com.jetpackduba.gitnuro.ui.dialogs import androidx.compose.animation.core.animateFloatAsState import androidx.compose.foundation.layout.* @@ -13,12 +13,12 @@ import androidx.compose.ui.draw.alpha import androidx.compose.ui.res.painterResource import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp -import app.theme.outlinedTextFieldColors -import app.theme.primaryTextColor -import app.theme.textButtonColors -import app.ui.components.AdjustableOutlinedTextField -import app.ui.components.PrimaryButton -import app.viewmodels.AuthorViewModel +import com.jetpackduba.gitnuro.theme.outlinedTextFieldColors +import com.jetpackduba.gitnuro.theme.primaryTextColor +import com.jetpackduba.gitnuro.theme.textButtonColors +import com.jetpackduba.gitnuro.ui.components.AdjustableOutlinedTextField +import com.jetpackduba.gitnuro.ui.components.PrimaryButton +import com.jetpackduba.gitnuro.viewmodels.AuthorViewModel @Composable fun AuthorDialog( diff --git a/src/main/kotlin/app/ui/dialogs/CloneDialog.kt b/src/main/kotlin/com/jetpackduba/gitnuro/ui/dialogs/CloneDialog.kt similarity index 95% rename from src/main/kotlin/app/ui/dialogs/CloneDialog.kt rename to src/main/kotlin/com/jetpackduba/gitnuro/ui/dialogs/CloneDialog.kt index 68ac33c..b6377c0 100644 --- a/src/main/kotlin/app/ui/dialogs/CloneDialog.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/ui/dialogs/CloneDialog.kt @@ -1,4 +1,4 @@ -package app.ui.dialogs +package com.jetpackduba.gitnuro.ui.dialogs import androidx.compose.animation.animateContentSize import androidx.compose.foundation.background @@ -17,14 +17,14 @@ import androidx.compose.ui.focus.focusProperties import androidx.compose.ui.focus.focusRequester import androidx.compose.ui.graphics.Shape import androidx.compose.ui.unit.dp -import app.git.CloneStatus -import app.theme.outlinedTextFieldColors -import app.theme.primaryTextColor -import app.theme.textButtonColors -import app.ui.components.AdjustableOutlinedTextField -import app.ui.components.PrimaryButton -import app.ui.openDirectoryDialog -import app.viewmodels.CloneViewModel +import com.jetpackduba.gitnuro.git.CloneStatus +import com.jetpackduba.gitnuro.theme.outlinedTextFieldColors +import com.jetpackduba.gitnuro.theme.primaryTextColor +import com.jetpackduba.gitnuro.theme.textButtonColors +import com.jetpackduba.gitnuro.ui.components.AdjustableOutlinedTextField +import com.jetpackduba.gitnuro.ui.components.PrimaryButton +import com.jetpackduba.gitnuro.ui.openDirectoryDialog +import com.jetpackduba.gitnuro.viewmodels.CloneViewModel import java.io.File @Composable diff --git a/src/main/kotlin/app/ui/dialogs/EditRemotesDialog.kt b/src/main/kotlin/com/jetpackduba/gitnuro/ui/dialogs/EditRemotesDialog.kt similarity index 97% rename from src/main/kotlin/app/ui/dialogs/EditRemotesDialog.kt rename to src/main/kotlin/com/jetpackduba/gitnuro/ui/dialogs/EditRemotesDialog.kt index cc8e661..3d33190 100644 --- a/src/main/kotlin/app/ui/dialogs/EditRemotesDialog.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/ui/dialogs/EditRemotesDialog.kt @@ -1,4 +1,4 @@ -package app.ui.dialogs +package com.jetpackduba.gitnuro.ui.dialogs import androidx.compose.foundation.background import androidx.compose.foundation.layout.* @@ -15,11 +15,11 @@ import androidx.compose.ui.input.pointer.PointerIconDefaults import androidx.compose.ui.input.pointer.pointerHoverIcon import androidx.compose.ui.res.painterResource import androidx.compose.ui.unit.dp -import app.extensions.handMouseClickable -import app.theme.* -import app.ui.components.AdjustableOutlinedTextField -import app.ui.components.PrimaryButton -import app.viewmodels.RemotesViewModel +import com.jetpackduba.gitnuro.extensions.handMouseClickable +import com.jetpackduba.gitnuro.theme.* +import com.jetpackduba.gitnuro.ui.components.AdjustableOutlinedTextField +import com.jetpackduba.gitnuro.ui.components.PrimaryButton +import com.jetpackduba.gitnuro.viewmodels.RemotesViewModel import org.eclipse.jgit.transport.RemoteConfig @OptIn(ExperimentalComposeUiApi::class) diff --git a/src/main/kotlin/app/ui/dialogs/MaterialDialog.kt b/src/main/kotlin/com/jetpackduba/gitnuro/ui/dialogs/MaterialDialog.kt similarity index 93% rename from src/main/kotlin/app/ui/dialogs/MaterialDialog.kt rename to src/main/kotlin/com/jetpackduba/gitnuro/ui/dialogs/MaterialDialog.kt index df5bfd3..db23b8d 100644 --- a/src/main/kotlin/app/ui/dialogs/MaterialDialog.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/ui/dialogs/MaterialDialog.kt @@ -1,6 +1,6 @@ @file:OptIn(ExperimentalComposeUiApi::class) -package app.ui.dialogs +package com.jetpackduba.gitnuro.ui.dialogs import androidx.compose.foundation.background import androidx.compose.foundation.border @@ -24,9 +24,9 @@ import androidx.compose.ui.input.key.onPreviewKeyEvent import androidx.compose.ui.unit.* import androidx.compose.ui.window.Popup import androidx.compose.ui.window.PopupPositionProvider -import app.keybindings.KeybindingOption -import app.keybindings.matchesBinding -import app.theme.dialogOverlay +import com.jetpackduba.gitnuro.keybindings.KeybindingOption +import com.jetpackduba.gitnuro.keybindings.matchesBinding +import com.jetpackduba.gitnuro.theme.dialogOverlay @Composable fun MaterialDialog( diff --git a/src/main/kotlin/app/ui/dialogs/NewBranchDialog.kt b/src/main/kotlin/com/jetpackduba/gitnuro/ui/dialogs/NewBranchDialog.kt similarity index 90% rename from src/main/kotlin/app/ui/dialogs/NewBranchDialog.kt rename to src/main/kotlin/com/jetpackduba/gitnuro/ui/dialogs/NewBranchDialog.kt index ac31b88..f6356cf 100644 --- a/src/main/kotlin/app/ui/dialogs/NewBranchDialog.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/ui/dialogs/NewBranchDialog.kt @@ -1,4 +1,4 @@ -package app.ui.dialogs +package com.jetpackduba.gitnuro.ui.dialogs import androidx.compose.foundation.layout.* import androidx.compose.material.MaterialTheme @@ -13,11 +13,11 @@ import androidx.compose.ui.focus.focusProperties import androidx.compose.ui.focus.focusRequester import androidx.compose.ui.input.key.onPreviewKeyEvent import androidx.compose.ui.unit.dp -import app.keybindings.KeybindingOption -import app.keybindings.matchesBinding -import app.theme.outlinedTextFieldColors -import app.theme.textButtonColors -import app.ui.components.PrimaryButton +import com.jetpackduba.gitnuro.keybindings.KeybindingOption +import com.jetpackduba.gitnuro.keybindings.matchesBinding +import com.jetpackduba.gitnuro.theme.outlinedTextFieldColors +import com.jetpackduba.gitnuro.theme.textButtonColors +import com.jetpackduba.gitnuro.ui.components.PrimaryButton @Composable fun NewBranchDialog( diff --git a/src/main/kotlin/app/ui/dialogs/NewTagDialog.kt b/src/main/kotlin/com/jetpackduba/gitnuro/ui/dialogs/NewTagDialog.kt similarity index 91% rename from src/main/kotlin/app/ui/dialogs/NewTagDialog.kt rename to src/main/kotlin/com/jetpackduba/gitnuro/ui/dialogs/NewTagDialog.kt index 1aefcdc..099d525 100644 --- a/src/main/kotlin/app/ui/dialogs/NewTagDialog.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/ui/dialogs/NewTagDialog.kt @@ -1,4 +1,4 @@ -package app.ui.dialogs +package com.jetpackduba.gitnuro.ui.dialogs import androidx.compose.foundation.background import androidx.compose.foundation.layout.* @@ -14,11 +14,11 @@ import androidx.compose.ui.focus.focusProperties import androidx.compose.ui.focus.focusRequester import androidx.compose.ui.input.key.onPreviewKeyEvent import androidx.compose.ui.unit.dp -import app.keybindings.KeybindingOption -import app.keybindings.matchesBinding -import app.theme.outlinedTextFieldColors -import app.theme.textButtonColors -import app.ui.components.PrimaryButton +import com.jetpackduba.gitnuro.keybindings.KeybindingOption +import com.jetpackduba.gitnuro.keybindings.matchesBinding +import com.jetpackduba.gitnuro.theme.outlinedTextFieldColors +import com.jetpackduba.gitnuro.theme.textButtonColors +import com.jetpackduba.gitnuro.ui.components.PrimaryButton @Composable fun NewTagDialog( diff --git a/src/main/kotlin/app/ui/dialogs/PasswordDialog.kt b/src/main/kotlin/com/jetpackduba/gitnuro/ui/dialogs/PasswordDialog.kt similarity index 91% rename from src/main/kotlin/app/ui/dialogs/PasswordDialog.kt rename to src/main/kotlin/com/jetpackduba/gitnuro/ui/dialogs/PasswordDialog.kt index 0a8cbe5..fdbb4bb 100644 --- a/src/main/kotlin/app/ui/dialogs/PasswordDialog.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/ui/dialogs/PasswordDialog.kt @@ -1,4 +1,4 @@ -package app.ui.dialogs +package com.jetpackduba.gitnuro.ui.dialogs import androidx.compose.foundation.background import androidx.compose.foundation.layout.* @@ -15,11 +15,11 @@ import androidx.compose.ui.focus.focusRequester import androidx.compose.ui.input.key.onPreviewKeyEvent import androidx.compose.ui.text.input.PasswordVisualTransformation import androidx.compose.ui.unit.dp -import app.keybindings.KeybindingOption -import app.keybindings.matchesBinding -import app.theme.outlinedTextFieldColors -import app.theme.primaryTextColor -import app.ui.components.PrimaryButton +import com.jetpackduba.gitnuro.keybindings.KeybindingOption +import com.jetpackduba.gitnuro.keybindings.matchesBinding +import com.jetpackduba.gitnuro.theme.outlinedTextFieldColors +import com.jetpackduba.gitnuro.theme.primaryTextColor +import com.jetpackduba.gitnuro.ui.components.PrimaryButton @Composable fun PasswordDialog( diff --git a/src/main/kotlin/app/ui/dialogs/ResetDialog.kt b/src/main/kotlin/com/jetpackduba/gitnuro/ui/dialogs/ResetDialog.kt similarity index 92% rename from src/main/kotlin/app/ui/dialogs/ResetDialog.kt rename to src/main/kotlin/com/jetpackduba/gitnuro/ui/dialogs/ResetDialog.kt index afc6e3d..5884ed2 100644 --- a/src/main/kotlin/app/ui/dialogs/ResetDialog.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/ui/dialogs/ResetDialog.kt @@ -1,4 +1,4 @@ -package app.ui.dialogs +package com.jetpackduba.gitnuro.ui.dialogs import androidx.compose.foundation.ExperimentalFoundationApi import androidx.compose.foundation.background @@ -13,10 +13,10 @@ import androidx.compose.runtime.* import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.unit.dp -import app.git.log.ResetType -import app.theme.primaryTextColor -import app.theme.textButtonColors -import app.ui.components.PrimaryButton +import com.jetpackduba.gitnuro.git.log.ResetType +import com.jetpackduba.gitnuro.theme.primaryTextColor +import com.jetpackduba.gitnuro.theme.textButtonColors +import com.jetpackduba.gitnuro.ui.components.PrimaryButton @Composable fun ResetBranchDialog( diff --git a/src/main/kotlin/app/ui/dialogs/StashWithMessageDialog.kt b/src/main/kotlin/com/jetpackduba/gitnuro/ui/dialogs/StashWithMessageDialog.kt similarity index 91% rename from src/main/kotlin/app/ui/dialogs/StashWithMessageDialog.kt rename to src/main/kotlin/com/jetpackduba/gitnuro/ui/dialogs/StashWithMessageDialog.kt index 6eb60f9..ec9671a 100644 --- a/src/main/kotlin/app/ui/dialogs/StashWithMessageDialog.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/ui/dialogs/StashWithMessageDialog.kt @@ -1,4 +1,4 @@ -package app.ui.dialogs +package com.jetpackduba.gitnuro.ui.dialogs import androidx.compose.foundation.background import androidx.compose.foundation.layout.* @@ -14,11 +14,11 @@ import androidx.compose.ui.focus.focusProperties import androidx.compose.ui.focus.focusRequester import androidx.compose.ui.input.key.onPreviewKeyEvent import androidx.compose.ui.unit.dp -import app.keybindings.KeybindingOption -import app.keybindings.matchesBinding -import app.theme.outlinedTextFieldColors -import app.theme.textButtonColors -import app.ui.components.PrimaryButton +import com.jetpackduba.gitnuro.keybindings.KeybindingOption +import com.jetpackduba.gitnuro.keybindings.matchesBinding +import com.jetpackduba.gitnuro.theme.outlinedTextFieldColors +import com.jetpackduba.gitnuro.theme.textButtonColors +import com.jetpackduba.gitnuro.ui.components.PrimaryButton @Composable fun StashWithMessageDialog( diff --git a/src/main/kotlin/app/ui/dialogs/UserPasswordDialog.kt b/src/main/kotlin/com/jetpackduba/gitnuro/ui/dialogs/UserPasswordDialog.kt similarity index 93% rename from src/main/kotlin/app/ui/dialogs/UserPasswordDialog.kt rename to src/main/kotlin/com/jetpackduba/gitnuro/ui/dialogs/UserPasswordDialog.kt index 7ca6bac..f346ef9 100644 --- a/src/main/kotlin/app/ui/dialogs/UserPasswordDialog.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/ui/dialogs/UserPasswordDialog.kt @@ -1,4 +1,4 @@ -package app.ui.dialogs +package com.jetpackduba.gitnuro.ui.dialogs import androidx.compose.foundation.background import androidx.compose.foundation.layout.* @@ -15,12 +15,12 @@ import androidx.compose.ui.focus.focusRequester import androidx.compose.ui.input.key.onPreviewKeyEvent import androidx.compose.ui.text.input.PasswordVisualTransformation import androidx.compose.ui.unit.dp -import app.keybindings.KeybindingOption -import app.keybindings.matchesBinding -import app.theme.outlinedTextFieldColors -import app.theme.primaryTextColor -import app.theme.textButtonColors -import app.ui.components.PrimaryButton +import com.jetpackduba.gitnuro.keybindings.KeybindingOption +import com.jetpackduba.gitnuro.keybindings.matchesBinding +import com.jetpackduba.gitnuro.theme.outlinedTextFieldColors +import com.jetpackduba.gitnuro.theme.primaryTextColor +import com.jetpackduba.gitnuro.theme.textButtonColors +import com.jetpackduba.gitnuro.ui.components.PrimaryButton @Composable fun UserPasswordDialog( diff --git a/src/main/kotlin/app/ui/dialogs/settings/SettingsDialog.kt b/src/main/kotlin/com/jetpackduba/gitnuro/ui/dialogs/settings/SettingsDialog.kt similarity index 95% rename from src/main/kotlin/app/ui/dialogs/settings/SettingsDialog.kt rename to src/main/kotlin/com/jetpackduba/gitnuro/ui/dialogs/settings/SettingsDialog.kt index e3e1490..c5fc7bb 100644 --- a/src/main/kotlin/app/ui/dialogs/settings/SettingsDialog.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/ui/dialogs/settings/SettingsDialog.kt @@ -1,4 +1,4 @@ -package app.ui.dialogs.settings +package com.jetpackduba.gitnuro.ui.dialogs.settings import androidx.compose.foundation.background import androidx.compose.foundation.layout.* @@ -11,16 +11,16 @@ import androidx.compose.ui.platform.LocalDensity import androidx.compose.ui.text.input.KeyboardType import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp -import app.extensions.handMouseClickable -import app.preferences.DEFAULT_UI_SCALE -import app.theme.* -import app.ui.components.AdjustableOutlinedTextField -import app.ui.components.ScrollableColumn -import app.ui.dialogs.MaterialDialog -import app.ui.dropdowns.DropDownOption -import app.ui.dropdowns.ScaleDropDown -import app.ui.openFileDialog -import app.viewmodels.SettingsViewModel +import com.jetpackduba.gitnuro.extensions.handMouseClickable +import com.jetpackduba.gitnuro.preferences.DEFAULT_UI_SCALE +import com.jetpackduba.gitnuro.theme.* +import com.jetpackduba.gitnuro.ui.components.AdjustableOutlinedTextField +import com.jetpackduba.gitnuro.ui.components.ScrollableColumn +import com.jetpackduba.gitnuro.ui.dialogs.MaterialDialog +import com.jetpackduba.gitnuro.ui.dropdowns.DropDownOption +import com.jetpackduba.gitnuro.ui.dropdowns.ScaleDropDown +import com.jetpackduba.gitnuro.ui.openFileDialog +import com.jetpackduba.gitnuro.viewmodels.SettingsViewModel import kotlinx.coroutines.delay import kotlinx.coroutines.launch diff --git a/src/main/kotlin/app/ui/diff/Diff.kt b/src/main/kotlin/com/jetpackduba/gitnuro/ui/diff/Diff.kt similarity index 96% rename from src/main/kotlin/app/ui/diff/Diff.kt rename to src/main/kotlin/com/jetpackduba/gitnuro/ui/diff/Diff.kt index 5273fe6..71cd1ab 100644 --- a/src/main/kotlin/app/ui/diff/Diff.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/ui/diff/Diff.kt @@ -1,6 +1,6 @@ @file:OptIn(ExperimentalComposeUiApi::class) -package app.ui.diff +package com.jetpackduba.gitnuro.ui.diff import androidx.compose.foundation.Image import androidx.compose.foundation.background @@ -30,22 +30,23 @@ import androidx.compose.ui.text.font.FontFamily import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp -import app.extensions.* -import app.git.* -import app.git.diff.DiffResult -import app.git.diff.Hunk -import app.git.diff.Line -import app.git.diff.LineType -import app.git.workspace.StatusEntry -import app.git.workspace.StatusType -import app.keybindings.KeybindingOption -import app.keybindings.matchesBinding -import app.theme.* -import app.ui.components.ScrollableLazyColumn -import app.ui.components.SecondaryButton -import app.viewmodels.DiffViewModel -import app.viewmodels.TextDiffType -import app.viewmodels.ViewDiffResult +import com.jetpackduba.gitnuro.git.diff.DiffResult +import com.jetpackduba.gitnuro.git.diff.Hunk +import com.jetpackduba.gitnuro.git.diff.Line +import com.jetpackduba.gitnuro.git.diff.LineType +import com.jetpackduba.gitnuro.git.workspace.StatusEntry +import com.jetpackduba.gitnuro.git.workspace.StatusType +import com.jetpackduba.gitnuro.keybindings.KeybindingOption +import com.jetpackduba.gitnuro.keybindings.matchesBinding +import com.jetpackduba.gitnuro.ui.components.ScrollableLazyColumn +import com.jetpackduba.gitnuro.ui.components.SecondaryButton +import com.jetpackduba.gitnuro.viewmodels.DiffViewModel +import com.jetpackduba.gitnuro.viewmodels.TextDiffType +import com.jetpackduba.gitnuro.viewmodels.ViewDiffResult +import com.jetpackduba.gitnuro.extensions.* +import com.jetpackduba.gitnuro.git.DiffEntryType +import com.jetpackduba.gitnuro.git.EntryContent +import com.jetpackduba.gitnuro.theme.* import org.eclipse.jgit.diff.DiffEntry import java.io.FileInputStream import java.nio.file.Path diff --git a/src/main/kotlin/app/ui/dropdowns/DropDownOption.kt b/src/main/kotlin/com/jetpackduba/gitnuro/ui/dropdowns/DropDownOption.kt similarity index 55% rename from src/main/kotlin/app/ui/dropdowns/DropDownOption.kt rename to src/main/kotlin/com/jetpackduba/gitnuro/ui/dropdowns/DropDownOption.kt index ec63c0d..3b2d4bb 100644 --- a/src/main/kotlin/app/ui/dropdowns/DropDownOption.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/ui/dropdowns/DropDownOption.kt @@ -1,4 +1,4 @@ -package app.ui.dropdowns +package com.jetpackduba.gitnuro.ui.dropdowns interface DropDownOption { val optionName: String diff --git a/src/main/kotlin/app/ui/dropdowns/ScaleDropDown.kt b/src/main/kotlin/com/jetpackduba/gitnuro/ui/dropdowns/ScaleDropDown.kt similarity index 66% rename from src/main/kotlin/app/ui/dropdowns/ScaleDropDown.kt rename to src/main/kotlin/com/jetpackduba/gitnuro/ui/dropdowns/ScaleDropDown.kt index f9f778b..19b7e91 100644 --- a/src/main/kotlin/app/ui/dropdowns/ScaleDropDown.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/ui/dropdowns/ScaleDropDown.kt @@ -1,3 +1,3 @@ -package app.ui.dropdowns +package com.jetpackduba.gitnuro.ui.dropdowns class ScaleDropDown(val value: Float, override val optionName: String) : DropDownOption \ No newline at end of file diff --git a/src/main/kotlin/app/ui/log/Log.kt b/src/main/kotlin/com/jetpackduba/gitnuro/ui/log/Log.kt similarity index 97% rename from src/main/kotlin/app/ui/log/Log.kt rename to src/main/kotlin/com/jetpackduba/gitnuro/ui/log/Log.kt index 3d339c4..53feec9 100644 --- a/src/main/kotlin/app/ui/log/Log.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/ui/log/Log.kt @@ -1,6 +1,6 @@ @file:OptIn(ExperimentalComposeUiApi::class, ExperimentalFoundationApi::class) -package app.ui.log +package com.jetpackduba.gitnuro.ui.log import androidx.compose.foundation.* import androidx.compose.foundation.gestures.Orientation @@ -38,25 +38,27 @@ import androidx.compose.ui.text.font.FontStyle import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.dp -import app.extensions.* -import app.git.workspace.StatusSummary -import app.git.graph.GraphCommitList -import app.git.graph.GraphNode -import app.keybindings.KeybindingOption -import app.keybindings.matchesBinding -import app.theme.* -import app.ui.SelectedItem -import app.ui.components.AvatarImage -import app.ui.components.ScrollableLazyColumn -import app.ui.context_menu.branchContextMenuItems -import app.ui.context_menu.logContextMenu -import app.ui.context_menu.tagContextMenuItems -import app.ui.dialogs.NewBranchDialog -import app.ui.dialogs.NewTagDialog -import app.ui.dialogs.ResetBranchDialog -import app.viewmodels.LogSearch -import app.viewmodels.LogStatus -import app.viewmodels.LogViewModel +import com.jetpackduba.gitnuro.app.extensions.* +import com.jetpackduba.gitnuro.git.workspace.StatusSummary +import com.jetpackduba.gitnuro.git.graph.GraphCommitList +import com.jetpackduba.gitnuro.git.graph.GraphNode +import com.jetpackduba.gitnuro.keybindings.KeybindingOption +import com.jetpackduba.gitnuro.keybindings.matchesBinding +import com.jetpackduba.gitnuro.app.theme.* +import com.jetpackduba.gitnuro.ui.SelectedItem +import com.jetpackduba.gitnuro.ui.components.AvatarImage +import com.jetpackduba.gitnuro.ui.components.ScrollableLazyColumn +import com.jetpackduba.gitnuro.ui.context_menu.branchContextMenuItems +import com.jetpackduba.gitnuro.ui.context_menu.logContextMenu +import com.jetpackduba.gitnuro.ui.context_menu.tagContextMenuItems +import com.jetpackduba.gitnuro.ui.dialogs.NewBranchDialog +import com.jetpackduba.gitnuro.ui.dialogs.NewTagDialog +import com.jetpackduba.gitnuro.ui.dialogs.ResetBranchDialog +import com.jetpackduba.gitnuro.viewmodels.LogSearch +import com.jetpackduba.gitnuro.viewmodels.LogStatus +import com.jetpackduba.gitnuro.viewmodels.LogViewModel +import com.jetpackduba.gitnuro.extensions.* +import com.jetpackduba.gitnuro.theme.* import kotlinx.coroutines.launch import org.eclipse.jgit.lib.Ref import org.eclipse.jgit.lib.RepositoryState diff --git a/src/main/kotlin/app/ui/log/LogDialog.kt b/src/main/kotlin/com/jetpackduba/gitnuro/ui/log/LogDialog.kt similarity index 73% rename from src/main/kotlin/app/ui/log/LogDialog.kt rename to src/main/kotlin/com/jetpackduba/gitnuro/ui/log/LogDialog.kt index 477fff5..1ca8899 100644 --- a/src/main/kotlin/app/ui/log/LogDialog.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/ui/log/LogDialog.kt @@ -1,6 +1,6 @@ -package app.ui.log +package com.jetpackduba.gitnuro.ui.log -import app.git.graph.GraphNode +import com.jetpackduba.gitnuro.git.graph.GraphNode sealed class LogDialog { object None : LogDialog() diff --git a/src/main/kotlin/app/updates/Update.kt b/src/main/kotlin/com/jetpackduba/gitnuro/updates/Update.kt similarity index 79% rename from src/main/kotlin/app/updates/Update.kt rename to src/main/kotlin/com/jetpackduba/gitnuro/updates/Update.kt index bb867f5..81566d8 100644 --- a/src/main/kotlin/app/updates/Update.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/updates/Update.kt @@ -1,4 +1,4 @@ -package app.updates +package com.jetpackduba.gitnuro.updates import kotlinx.serialization.Serializable diff --git a/src/main/kotlin/app/updates/UpdatesRepository.kt b/src/main/kotlin/com/jetpackduba/gitnuro/updates/UpdatesRepository.kt similarity index 87% rename from src/main/kotlin/app/updates/UpdatesRepository.kt rename to src/main/kotlin/com/jetpackduba/gitnuro/updates/UpdatesRepository.kt index f4b6c78..4bf3545 100644 --- a/src/main/kotlin/app/updates/UpdatesRepository.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/updates/UpdatesRepository.kt @@ -1,6 +1,6 @@ -package app.updates +package com.jetpackduba.gitnuro.updates -import app.AppConstants +import com.jetpackduba.gitnuro.AppConstants import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext import kotlinx.serialization.decodeFromString diff --git a/src/main/kotlin/app/updates/UpdatesWebService.kt b/src/main/kotlin/com/jetpackduba/gitnuro/updates/UpdatesWebService.kt similarity index 77% rename from src/main/kotlin/app/updates/UpdatesWebService.kt rename to src/main/kotlin/com/jetpackduba/gitnuro/updates/UpdatesWebService.kt index a0be010..e0bc8a5 100644 --- a/src/main/kotlin/app/updates/UpdatesWebService.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/updates/UpdatesWebService.kt @@ -1,4 +1,4 @@ -package app.updates +package com.jetpackduba.gitnuro.updates import retrofit2.http.GET import retrofit2.http.Url diff --git a/src/main/kotlin/app/viewmodels/AuthorViewModel.kt b/src/main/kotlin/com/jetpackduba/gitnuro/viewmodels/AuthorViewModel.kt similarity index 75% rename from src/main/kotlin/app/viewmodels/AuthorViewModel.kt rename to src/main/kotlin/com/jetpackduba/gitnuro/viewmodels/AuthorViewModel.kt index 9157ec5..2ed36d3 100644 --- a/src/main/kotlin/app/viewmodels/AuthorViewModel.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/viewmodels/AuthorViewModel.kt @@ -1,11 +1,11 @@ -package app.viewmodels +package com.jetpackduba.gitnuro.viewmodels -import app.extensions.nullIfEmpty -import app.git.RefreshType -import app.git.TabState -import app.git.author.LoadAuthorUseCase -import app.git.author.SaveAuthorUseCase -import app.models.AuthorInfo +import com.jetpackduba.gitnuro.extensions.nullIfEmpty +import com.jetpackduba.gitnuro.git.RefreshType +import com.jetpackduba.gitnuro.git.TabState +import com.jetpackduba.gitnuro.git.author.LoadAuthorUseCase +import com.jetpackduba.gitnuro.git.author.SaveAuthorUseCase +import com.jetpackduba.gitnuro.models.AuthorInfo import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.StateFlow import javax.inject.Inject diff --git a/src/main/kotlin/app/viewmodels/BranchesViewModel.kt b/src/main/kotlin/com/jetpackduba/gitnuro/viewmodels/BranchesViewModel.kt similarity index 87% rename from src/main/kotlin/app/viewmodels/BranchesViewModel.kt rename to src/main/kotlin/com/jetpackduba/gitnuro/viewmodels/BranchesViewModel.kt index d2508d0..b9a0af9 100644 --- a/src/main/kotlin/app/viewmodels/BranchesViewModel.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/viewmodels/BranchesViewModel.kt @@ -1,11 +1,12 @@ -package app.viewmodels +package com.jetpackduba.gitnuro.viewmodels -import app.git.* -import app.git.branches.* -import app.git.rebase.RebaseBranchUseCase -import app.git.remote_operations.PullFromSpecificBranchUseCase -import app.git.remote_operations.PushToSpecificBranchUseCase -import app.preferences.AppSettings +import com.jetpackduba.gitnuro.git.RefreshType +import com.jetpackduba.gitnuro.git.TabState +import com.jetpackduba.gitnuro.git.branches.* +import com.jetpackduba.gitnuro.git.rebase.RebaseBranchUseCase +import com.jetpackduba.gitnuro.git.remote_operations.PullFromSpecificBranchUseCase +import com.jetpackduba.gitnuro.git.remote_operations.PushToSpecificBranchUseCase +import com.jetpackduba.gitnuro.preferences.AppSettings import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.StateFlow import org.eclipse.jgit.api.Git diff --git a/src/main/kotlin/app/viewmodels/CloneViewModel.kt b/src/main/kotlin/com/jetpackduba/gitnuro/viewmodels/CloneViewModel.kt similarity index 93% rename from src/main/kotlin/app/viewmodels/CloneViewModel.kt rename to src/main/kotlin/com/jetpackduba/gitnuro/viewmodels/CloneViewModel.kt index 33f6359..fd4c2ed 100644 --- a/src/main/kotlin/app/viewmodels/CloneViewModel.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/viewmodels/CloneViewModel.kt @@ -1,8 +1,8 @@ -package app.viewmodels +package com.jetpackduba.gitnuro.viewmodels -import app.git.CloneStatus -import app.git.TabState -import app.git.remote_operations.CloneRepositoryUseCase +import com.jetpackduba.gitnuro.git.CloneStatus +import com.jetpackduba.gitnuro.git.TabState +import com.jetpackduba.gitnuro.git.remote_operations.CloneRepositoryUseCase import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Job import kotlinx.coroutines.cancelAndJoin diff --git a/src/main/kotlin/app/viewmodels/CommitChangesViewModel.kt b/src/main/kotlin/com/jetpackduba/gitnuro/viewmodels/CommitChangesViewModel.kt similarity index 82% rename from src/main/kotlin/app/viewmodels/CommitChangesViewModel.kt rename to src/main/kotlin/com/jetpackduba/gitnuro/viewmodels/CommitChangesViewModel.kt index 82d5704..aa9467f 100644 --- a/src/main/kotlin/app/viewmodels/CommitChangesViewModel.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/viewmodels/CommitChangesViewModel.kt @@ -1,9 +1,9 @@ -package app.viewmodels +package com.jetpackduba.gitnuro.viewmodels -import app.extensions.delayedStateChange -import app.git.RefreshType -import app.git.TabState -import app.git.diff.GetCommitDiffEntriesUseCase +import com.jetpackduba.gitnuro.extensions.delayedStateChange +import com.jetpackduba.gitnuro.git.RefreshType +import com.jetpackduba.gitnuro.git.TabState +import com.jetpackduba.gitnuro.git.diff.GetCommitDiffEntriesUseCase import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.StateFlow import org.eclipse.jgit.diff.DiffEntry diff --git a/src/main/kotlin/app/viewmodels/DiffViewModel.kt b/src/main/kotlin/com/jetpackduba/gitnuro/viewmodels/DiffViewModel.kt similarity index 90% rename from src/main/kotlin/app/viewmodels/DiffViewModel.kt rename to src/main/kotlin/com/jetpackduba/gitnuro/viewmodels/DiffViewModel.kt index 718a7e1..ed68a60 100644 --- a/src/main/kotlin/app/viewmodels/DiffViewModel.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/viewmodels/DiffViewModel.kt @@ -1,16 +1,18 @@ //asdasd -package app.viewmodels +package com.jetpackduba.gitnuro.viewmodels import androidx.compose.foundation.lazy.LazyListState -import app.exceptions.MissingDiffEntryException -import app.extensions.delayedStateChange -import app.git.* -import app.git.diff.DiffResult -import app.git.diff.FormatDiffUseCase -import app.git.diff.Hunk -import app.preferences.AppSettings -import app.git.diff.GenerateSplitHunkFromDiffResultUseCase -import app.git.workspace.* +import com.jetpackduba.gitnuro.exceptions.MissingDiffEntryException +import com.jetpackduba.gitnuro.extensions.delayedStateChange +import com.jetpackduba.gitnuro.git.diff.DiffResult +import com.jetpackduba.gitnuro.git.diff.FormatDiffUseCase +import com.jetpackduba.gitnuro.git.diff.Hunk +import com.jetpackduba.gitnuro.preferences.AppSettings +import com.jetpackduba.gitnuro.git.diff.GenerateSplitHunkFromDiffResultUseCase +import com.jetpackduba.gitnuro.git.DiffEntryType +import com.jetpackduba.gitnuro.git.RefreshType +import com.jetpackduba.gitnuro.git.TabState +import com.jetpackduba.gitnuro.git.workspace.* import kotlinx.coroutines.Job import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.StateFlow diff --git a/src/main/kotlin/app/viewmodels/ExpandableViewModel.kt b/src/main/kotlin/com/jetpackduba/gitnuro/viewmodels/ExpandableViewModel.kt similarity index 89% rename from src/main/kotlin/app/viewmodels/ExpandableViewModel.kt rename to src/main/kotlin/com/jetpackduba/gitnuro/viewmodels/ExpandableViewModel.kt index 042d1d0..9fdd39c 100644 --- a/src/main/kotlin/app/viewmodels/ExpandableViewModel.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/viewmodels/ExpandableViewModel.kt @@ -1,4 +1,4 @@ -package app.viewmodels +package com.jetpackduba.gitnuro.viewmodels import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.StateFlow diff --git a/src/main/kotlin/app/viewmodels/HistoryViewModel.kt b/src/main/kotlin/com/jetpackduba/gitnuro/viewmodels/HistoryViewModel.kt similarity index 87% rename from src/main/kotlin/app/viewmodels/HistoryViewModel.kt rename to src/main/kotlin/com/jetpackduba/gitnuro/viewmodels/HistoryViewModel.kt index 4c10c17..73c2283 100644 --- a/src/main/kotlin/app/viewmodels/HistoryViewModel.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/viewmodels/HistoryViewModel.kt @@ -1,14 +1,16 @@ -package app.viewmodels +package com.jetpackduba.gitnuro.viewmodels import androidx.compose.foundation.lazy.LazyListState -import app.exceptions.MissingDiffEntryException -import app.extensions.filePath -import app.git.* -import app.git.diff.DiffResult -import app.git.diff.FormatDiffUseCase -import app.preferences.AppSettings -import app.git.diff.GenerateSplitHunkFromDiffResultUseCase -import app.git.diff.GetCommitDiffEntriesUseCase +import com.jetpackduba.gitnuro.exceptions.MissingDiffEntryException +import com.jetpackduba.gitnuro.extensions.filePath +import com.jetpackduba.gitnuro.git.diff.DiffResult +import com.jetpackduba.gitnuro.git.diff.FormatDiffUseCase +import com.jetpackduba.gitnuro.preferences.AppSettings +import com.jetpackduba.gitnuro.git.diff.GenerateSplitHunkFromDiffResultUseCase +import com.jetpackduba.gitnuro.git.diff.GetCommitDiffEntriesUseCase +import com.jetpackduba.gitnuro.git.DiffEntryType +import com.jetpackduba.gitnuro.git.RefreshType +import com.jetpackduba.gitnuro.git.TabState import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.StateFlow import kotlinx.coroutines.launch diff --git a/src/main/kotlin/app/viewmodels/LogViewModel.kt b/src/main/kotlin/com/jetpackduba/gitnuro/viewmodels/LogViewModel.kt similarity index 91% rename from src/main/kotlin/app/viewmodels/LogViewModel.kt rename to src/main/kotlin/com/jetpackduba/gitnuro/viewmodels/LogViewModel.kt index b4ad0d7..fd08a4e 100644 --- a/src/main/kotlin/app/viewmodels/LogViewModel.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/viewmodels/LogViewModel.kt @@ -1,25 +1,27 @@ -package app.viewmodels +package com.jetpackduba.gitnuro.viewmodels import androidx.compose.foundation.ScrollState import androidx.compose.foundation.lazy.LazyListState -import app.extensions.delayedStateChange -import app.git.* -import app.git.branches.* -import app.git.graph.GraphCommitList -import app.git.graph.GraphNode -import app.git.log.* -import app.git.rebase.RebaseBranchUseCase -import app.git.remote_operations.DeleteRemoteBranchUseCase -import app.git.remote_operations.PullFromSpecificBranchUseCase -import app.git.remote_operations.PushToSpecificBranchUseCase -import app.git.tags.CreateTagOnCommitUseCase -import app.git.tags.DeleteTagUseCase -import app.git.workspace.CheckHasUncommitedChangedUseCase -import app.git.workspace.GetStatusSummaryUseCase -import app.git.workspace.StatusSummary -import app.preferences.AppSettings -import app.ui.SelectedItem -import app.ui.log.LogDialog +import com.jetpackduba.gitnuro.extensions.delayedStateChange +import com.jetpackduba.gitnuro.git.graph.GraphCommitList +import com.jetpackduba.gitnuro.git.graph.GraphNode +import com.jetpackduba.gitnuro.git.rebase.RebaseBranchUseCase +import com.jetpackduba.gitnuro.git.remote_operations.DeleteRemoteBranchUseCase +import com.jetpackduba.gitnuro.git.remote_operations.PullFromSpecificBranchUseCase +import com.jetpackduba.gitnuro.git.remote_operations.PushToSpecificBranchUseCase +import com.jetpackduba.gitnuro.git.tags.CreateTagOnCommitUseCase +import com.jetpackduba.gitnuro.git.tags.DeleteTagUseCase +import com.jetpackduba.gitnuro.git.workspace.CheckHasUncommitedChangedUseCase +import com.jetpackduba.gitnuro.git.RefreshType +import com.jetpackduba.gitnuro.git.TabState +import com.jetpackduba.gitnuro.git.workspace.GetStatusSummaryUseCase +import com.jetpackduba.gitnuro.git.workspace.StatusSummary +import com.jetpackduba.gitnuro.preferences.AppSettings +import com.jetpackduba.gitnuro.ui.SelectedItem +import com.jetpackduba.gitnuro.ui.log.LogDialog +import com.jetpackduba.gitnuro.git.TaskEvent +import com.jetpackduba.gitnuro.git.branches.* +import com.jetpackduba.gitnuro.git.log.* import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.flow.* diff --git a/src/main/kotlin/app/viewmodels/MenuViewModel.kt b/src/main/kotlin/com/jetpackduba/gitnuro/viewmodels/MenuViewModel.kt similarity index 79% rename from src/main/kotlin/app/viewmodels/MenuViewModel.kt rename to src/main/kotlin/com/jetpackduba/gitnuro/viewmodels/MenuViewModel.kt index a048f0c..c8e0c76 100644 --- a/src/main/kotlin/app/viewmodels/MenuViewModel.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/viewmodels/MenuViewModel.kt @@ -1,13 +1,13 @@ -package app.viewmodels +package com.jetpackduba.gitnuro.viewmodels -import app.git.* -import app.git.remote_operations.DeleteRemoteBranchUseCase -import app.git.remote_operations.FetchAllBranchesUseCase -import app.git.remote_operations.PullBranchUseCase -import app.git.remote_operations.PushBranchUseCase -import app.git.stash.PopLastStashUseCase -import app.git.stash.StashChangesUseCase -import app.git.workspace.StageUntrackedFileUseCase +import com.jetpackduba.gitnuro.git.remote_operations.FetchAllBranchesUseCase +import com.jetpackduba.gitnuro.git.remote_operations.PullBranchUseCase +import com.jetpackduba.gitnuro.git.remote_operations.PushBranchUseCase +import com.jetpackduba.gitnuro.git.RefreshType +import com.jetpackduba.gitnuro.git.TabState +import com.jetpackduba.gitnuro.git.stash.PopLastStashUseCase +import com.jetpackduba.gitnuro.git.stash.StashChangesUseCase +import com.jetpackduba.gitnuro.git.workspace.StageUntrackedFileUseCase import java.awt.Desktop import javax.inject.Inject diff --git a/src/main/kotlin/app/viewmodels/RebaseInteractiveViewModel.kt b/src/main/kotlin/com/jetpackduba/gitnuro/viewmodels/RebaseInteractiveViewModel.kt similarity index 91% rename from src/main/kotlin/app/viewmodels/RebaseInteractiveViewModel.kt rename to src/main/kotlin/com/jetpackduba/gitnuro/viewmodels/RebaseInteractiveViewModel.kt index 69a4005..7b15cb2 100644 --- a/src/main/kotlin/app/viewmodels/RebaseInteractiveViewModel.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/viewmodels/RebaseInteractiveViewModel.kt @@ -1,13 +1,13 @@ -package app.viewmodels +package com.jetpackduba.gitnuro.viewmodels -import app.exceptions.InvalidMessageException -import app.exceptions.RebaseCancelledException -import app.git.RefreshType -import app.git.TabState -import app.git.rebase.AbortRebaseUseCase -import app.git.rebase.GetRebaseLinesFullMessageUseCase -import app.git.rebase.ResumeRebaseInteractiveUseCase -import app.git.rebase.StartRebaseInteractiveUseCase +import com.jetpackduba.gitnuro.exceptions.InvalidMessageException +import com.jetpackduba.gitnuro.exceptions.RebaseCancelledException +import com.jetpackduba.gitnuro.git.RefreshType +import com.jetpackduba.gitnuro.git.TabState +import com.jetpackduba.gitnuro.git.rebase.AbortRebaseUseCase +import com.jetpackduba.gitnuro.git.rebase.GetRebaseLinesFullMessageUseCase +import com.jetpackduba.gitnuro.git.rebase.ResumeRebaseInteractiveUseCase +import com.jetpackduba.gitnuro.git.rebase.StartRebaseInteractiveUseCase import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.StateFlow import kotlinx.coroutines.runBlocking diff --git a/src/main/kotlin/app/viewmodels/RemotesViewModel.kt b/src/main/kotlin/com/jetpackduba/gitnuro/viewmodels/RemotesViewModel.kt similarity index 89% rename from src/main/kotlin/app/viewmodels/RemotesViewModel.kt rename to src/main/kotlin/com/jetpackduba/gitnuro/viewmodels/RemotesViewModel.kt index 826458b..b1f5c7e 100644 --- a/src/main/kotlin/app/viewmodels/RemotesViewModel.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/viewmodels/RemotesViewModel.kt @@ -1,12 +1,13 @@ -package app.viewmodels +package com.jetpackduba.gitnuro.viewmodels -import app.exceptions.InvalidRemoteUrlException -import app.git.* -import app.git.branches.DeleteLocallyRemoteBranchesUseCase -import app.git.branches.GetRemoteBranchesUseCase -import app.git.remote_operations.DeleteRemoteBranchUseCase -import app.git.remotes.* -import app.ui.dialogs.RemoteWrapper +import com.jetpackduba.gitnuro.exceptions.InvalidRemoteUrlException +import com.jetpackduba.gitnuro.git.branches.DeleteLocallyRemoteBranchesUseCase +import com.jetpackduba.gitnuro.git.branches.GetRemoteBranchesUseCase +import com.jetpackduba.gitnuro.git.remote_operations.DeleteRemoteBranchUseCase +import com.jetpackduba.gitnuro.git.RefreshType +import com.jetpackduba.gitnuro.git.TabState +import com.jetpackduba.gitnuro.git.remotes.* +import com.jetpackduba.gitnuro.ui.dialogs.RemoteWrapper import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.StateFlow diff --git a/src/main/kotlin/app/viewmodels/SettingsViewModel.kt b/src/main/kotlin/com/jetpackduba/gitnuro/viewmodels/SettingsViewModel.kt similarity index 90% rename from src/main/kotlin/app/viewmodels/SettingsViewModel.kt rename to src/main/kotlin/com/jetpackduba/gitnuro/viewmodels/SettingsViewModel.kt index d1c9e2d..34c2a83 100644 --- a/src/main/kotlin/app/viewmodels/SettingsViewModel.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/viewmodels/SettingsViewModel.kt @@ -1,7 +1,7 @@ -package app.viewmodels +package com.jetpackduba.gitnuro.viewmodels -import app.preferences.AppSettings -import app.theme.Theme +import com.jetpackduba.gitnuro.preferences.AppSettings +import com.jetpackduba.gitnuro.theme.Theme import javax.inject.Inject import javax.inject.Singleton diff --git a/src/main/kotlin/app/viewmodels/StashesViewModel.kt b/src/main/kotlin/com/jetpackduba/gitnuro/viewmodels/StashesViewModel.kt similarity index 83% rename from src/main/kotlin/app/viewmodels/StashesViewModel.kt rename to src/main/kotlin/com/jetpackduba/gitnuro/viewmodels/StashesViewModel.kt index d9cbe89..1ad03ec 100644 --- a/src/main/kotlin/app/viewmodels/StashesViewModel.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/viewmodels/StashesViewModel.kt @@ -1,12 +1,12 @@ -package app.viewmodels +package com.jetpackduba.gitnuro.viewmodels -import app.git.RefreshType -import app.git.TabState -import app.git.stash.ApplyStashUseCase -import app.git.stash.DeleteStashUseCase -import app.git.stash.GetStashListUseCase -import app.git.stash.PopStashUseCase -import app.ui.SelectedItem +import com.jetpackduba.gitnuro.git.RefreshType +import com.jetpackduba.gitnuro.git.TabState +import com.jetpackduba.gitnuro.git.stash.ApplyStashUseCase +import com.jetpackduba.gitnuro.git.stash.DeleteStashUseCase +import com.jetpackduba.gitnuro.git.stash.GetStashListUseCase +import com.jetpackduba.gitnuro.git.stash.PopStashUseCase +import com.jetpackduba.gitnuro.ui.SelectedItem import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.StateFlow import org.eclipse.jgit.api.Git diff --git a/src/main/kotlin/app/viewmodels/StatusViewModel.kt b/src/main/kotlin/com/jetpackduba/gitnuro/viewmodels/StatusViewModel.kt similarity index 92% rename from src/main/kotlin/app/viewmodels/StatusViewModel.kt rename to src/main/kotlin/com/jetpackduba/gitnuro/viewmodels/StatusViewModel.kt index b446ef4..df95223 100644 --- a/src/main/kotlin/app/viewmodels/StatusViewModel.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/viewmodels/StatusViewModel.kt @@ -1,17 +1,18 @@ -package app.viewmodels +package com.jetpackduba.gitnuro.viewmodels import androidx.compose.foundation.lazy.LazyListState -import app.extensions.delayedStateChange -import app.extensions.isMerging -import app.extensions.isReverting -import app.git.* -import app.git.log.CheckHasPreviousCommitsUseCase -import app.git.log.GetLastCommitMessageUseCase -import app.git.rebase.AbortRebaseUseCase -import app.git.rebase.ContinueRebaseUseCase -import app.git.rebase.SkipRebaseUseCase -import app.git.repository.ResetRepositoryStateUseCase -import app.git.workspace.* +import com.jetpackduba.gitnuro.extensions.delayedStateChange +import com.jetpackduba.gitnuro.extensions.isMerging +import com.jetpackduba.gitnuro.extensions.isReverting +import com.jetpackduba.gitnuro.git.log.CheckHasPreviousCommitsUseCase +import com.jetpackduba.gitnuro.git.log.GetLastCommitMessageUseCase +import com.jetpackduba.gitnuro.git.rebase.AbortRebaseUseCase +import com.jetpackduba.gitnuro.git.rebase.ContinueRebaseUseCase +import com.jetpackduba.gitnuro.git.rebase.SkipRebaseUseCase +import com.jetpackduba.gitnuro.git.repository.ResetRepositoryStateUseCase +import com.jetpackduba.gitnuro.git.RefreshType +import com.jetpackduba.gitnuro.git.TabState +import com.jetpackduba.gitnuro.git.workspace.* import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.flow.MutableSharedFlow import kotlinx.coroutines.flow.MutableStateFlow diff --git a/src/main/kotlin/app/viewmodels/SubmodulesViewModel.kt b/src/main/kotlin/com/jetpackduba/gitnuro/viewmodels/SubmodulesViewModel.kt similarity index 76% rename from src/main/kotlin/app/viewmodels/SubmodulesViewModel.kt rename to src/main/kotlin/com/jetpackduba/gitnuro/viewmodels/SubmodulesViewModel.kt index 46cde36..a2bfa49 100644 --- a/src/main/kotlin/app/viewmodels/SubmodulesViewModel.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/viewmodels/SubmodulesViewModel.kt @@ -1,10 +1,10 @@ -package app.viewmodels +package com.jetpackduba.gitnuro.viewmodels -import app.git.RefreshType -import app.git.TabState -import app.git.submodules.GetSubmodulesUseCase -import app.git.submodules.InitializeSubmoduleUseCase -import app.git.submodules.UpdateSubmoduleUseCase +import com.jetpackduba.gitnuro.git.RefreshType +import com.jetpackduba.gitnuro.git.TabState +import com.jetpackduba.gitnuro.git.submodules.GetSubmodulesUseCase +import com.jetpackduba.gitnuro.git.submodules.InitializeSubmoduleUseCase +import com.jetpackduba.gitnuro.git.submodules.UpdateSubmoduleUseCase import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.StateFlow import org.eclipse.jgit.api.Git diff --git a/src/main/kotlin/app/viewmodels/TabViewModel.kt b/src/main/kotlin/com/jetpackduba/gitnuro/viewmodels/TabViewModel.kt similarity index 94% rename from src/main/kotlin/app/viewmodels/TabViewModel.kt rename to src/main/kotlin/com/jetpackduba/gitnuro/viewmodels/TabViewModel.kt index 21783fb..a426d2c 100644 --- a/src/main/kotlin/app/viewmodels/TabViewModel.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/viewmodels/TabViewModel.kt @@ -1,23 +1,22 @@ -package app.viewmodels +package com.jetpackduba.gitnuro.viewmodels -import app.AppStateManager -import app.ErrorsManager -import app.credentials.CredentialsState -import app.credentials.CredentialsStateManager -import app.git.* -import app.git.repository.GetRepositoryStateUseCase -import app.git.repository.InitLocalRepositoryUseCase -import app.git.repository.OpenRepositoryUseCase -import app.logging.printLog -import app.models.AuthorInfoSimple -import app.newErrorNow -import app.ui.SelectedItem -import app.updates.Update -import app.updates.UpdatesRepository +import com.jetpackduba.gitnuro.AppStateManager +import com.jetpackduba.gitnuro.ErrorsManager +import com.jetpackduba.gitnuro.credentials.CredentialsState +import com.jetpackduba.gitnuro.credentials.CredentialsStateManager +import com.jetpackduba.gitnuro.git.repository.GetRepositoryStateUseCase +import com.jetpackduba.gitnuro.git.repository.InitLocalRepositoryUseCase +import com.jetpackduba.gitnuro.git.repository.OpenRepositoryUseCase +import com.jetpackduba.gitnuro.git.* +import com.jetpackduba.gitnuro.logging.printLog +import com.jetpackduba.gitnuro.models.AuthorInfoSimple +import com.jetpackduba.gitnuro.newErrorNow +import com.jetpackduba.gitnuro.ui.SelectedItem +import com.jetpackduba.gitnuro.updates.Update +import com.jetpackduba.gitnuro.updates.UpdatesRepository import kotlinx.coroutines.* import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.StateFlow -import kotlinx.coroutines.flow.collect import org.eclipse.jgit.api.Git import org.eclipse.jgit.blame.BlameResult import org.eclipse.jgit.lib.Repository @@ -34,7 +33,7 @@ private const val TAG = "TabViewModel" /** * Contains all the information related to a tab and its subcomponents (smaller composables like the log, branches, * commit changes, etc.). It holds a reference to every view model because this class lives as long as the tab is open (survives - * across full app recompositions), therefore, tab's content can be recreated with these view models. + * across full com.jetpackduba.gitnuro.app recompositions), therefore, tab's content can be recreated with these view models. */ class TabViewModel @Inject constructor( val logViewModel: LogViewModel, @@ -261,7 +260,7 @@ class TabViewModel @Inject constructor( // Sometimes external apps can run filesystem multiple operations in a fraction of a second. // To prevent excessive updates, we add a slight delay between updates emission to prevent slowing down - // the app by constantly running "git status". + // the com.jetpackduba.gitnuro.app by constantly running "git status". val currentTimeMillis = System.currentTimeMillis() val diffTime = currentTimeMillis - lastNotify diff --git a/src/main/kotlin/app/viewmodels/TagsViewModel.kt b/src/main/kotlin/com/jetpackduba/gitnuro/viewmodels/TagsViewModel.kt similarity index 80% rename from src/main/kotlin/app/viewmodels/TagsViewModel.kt rename to src/main/kotlin/com/jetpackduba/gitnuro/viewmodels/TagsViewModel.kt index 9829741..400e114 100644 --- a/src/main/kotlin/app/viewmodels/TagsViewModel.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/viewmodels/TagsViewModel.kt @@ -1,10 +1,10 @@ -package app.viewmodels +package com.jetpackduba.gitnuro.viewmodels -import app.git.RefreshType -import app.git.TabState -import app.git.branches.CheckoutRefUseCase -import app.git.tags.DeleteTagUseCase -import app.git.tags.GetTagsUseCase +import com.jetpackduba.gitnuro.git.RefreshType +import com.jetpackduba.gitnuro.git.TabState +import com.jetpackduba.gitnuro.git.branches.CheckoutRefUseCase +import com.jetpackduba.gitnuro.git.tags.DeleteTagUseCase +import com.jetpackduba.gitnuro.git.tags.GetTagsUseCase import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.StateFlow diff --git a/src/main/kotlin/app/viewmodels/ViewDiffResult.kt b/src/main/kotlin/com/jetpackduba/gitnuro/viewmodels/ViewDiffResult.kt similarity index 65% rename from src/main/kotlin/app/viewmodels/ViewDiffResult.kt rename to src/main/kotlin/com/jetpackduba/gitnuro/viewmodels/ViewDiffResult.kt index 20a0520..b40b3dd 100644 --- a/src/main/kotlin/app/viewmodels/ViewDiffResult.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/viewmodels/ViewDiffResult.kt @@ -1,7 +1,7 @@ -package app.viewmodels +package com.jetpackduba.gitnuro.viewmodels -import app.git.DiffEntryType -import app.git.diff.DiffResult +import com.jetpackduba.gitnuro.git.DiffEntryType +import com.jetpackduba.gitnuro.git.diff.DiffResult sealed interface ViewDiffResult { object None : ViewDiffResult diff --git a/src/test/kotlin/app/TestUtils.kt b/src/test/kotlin/com/jetpackduba/gitnuro/app/TestUtils.kt similarity index 95% rename from src/test/kotlin/app/TestUtils.kt rename to src/test/kotlin/com/jetpackduba/gitnuro/app/TestUtils.kt index 8fdc48c..df45e35 100644 --- a/src/test/kotlin/app/TestUtils.kt +++ b/src/test/kotlin/com/jetpackduba/gitnuro/app/TestUtils.kt @@ -1,4 +1,4 @@ -package app +package com.jetpackduba.gitnuro.app import java.io.IOException import java.nio.file.Files diff --git a/src/test/kotlin/app/git/BeforeRepoAllTestsExtension.kt b/src/test/kotlin/com/jetpackduba/gitnuro/app/git/BeforeRepoAllTestsExtension.kt similarity index 81% rename from src/test/kotlin/app/git/BeforeRepoAllTestsExtension.kt rename to src/test/kotlin/com/jetpackduba/gitnuro/app/git/BeforeRepoAllTestsExtension.kt index 64883d8..55b496a 100644 --- a/src/test/kotlin/app/git/BeforeRepoAllTestsExtension.kt +++ b/src/test/kotlin/com/jetpackduba/gitnuro/app/git/BeforeRepoAllTestsExtension.kt @@ -1,12 +1,11 @@ -package app.git +package com.jetpackduba.gitnuro.app.git -import app.credentials.GProcess -import app.credentials.GRemoteSession -import app.credentials.GSessionManager -import app.git.remote_operations.CloneRepositoryUseCase -import app.git.remote_operations.HandleTransportUseCase +import com.jetpackduba.gitnuro.credentials.GProcess +import com.jetpackduba.gitnuro.credentials.GRemoteSession +import com.jetpackduba.gitnuro.credentials.GSessionManager +import com.jetpackduba.gitnuro.git.remote_operations.CloneRepositoryUseCase +import com.jetpackduba.gitnuro.git.remote_operations.HandleTransportUseCase import kotlinx.coroutines.Dispatchers -import kotlinx.coroutines.flow.collect import kotlinx.coroutines.flow.flowOn import kotlinx.coroutines.runBlocking import org.junit.jupiter.api.extension.AfterAllCallback diff --git a/src/test/kotlin/app/git/BranchesManagerTest.kt b/src/test/kotlin/com/jetpackduba/gitnuro/app/git/BranchesManagerTest.kt similarity index 98% rename from src/test/kotlin/app/git/BranchesManagerTest.kt rename to src/test/kotlin/com/jetpackduba/gitnuro/app/git/BranchesManagerTest.kt index b6ee0f8..c3abb74 100644 --- a/src/test/kotlin/app/git/BranchesManagerTest.kt +++ b/src/test/kotlin/com/jetpackduba/gitnuro/app/git/BranchesManagerTest.kt @@ -1,6 +1,6 @@ -//package app.git +//package com.jetpackduba.gitnuro.app.git // -//import app.TestUtils.copyDir +//import com.jetpackduba.gitnuro.app.TestUtils.copyDir //import kotlinx.coroutines.runBlocking //import org.eclipse.jgit.api.Git //import org.eclipse.jgit.lib.ObjectId diff --git a/src/test/kotlin/app/git/diff/GetCommitDiffEntriesUseCaseTest.kt b/src/test/kotlin/com/jetpackduba/gitnuro/app/git/diff/GetCommitDiffEntriesUseCaseTest.kt similarity index 67% rename from src/test/kotlin/app/git/diff/GetCommitDiffEntriesUseCaseTest.kt rename to src/test/kotlin/com/jetpackduba/gitnuro/app/git/diff/GetCommitDiffEntriesUseCaseTest.kt index 5ba0cc3..2ad4acf 100644 --- a/src/test/kotlin/app/git/diff/GetCommitDiffEntriesUseCaseTest.kt +++ b/src/test/kotlin/com/jetpackduba/gitnuro/app/git/diff/GetCommitDiffEntriesUseCaseTest.kt @@ -1,9 +1,7 @@ -package app.git.diff +package com.jetpackduba.gitnuro.app.git.diff import org.junit.jupiter.api.BeforeEach -import org.junit.jupiter.api.Assertions.* - internal class GetCommitDiffEntriesUseCaseTest { @BeforeEach diff --git a/src/test/kotlin/app/usecase/GenerateSplitHunkFromDiffResultUseCaseTest.kt b/src/test/kotlin/com/jetpackduba/gitnuro/app/usecase/GenerateSplitHunkFromDiffResultUseCaseTest.kt similarity index 98% rename from src/test/kotlin/app/usecase/GenerateSplitHunkFromDiffResultUseCaseTest.kt rename to src/test/kotlin/com/jetpackduba/gitnuro/app/usecase/GenerateSplitHunkFromDiffResultUseCaseTest.kt index af7476f..80183c8 100644 --- a/src/test/kotlin/app/usecase/GenerateSplitHunkFromDiffResultUseCaseTest.kt +++ b/src/test/kotlin/com/jetpackduba/gitnuro/app/usecase/GenerateSplitHunkFromDiffResultUseCaseTest.kt @@ -1,6 +1,6 @@ -package app.usecase +package com.jetpackduba.gitnuro.app.usecase -import app.git.diff.* +import com.jetpackduba.gitnuro.git.diff.* import io.mockk.mockk import org.junit.jupiter.api.Assertions.assertEquals import org.junit.jupiter.api.Test