Skip to content

Commit 0fe6dc3

Browse files
z8dnz8dn
committed
Refactor: reorganize package structure
1 parent 34b96fa commit 0fe6dc3

15 files changed

+92
-62
lines changed

src/main/kotlin/com/z8dn/plugins/a2pt/ShowBuildDirectoryAction.kt renamed to src/main/kotlin/com/z8dn/plugins/a2pt/actions/ShowBuildDirectoryAction.kt

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
1-
package com.z8dn.plugins.a2pt
1+
package com.z8dn.plugins.a2pt.actions
2+
3+
import com.z8dn.plugins.a2pt.AndroidViewBundle
4+
import com.z8dn.plugins.a2pt.settings.AndroidViewSettings
25

36
import com.android.tools.idea.navigator.ANDROID_VIEW_ID
47
import com.intellij.ide.projectView.ProjectView
@@ -8,7 +11,7 @@ import com.intellij.openapi.actionSystem.ToggleAction
811
import com.intellij.openapi.project.ProjectManager
912

1013
class ShowBuildDirectoryAction : ToggleAction(
11-
{ AndroidViewBundle.message("action.ShowBuildDirectoryAction.text") }
14+
{ AndroidViewBundle.message("action.ProjectView.ShowBuildDirectoryAction.text") }
1215
) {
1316
private val settings = AndroidViewSettings.getInstance()
1417

src/main/kotlin/com/z8dn/plugins/a2pt/ShowProjectFilesInModuleAction.kt renamed to src/main/kotlin/com/z8dn/plugins/a2pt/actions/ShowProjectFilesInModuleAction.kt

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
1-
package com.z8dn.plugins.a2pt
1+
package com.z8dn.plugins.a2pt.actions
2+
3+
import com.z8dn.plugins.a2pt.AndroidViewBundle
4+
import com.z8dn.plugins.a2pt.settings.AndroidViewSettings
25

36
import com.android.tools.idea.navigator.ANDROID_VIEW_ID
47
import com.intellij.ide.projectView.ProjectView
@@ -8,7 +11,7 @@ import com.intellij.openapi.actionSystem.ToggleAction
811
import com.intellij.openapi.project.ProjectManager
912

1013
class ShowProjectFilesInModuleAction : ToggleAction(
11-
{ AndroidViewBundle.message("action.ShowProjectFilesInModuleAction.text") }
14+
{ AndroidViewBundle.message("action.ProjectView.ShowProjectFilesInModuleAction.text") }
1215
) {
1316
private val settings = AndroidViewSettings.getInstance()
1417

src/main/kotlin/com/z8dn/plugins/a2pt/GradleModuleWithProjectFiles.kt renamed to src/main/kotlin/com/z8dn/plugins/a2pt/nodes/GradleModuleWithProjectFiles.kt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
package com.z8dn.plugins.a2pt
1+
package com.z8dn.plugins.a2pt.nodes
2+
3+
import com.z8dn.plugins.a2pt.utils.AndroidViewNodeUtils
24

35
import com.android.tools.idea.navigator.nodes.AndroidViewNodeProvider
46
import com.android.tools.idea.navigator.nodes.other.NonAndroidModuleNode

src/main/kotlin/com/z8dn/plugins/a2pt/ProjectFileGroupNode.kt renamed to src/main/kotlin/com/z8dn/plugins/a2pt/nodes/ProjectFileGroupNode.kt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.z8dn.plugins.a2pt
1+
package com.z8dn.plugins.a2pt.nodes
22

33
import com.intellij.icons.AllIcons
44
import com.intellij.ide.projectView.PresentationData
@@ -9,6 +9,9 @@ import com.intellij.openapi.module.ModuleUtilCore
99
import com.intellij.openapi.project.Project
1010
import com.intellij.openapi.vfs.VirtualFile
1111
import com.intellij.psi.PsiManager
12+
import com.z8dn.plugins.a2pt.settings.ProjectFileGroup
13+
import com.z8dn.plugins.a2pt.utils.AndroidViewNodeUtils
14+
import com.z8dn.plugins.a2pt.utils.ProjectFileDisplayUtils
1215
import javax.swing.Icon
1316

1417
/**

src/main/kotlin/com/z8dn/plugins/a2pt/ProjectFileNode.kt renamed to src/main/kotlin/com/z8dn/plugins/a2pt/nodes/ProjectFileNode.kt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
package com.z8dn.plugins.a2pt
1+
package com.z8dn.plugins.a2pt.nodes
2+
3+
import com.z8dn.plugins.a2pt.utils.ProjectFileDisplayUtils
24

35
import com.intellij.ide.projectView.PresentationData
46
import com.intellij.ide.projectView.ViewSettings

src/main/kotlin/com/z8dn/plugins/a2pt/AdvancedAndroidViewProvider.kt renamed to src/main/kotlin/com/z8dn/plugins/a2pt/providers/AdvancedAndroidViewProvider.kt

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.z8dn.plugins.a2pt
1+
package com.z8dn.plugins.a2pt.providers
22

33
import com.android.tools.idea.apk.ApkFacet
44
import com.android.tools.idea.model.AndroidModel
@@ -12,6 +12,10 @@ import com.intellij.openapi.module.Module
1212
import com.intellij.openapi.module.ModuleUtilCore
1313
import com.intellij.openapi.vfs.VirtualFile
1414
import com.intellij.psi.PsiManager
15+
import com.z8dn.plugins.a2pt.nodes.GradleModuleWithProjectFiles
16+
import com.z8dn.plugins.a2pt.nodes.ProjectFileNode
17+
import com.z8dn.plugins.a2pt.settings.AndroidViewSettings
18+
import com.z8dn.plugins.a2pt.utils.AndroidViewNodeUtils
1519
import org.jetbrains.android.facet.AndroidFacet
1620

1721
/**

src/main/kotlin/com/z8dn/plugins/a2pt/CustomNonAndroidNodeProvider.kt renamed to src/main/kotlin/com/z8dn/plugins/a2pt/providers/CustomNonAndroidNodeProvider.kt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
1-
package com.z8dn.plugins.a2pt
1+
package com.z8dn.plugins.a2pt.providers
2+
3+
import com.z8dn.plugins.a2pt.nodes.ProjectFileNode
4+
import com.z8dn.plugins.a2pt.utils.AndroidViewNodeUtils
25

36
import com.android.tools.idea.navigator.nodes.other.NonAndroidModuleNode
47
import com.intellij.ide.projectView.TreeStructureProvider

src/main/kotlin/com/z8dn/plugins/a2pt/ProjectFilesTreeStructureProvider.kt renamed to src/main/kotlin/com/z8dn/plugins/a2pt/providers/ProjectFilesTreeStructureProvider.kt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
1-
package com.z8dn.plugins.a2pt
1+
package com.z8dn.plugins.a2pt.providers
22

33
import com.android.tools.idea.navigator.nodes.AndroidViewProjectNode
44
import com.intellij.ide.projectView.TreeStructureProvider
55
import com.intellij.ide.projectView.ViewSettings
66
import com.intellij.ide.util.treeView.AbstractTreeNode
7+
import com.z8dn.plugins.a2pt.nodes.ProjectFileGroupNode
8+
import com.z8dn.plugins.a2pt.settings.AndroidViewSettings
9+
import com.z8dn.plugins.a2pt.utils.AndroidViewNodeUtils
710

811
/**
912
* TreeStructureProvider that adds ProjectFileGroupNode(s) at the project root level

src/main/kotlin/com/z8dn/plugins/a2pt/AndroidViewSettings.kt renamed to src/main/kotlin/com/z8dn/plugins/a2pt/settings/AndroidViewSettings.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.z8dn.plugins.a2pt
1+
package com.z8dn.plugins.a2pt.settings
22

33
import com.intellij.openapi.application.ApplicationManager
44
import com.intellij.openapi.components.PersistentStateComponent

src/main/kotlin/com/z8dn/plugins/a2pt/AndroidViewSettingsConfigurable.kt renamed to src/main/kotlin/com/z8dn/plugins/a2pt/settings/AndroidViewSettingsConfigurable.kt

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
package com.z8dn.plugins.a2pt
1+
package com.z8dn.plugins.a2pt.settings
2+
3+
import com.z8dn.plugins.a2pt.AndroidViewBundle
24

35
import com.intellij.ide.projectView.ProjectView
46
import com.intellij.openapi.options.SearchableConfigurable
@@ -26,7 +28,7 @@ class AndroidViewSettingsConfigurable : SearchableConfigurable {
2628

2729
override fun getId(): String = "com.z8dn.plugins.a2pt.settings"
2830

29-
override fun getDisplayName(): String = AndroidViewBundle.message("settings.displayName")
31+
override fun getDisplayName(): String = AndroidViewBundle.message("settings.DisplayName.text")
3032

3133
override fun createComponent(): JComponent {
3234
val mainPanel = JPanel(GridBagLayout())
@@ -41,8 +43,8 @@ class AndroidViewSettingsConfigurable : SearchableConfigurable {
4143
gbc.insets = Insets(5, 5, 5, 5)
4244

4345
// Build directory checkbox
44-
showBuildDirectoryCheckBox = JBCheckBox(AndroidViewBundle.message("settings.showBuildDirectory")).apply {
45-
toolTipText = AndroidViewBundle.message("settings.showBuildDirectory.tooltip")
46+
showBuildDirectoryCheckBox = JBCheckBox(AndroidViewBundle.message("settings.ShowBuildDirectory.text")).apply {
47+
toolTipText = AndroidViewBundle.message("settings.ShowBuildDirectory.description")
4648
}
4749
mainPanel.add(showBuildDirectoryCheckBox, gbc)
4850

@@ -60,7 +62,7 @@ class AndroidViewSettingsConfigurable : SearchableConfigurable {
6062

6163
private fun createGroupsTablePanel(): JPanel {
6264
val panel = JPanel(BorderLayout())
63-
panel.border = BorderFactory.createTitledBorder(AndroidViewBundle.message("settings.customFileGroups.border"))
65+
panel.border = BorderFactory.createTitledBorder(AndroidViewBundle.message("settings.CustomFileGroups.text"))
6466

6567
groupsTableModel = ProjectFileGroupsTableModel()
6668
groupsTable = JBTable(groupsTableModel).apply {
@@ -75,7 +77,7 @@ class AndroidViewSettingsConfigurable : SearchableConfigurable {
7577

7678
panel.add(decorator.createPanel(), BorderLayout.CENTER)
7779

78-
val helpLabel = JBLabel("<html><i>${AndroidViewBundle.message("settings.customFileGroups.help")}</i></html>")
80+
val helpLabel = JBLabel("<html><i>${AndroidViewBundle.message("settings.CustomFileGroups.description")}</i></html>")
7981
panel.add(helpLabel, BorderLayout.SOUTH)
8082

8183
return panel
@@ -157,8 +159,8 @@ class AndroidViewSettingsConfigurable : SearchableConfigurable {
157159
override fun getColumnCount(): Int = 2
158160

159161
override fun getColumnName(column: Int): String = when (column) {
160-
0 -> AndroidViewBundle.message("settings.table.columnName.groupName")
161-
1 -> AndroidViewBundle.message("settings.table.columnName.patterns")
162+
0 -> AndroidViewBundle.message("settings.Table.ColumnName.groupName")
163+
1 -> AndroidViewBundle.message("settings.Table.ColumnName.patterns")
162164
else -> ""
163165
}
164166

0 commit comments

Comments
 (0)