diff --git a/main.kv b/main.kv deleted file mode 100644 index e40989e..0000000 --- a/main.kv +++ /dev/null @@ -1,5 +0,0 @@ -#:include forestmapview.kv - -ForestMapView: - orientation: 'vertical' - id: forestmapview diff --git a/forestmapview.kv b/src/forestmapview.kv similarity index 100% rename from forestmapview.kv rename to src/forestmapview.kv diff --git a/forestmapview.py b/src/forestmapview.py similarity index 99% rename from forestmapview.py rename to src/forestmapview.py index 7c06e4f..e5010f7 100644 --- a/forestmapview.py +++ b/src/forestmapview.py @@ -39,7 +39,6 @@ class ForestMapView(MapView): def add_tree(self, tree): # Create TreeMarker - name = tree[0] lat, lon = tree[1], tree[2] treemarker = TreeMarker(lat=lat, lon=lon) treemarker.tree_data = treemarker @@ -48,5 +47,5 @@ class ForestMapView(MapView): self.add_widget(treemarker) # Keep track of the TreeMarker's name - + name = tree[0] self.tree_names.append(name) diff --git a/game.py b/src/game.py similarity index 100% rename from game.py rename to src/game.py diff --git a/gpsblinker.kv b/src/gpsblinker.kv similarity index 100% rename from gpsblinker.kv rename to src/gpsblinker.kv diff --git a/gpsblinker.py b/src/gpsblinker.py similarity index 100% rename from gpsblinker.py rename to src/gpsblinker.py diff --git a/gpshelper.py b/src/gpshelper.py similarity index 100% rename from gpshelper.py rename to src/gpshelper.py diff --git a/kivymd/__init__.py b/src/kivymd/__init__.py similarity index 100% rename from kivymd/__init__.py rename to src/kivymd/__init__.py diff --git a/kivymd/app.py b/src/kivymd/app.py similarity index 100% rename from kivymd/app.py rename to src/kivymd/app.py diff --git a/kivymd/color_definitions.py b/src/kivymd/color_definitions.py similarity index 100% rename from kivymd/color_definitions.py rename to src/kivymd/color_definitions.py diff --git a/kivymd/factory_registers.py b/src/kivymd/factory_registers.py similarity index 100% rename from kivymd/factory_registers.py rename to src/kivymd/factory_registers.py diff --git a/kivymd/font_definitions.py b/src/kivymd/font_definitions.py similarity index 100% rename from kivymd/font_definitions.py rename to src/kivymd/font_definitions.py diff --git a/kivymd/fonts/Roboto-Black.ttf b/src/kivymd/fonts/Roboto-Black.ttf similarity index 100% rename from kivymd/fonts/Roboto-Black.ttf rename to src/kivymd/fonts/Roboto-Black.ttf diff --git a/kivymd/fonts/Roboto-BlackItalic.ttf b/src/kivymd/fonts/Roboto-BlackItalic.ttf similarity index 100% rename from kivymd/fonts/Roboto-BlackItalic.ttf rename to src/kivymd/fonts/Roboto-BlackItalic.ttf diff --git a/kivymd/fonts/Roboto-Bold.ttf b/src/kivymd/fonts/Roboto-Bold.ttf similarity index 100% rename from kivymd/fonts/Roboto-Bold.ttf rename to src/kivymd/fonts/Roboto-Bold.ttf diff --git a/kivymd/fonts/Roboto-BoldItalic.ttf b/src/kivymd/fonts/Roboto-BoldItalic.ttf similarity index 100% rename from kivymd/fonts/Roboto-BoldItalic.ttf rename to src/kivymd/fonts/Roboto-BoldItalic.ttf diff --git a/kivymd/fonts/Roboto-Italic.ttf b/src/kivymd/fonts/Roboto-Italic.ttf similarity index 100% rename from kivymd/fonts/Roboto-Italic.ttf rename to src/kivymd/fonts/Roboto-Italic.ttf diff --git a/kivymd/fonts/Roboto-Light.ttf b/src/kivymd/fonts/Roboto-Light.ttf similarity index 100% rename from kivymd/fonts/Roboto-Light.ttf rename to src/kivymd/fonts/Roboto-Light.ttf diff --git a/kivymd/fonts/Roboto-LightItalic.ttf b/src/kivymd/fonts/Roboto-LightItalic.ttf similarity index 100% rename from kivymd/fonts/Roboto-LightItalic.ttf rename to src/kivymd/fonts/Roboto-LightItalic.ttf diff --git a/kivymd/fonts/Roboto-Medium.ttf b/src/kivymd/fonts/Roboto-Medium.ttf similarity index 100% rename from kivymd/fonts/Roboto-Medium.ttf rename to src/kivymd/fonts/Roboto-Medium.ttf diff --git a/kivymd/fonts/Roboto-MediumItalic.ttf b/src/kivymd/fonts/Roboto-MediumItalic.ttf similarity index 100% rename from kivymd/fonts/Roboto-MediumItalic.ttf rename to src/kivymd/fonts/Roboto-MediumItalic.ttf diff --git a/kivymd/fonts/Roboto-Regular.ttf b/src/kivymd/fonts/Roboto-Regular.ttf similarity index 100% rename from kivymd/fonts/Roboto-Regular.ttf rename to src/kivymd/fonts/Roboto-Regular.ttf diff --git a/kivymd/fonts/Roboto-Thin.ttf b/src/kivymd/fonts/Roboto-Thin.ttf similarity index 100% rename from kivymd/fonts/Roboto-Thin.ttf rename to src/kivymd/fonts/Roboto-Thin.ttf diff --git a/kivymd/fonts/Roboto-ThinItalic.ttf b/src/kivymd/fonts/Roboto-ThinItalic.ttf similarity index 100% rename from kivymd/fonts/Roboto-ThinItalic.ttf rename to src/kivymd/fonts/Roboto-ThinItalic.ttf diff --git a/kivymd/fonts/materialdesignicons-webfont.ttf b/src/kivymd/fonts/materialdesignicons-webfont.ttf similarity index 100% rename from kivymd/fonts/materialdesignicons-webfont.ttf rename to src/kivymd/fonts/materialdesignicons-webfont.ttf diff --git a/kivymd/icon_definitions.py b/src/kivymd/icon_definitions.py similarity index 100% rename from kivymd/icon_definitions.py rename to src/kivymd/icon_definitions.py diff --git a/kivymd/images/folder.png b/src/kivymd/images/folder.png similarity index 100% rename from kivymd/images/folder.png rename to src/kivymd/images/folder.png diff --git a/kivymd/images/quad_shadow-0.png b/src/kivymd/images/quad_shadow-0.png similarity index 100% rename from kivymd/images/quad_shadow-0.png rename to src/kivymd/images/quad_shadow-0.png diff --git a/kivymd/images/quad_shadow-1.png b/src/kivymd/images/quad_shadow-1.png similarity index 100% rename from kivymd/images/quad_shadow-1.png rename to src/kivymd/images/quad_shadow-1.png diff --git a/kivymd/images/quad_shadow-2.png b/src/kivymd/images/quad_shadow-2.png similarity index 100% rename from kivymd/images/quad_shadow-2.png rename to src/kivymd/images/quad_shadow-2.png diff --git a/kivymd/images/quad_shadow.atlas b/src/kivymd/images/quad_shadow.atlas similarity index 100% rename from kivymd/images/quad_shadow.atlas rename to src/kivymd/images/quad_shadow.atlas diff --git a/kivymd/images/rec_shadow-0.png b/src/kivymd/images/rec_shadow-0.png similarity index 100% rename from kivymd/images/rec_shadow-0.png rename to src/kivymd/images/rec_shadow-0.png diff --git a/kivymd/images/rec_shadow-1.png b/src/kivymd/images/rec_shadow-1.png similarity index 100% rename from kivymd/images/rec_shadow-1.png rename to src/kivymd/images/rec_shadow-1.png diff --git a/kivymd/images/rec_shadow.atlas b/src/kivymd/images/rec_shadow.atlas similarity index 100% rename from kivymd/images/rec_shadow.atlas rename to src/kivymd/images/rec_shadow.atlas diff --git a/kivymd/images/rec_st_shadow-0.png b/src/kivymd/images/rec_st_shadow-0.png similarity index 100% rename from kivymd/images/rec_st_shadow-0.png rename to src/kivymd/images/rec_st_shadow-0.png diff --git a/kivymd/images/rec_st_shadow-1.png b/src/kivymd/images/rec_st_shadow-1.png similarity index 100% rename from kivymd/images/rec_st_shadow-1.png rename to src/kivymd/images/rec_st_shadow-1.png diff --git a/kivymd/images/rec_st_shadow-2.png b/src/kivymd/images/rec_st_shadow-2.png similarity index 100% rename from kivymd/images/rec_st_shadow-2.png rename to src/kivymd/images/rec_st_shadow-2.png diff --git a/kivymd/images/rec_st_shadow.atlas b/src/kivymd/images/rec_st_shadow.atlas similarity index 100% rename from kivymd/images/rec_st_shadow.atlas rename to src/kivymd/images/rec_st_shadow.atlas diff --git a/kivymd/images/round_shadow-0.png b/src/kivymd/images/round_shadow-0.png similarity index 100% rename from kivymd/images/round_shadow-0.png rename to src/kivymd/images/round_shadow-0.png diff --git a/kivymd/images/round_shadow-1.png b/src/kivymd/images/round_shadow-1.png similarity index 100% rename from kivymd/images/round_shadow-1.png rename to src/kivymd/images/round_shadow-1.png diff --git a/kivymd/images/round_shadow-2.png b/src/kivymd/images/round_shadow-2.png similarity index 100% rename from kivymd/images/round_shadow-2.png rename to src/kivymd/images/round_shadow-2.png diff --git a/kivymd/images/round_shadow.atlas b/src/kivymd/images/round_shadow.atlas similarity index 100% rename from kivymd/images/round_shadow.atlas rename to src/kivymd/images/round_shadow.atlas diff --git a/kivymd/images/transparent.png b/src/kivymd/images/transparent.png similarity index 100% rename from kivymd/images/transparent.png rename to src/kivymd/images/transparent.png diff --git a/kivymd/material_resources.py b/src/kivymd/material_resources.py similarity index 100% rename from kivymd/material_resources.py rename to src/kivymd/material_resources.py diff --git a/kivymd/stiffscroll/LICENSE b/src/kivymd/stiffscroll/LICENSE similarity index 100% rename from kivymd/stiffscroll/LICENSE rename to src/kivymd/stiffscroll/LICENSE diff --git a/kivymd/stiffscroll/README.md b/src/kivymd/stiffscroll/README.md similarity index 100% rename from kivymd/stiffscroll/README.md rename to src/kivymd/stiffscroll/README.md diff --git a/kivymd/stiffscroll/__init__.py b/src/kivymd/stiffscroll/__init__.py similarity index 100% rename from kivymd/stiffscroll/__init__.py rename to src/kivymd/stiffscroll/__init__.py diff --git a/kivymd/tests/test_app.py b/src/kivymd/tests/test_app.py similarity index 100% rename from kivymd/tests/test_app.py rename to src/kivymd/tests/test_app.py diff --git a/kivymd/tests/test_font_definitions.py b/src/kivymd/tests/test_font_definitions.py similarity index 100% rename from kivymd/tests/test_font_definitions.py rename to src/kivymd/tests/test_font_definitions.py diff --git a/kivymd/tests/test_icon_definitions.py b/src/kivymd/tests/test_icon_definitions.py similarity index 100% rename from kivymd/tests/test_icon_definitions.py rename to src/kivymd/tests/test_icon_definitions.py diff --git a/kivymd/theming.py b/src/kivymd/theming.py similarity index 100% rename from kivymd/theming.py rename to src/kivymd/theming.py diff --git a/kivymd/theming_dynamic_text.py b/src/kivymd/theming_dynamic_text.py similarity index 100% rename from kivymd/theming_dynamic_text.py rename to src/kivymd/theming_dynamic_text.py diff --git a/kivymd/toast/LICENSE b/src/kivymd/toast/LICENSE similarity index 100% rename from kivymd/toast/LICENSE rename to src/kivymd/toast/LICENSE diff --git a/kivymd/toast/README.md b/src/kivymd/toast/README.md similarity index 100% rename from kivymd/toast/README.md rename to src/kivymd/toast/README.md diff --git a/kivymd/toast/__init__.py b/src/kivymd/toast/__init__.py similarity index 100% rename from kivymd/toast/__init__.py rename to src/kivymd/toast/__init__.py diff --git a/kivymd/toast/androidtoast/__init__.py b/src/kivymd/toast/androidtoast/__init__.py similarity index 100% rename from kivymd/toast/androidtoast/__init__.py rename to src/kivymd/toast/androidtoast/__init__.py diff --git a/kivymd/toast/androidtoast/androidtoast.py b/src/kivymd/toast/androidtoast/androidtoast.py similarity index 100% rename from kivymd/toast/androidtoast/androidtoast.py rename to src/kivymd/toast/androidtoast/androidtoast.py diff --git a/kivymd/toast/kivytoast/__init__.py b/src/kivymd/toast/kivytoast/__init__.py similarity index 100% rename from kivymd/toast/kivytoast/__init__.py rename to src/kivymd/toast/kivytoast/__init__.py diff --git a/kivymd/toast/kivytoast/kivytoast.py b/src/kivymd/toast/kivytoast/kivytoast.py similarity index 100% rename from kivymd/toast/kivytoast/kivytoast.py rename to src/kivymd/toast/kivytoast/kivytoast.py diff --git a/kivymd/tools/__init__.py b/src/kivymd/tools/__init__.py similarity index 100% rename from kivymd/tools/__init__.py rename to src/kivymd/tools/__init__.py diff --git a/kivymd/tools/packaging/__init__.py b/src/kivymd/tools/packaging/__init__.py similarity index 100% rename from kivymd/tools/packaging/__init__.py rename to src/kivymd/tools/packaging/__init__.py diff --git a/kivymd/tools/packaging/pyinstaller/__init__.py b/src/kivymd/tools/packaging/pyinstaller/__init__.py similarity index 100% rename from kivymd/tools/packaging/pyinstaller/__init__.py rename to src/kivymd/tools/packaging/pyinstaller/__init__.py diff --git a/kivymd/tools/packaging/pyinstaller/hook-kivymd.py b/src/kivymd/tools/packaging/pyinstaller/hook-kivymd.py similarity index 100% rename from kivymd/tools/packaging/pyinstaller/hook-kivymd.py rename to src/kivymd/tools/packaging/pyinstaller/hook-kivymd.py diff --git a/kivymd/tools/release/__init__.py b/src/kivymd/tools/release/__init__.py similarity index 100% rename from kivymd/tools/release/__init__.py rename to src/kivymd/tools/release/__init__.py diff --git a/kivymd/tools/release/argument_parser.py b/src/kivymd/tools/release/argument_parser.py similarity index 100% rename from kivymd/tools/release/argument_parser.py rename to src/kivymd/tools/release/argument_parser.py diff --git a/kivymd/tools/release/git_commands.py b/src/kivymd/tools/release/git_commands.py similarity index 100% rename from kivymd/tools/release/git_commands.py rename to src/kivymd/tools/release/git_commands.py diff --git a/kivymd/tools/release/make_release.py b/src/kivymd/tools/release/make_release.py similarity index 100% rename from kivymd/tools/release/make_release.py rename to src/kivymd/tools/release/make_release.py diff --git a/kivymd/tools/release/update_icons.py b/src/kivymd/tools/release/update_icons.py similarity index 100% rename from kivymd/tools/release/update_icons.py rename to src/kivymd/tools/release/update_icons.py diff --git a/kivymd/uix/__init__.py b/src/kivymd/uix/__init__.py similarity index 100% rename from kivymd/uix/__init__.py rename to src/kivymd/uix/__init__.py diff --git a/kivymd/uix/backdrop.py b/src/kivymd/uix/backdrop.py similarity index 100% rename from kivymd/uix/backdrop.py rename to src/kivymd/uix/backdrop.py diff --git a/kivymd/uix/banner.py b/src/kivymd/uix/banner.py similarity index 100% rename from kivymd/uix/banner.py rename to src/kivymd/uix/banner.py diff --git a/kivymd/uix/behaviors/__init__.py b/src/kivymd/uix/behaviors/__init__.py similarity index 100% rename from kivymd/uix/behaviors/__init__.py rename to src/kivymd/uix/behaviors/__init__.py diff --git a/kivymd/uix/behaviors/backgroundcolorbehavior.py b/src/kivymd/uix/behaviors/backgroundcolorbehavior.py similarity index 100% rename from kivymd/uix/behaviors/backgroundcolorbehavior.py rename to src/kivymd/uix/behaviors/backgroundcolorbehavior.py diff --git a/kivymd/uix/behaviors/elevation.py b/src/kivymd/uix/behaviors/elevation.py similarity index 100% rename from kivymd/uix/behaviors/elevation.py rename to src/kivymd/uix/behaviors/elevation.py diff --git a/kivymd/uix/behaviors/focus_behavior.py b/src/kivymd/uix/behaviors/focus_behavior.py similarity index 100% rename from kivymd/uix/behaviors/focus_behavior.py rename to src/kivymd/uix/behaviors/focus_behavior.py diff --git a/kivymd/uix/behaviors/hover_behavior.py b/src/kivymd/uix/behaviors/hover_behavior.py similarity index 100% rename from kivymd/uix/behaviors/hover_behavior.py rename to src/kivymd/uix/behaviors/hover_behavior.py diff --git a/kivymd/uix/behaviors/magic_behavior.py b/src/kivymd/uix/behaviors/magic_behavior.py similarity index 100% rename from kivymd/uix/behaviors/magic_behavior.py rename to src/kivymd/uix/behaviors/magic_behavior.py diff --git a/kivymd/uix/behaviors/ripplebehavior.py b/src/kivymd/uix/behaviors/ripplebehavior.py similarity index 100% rename from kivymd/uix/behaviors/ripplebehavior.py rename to src/kivymd/uix/behaviors/ripplebehavior.py diff --git a/kivymd/uix/behaviors/toggle_behavior.py b/src/kivymd/uix/behaviors/toggle_behavior.py similarity index 100% rename from kivymd/uix/behaviors/toggle_behavior.py rename to src/kivymd/uix/behaviors/toggle_behavior.py diff --git a/kivymd/uix/behaviors/touch_behavior.py b/src/kivymd/uix/behaviors/touch_behavior.py similarity index 100% rename from kivymd/uix/behaviors/touch_behavior.py rename to src/kivymd/uix/behaviors/touch_behavior.py diff --git a/kivymd/uix/bottomnavigation.py b/src/kivymd/uix/bottomnavigation.py similarity index 100% rename from kivymd/uix/bottomnavigation.py rename to src/kivymd/uix/bottomnavigation.py diff --git a/kivymd/uix/bottomsheet.py b/src/kivymd/uix/bottomsheet.py similarity index 100% rename from kivymd/uix/bottomsheet.py rename to src/kivymd/uix/bottomsheet.py diff --git a/kivymd/uix/boxlayout.py b/src/kivymd/uix/boxlayout.py similarity index 100% rename from kivymd/uix/boxlayout.py rename to src/kivymd/uix/boxlayout.py diff --git a/kivymd/uix/button.py b/src/kivymd/uix/button.py similarity index 100% rename from kivymd/uix/button.py rename to src/kivymd/uix/button.py diff --git a/kivymd/uix/card.py b/src/kivymd/uix/card.py similarity index 100% rename from kivymd/uix/card.py rename to src/kivymd/uix/card.py diff --git a/kivymd/uix/carousel.py b/src/kivymd/uix/carousel.py similarity index 100% rename from kivymd/uix/carousel.py rename to src/kivymd/uix/carousel.py diff --git a/kivymd/uix/chip.py b/src/kivymd/uix/chip.py similarity index 100% rename from kivymd/uix/chip.py rename to src/kivymd/uix/chip.py diff --git a/kivymd/uix/datatables.py b/src/kivymd/uix/datatables.py similarity index 100% rename from kivymd/uix/datatables.py rename to src/kivymd/uix/datatables.py diff --git a/kivymd/uix/dialog.py b/src/kivymd/uix/dialog.py similarity index 100% rename from kivymd/uix/dialog.py rename to src/kivymd/uix/dialog.py diff --git a/kivymd/uix/dialog2.py b/src/kivymd/uix/dialog2.py similarity index 100% rename from kivymd/uix/dialog2.py rename to src/kivymd/uix/dialog2.py diff --git a/kivymd/uix/dropdownitem.py b/src/kivymd/uix/dropdownitem.py similarity index 100% rename from kivymd/uix/dropdownitem.py rename to src/kivymd/uix/dropdownitem.py diff --git a/kivymd/uix/expansionpanel.py b/src/kivymd/uix/expansionpanel.py similarity index 100% rename from kivymd/uix/expansionpanel.py rename to src/kivymd/uix/expansionpanel.py diff --git a/kivymd/uix/filemanager.py b/src/kivymd/uix/filemanager.py similarity index 100% rename from kivymd/uix/filemanager.py rename to src/kivymd/uix/filemanager.py diff --git a/kivymd/uix/floatlayout.py b/src/kivymd/uix/floatlayout.py similarity index 100% rename from kivymd/uix/floatlayout.py rename to src/kivymd/uix/floatlayout.py diff --git a/kivymd/uix/gridlayout.py b/src/kivymd/uix/gridlayout.py similarity index 100% rename from kivymd/uix/gridlayout.py rename to src/kivymd/uix/gridlayout.py diff --git a/kivymd/uix/imagelist.py b/src/kivymd/uix/imagelist.py similarity index 100% rename from kivymd/uix/imagelist.py rename to src/kivymd/uix/imagelist.py diff --git a/kivymd/uix/label.py b/src/kivymd/uix/label.py similarity index 100% rename from kivymd/uix/label.py rename to src/kivymd/uix/label.py diff --git a/kivymd/uix/list.py b/src/kivymd/uix/list.py similarity index 100% rename from kivymd/uix/list.py rename to src/kivymd/uix/list.py diff --git a/kivymd/uix/menu.py b/src/kivymd/uix/menu.py similarity index 100% rename from kivymd/uix/menu.py rename to src/kivymd/uix/menu.py diff --git a/kivymd/uix/navigationdrawer.py b/src/kivymd/uix/navigationdrawer.py similarity index 100% rename from kivymd/uix/navigationdrawer.py rename to src/kivymd/uix/navigationdrawer.py diff --git a/kivymd/uix/picker.py b/src/kivymd/uix/picker.py similarity index 100% rename from kivymd/uix/picker.py rename to src/kivymd/uix/picker.py diff --git a/kivymd/uix/progressbar.py b/src/kivymd/uix/progressbar.py similarity index 100% rename from kivymd/uix/progressbar.py rename to src/kivymd/uix/progressbar.py diff --git a/kivymd/uix/refreshlayout.py b/src/kivymd/uix/refreshlayout.py similarity index 100% rename from kivymd/uix/refreshlayout.py rename to src/kivymd/uix/refreshlayout.py diff --git a/kivymd/uix/relativelayout.py b/src/kivymd/uix/relativelayout.py similarity index 100% rename from kivymd/uix/relativelayout.py rename to src/kivymd/uix/relativelayout.py diff --git a/kivymd/uix/screen.py b/src/kivymd/uix/screen.py similarity index 100% rename from kivymd/uix/screen.py rename to src/kivymd/uix/screen.py diff --git a/kivymd/uix/selectioncontrol.py b/src/kivymd/uix/selectioncontrol.py similarity index 100% rename from kivymd/uix/selectioncontrol.py rename to src/kivymd/uix/selectioncontrol.py diff --git a/kivymd/uix/slider.py b/src/kivymd/uix/slider.py similarity index 100% rename from kivymd/uix/slider.py rename to src/kivymd/uix/slider.py diff --git a/kivymd/uix/snackbar.py b/src/kivymd/uix/snackbar.py similarity index 100% rename from kivymd/uix/snackbar.py rename to src/kivymd/uix/snackbar.py diff --git a/kivymd/uix/spinner.py b/src/kivymd/uix/spinner.py similarity index 100% rename from kivymd/uix/spinner.py rename to src/kivymd/uix/spinner.py diff --git a/kivymd/uix/stacklayout.py b/src/kivymd/uix/stacklayout.py similarity index 100% rename from kivymd/uix/stacklayout.py rename to src/kivymd/uix/stacklayout.py diff --git a/kivymd/uix/tab.py b/src/kivymd/uix/tab.py similarity index 100% rename from kivymd/uix/tab.py rename to src/kivymd/uix/tab.py diff --git a/kivymd/uix/taptargetview.py b/src/kivymd/uix/taptargetview.py similarity index 100% rename from kivymd/uix/taptargetview.py rename to src/kivymd/uix/taptargetview.py diff --git a/kivymd/uix/textfield.py b/src/kivymd/uix/textfield.py similarity index 100% rename from kivymd/uix/textfield.py rename to src/kivymd/uix/textfield.py diff --git a/kivymd/uix/toolbar.py b/src/kivymd/uix/toolbar.py similarity index 100% rename from kivymd/uix/toolbar.py rename to src/kivymd/uix/toolbar.py diff --git a/kivymd/uix/tooltip.py b/src/kivymd/uix/tooltip.py similarity index 100% rename from kivymd/uix/tooltip.py rename to src/kivymd/uix/tooltip.py diff --git a/kivymd/utils/__init__.py b/src/kivymd/utils/__init__.py similarity index 100% rename from kivymd/utils/__init__.py rename to src/kivymd/utils/__init__.py diff --git a/kivymd/utils/asynckivy.py b/src/kivymd/utils/asynckivy.py similarity index 100% rename from kivymd/utils/asynckivy.py rename to src/kivymd/utils/asynckivy.py diff --git a/kivymd/utils/cropimage.py b/src/kivymd/utils/cropimage.py similarity index 100% rename from kivymd/utils/cropimage.py rename to src/kivymd/utils/cropimage.py diff --git a/kivymd/utils/fitimage.py b/src/kivymd/utils/fitimage.py similarity index 100% rename from kivymd/utils/fitimage.py rename to src/kivymd/utils/fitimage.py diff --git a/kivymd/utils/fpsmonitor.py b/src/kivymd/utils/fpsmonitor.py similarity index 100% rename from kivymd/utils/fpsmonitor.py rename to src/kivymd/utils/fpsmonitor.py diff --git a/kivymd/utils/hot_reload_viewer.py b/src/kivymd/utils/hot_reload_viewer.py similarity index 100% rename from kivymd/utils/hot_reload_viewer.py rename to src/kivymd/utils/hot_reload_viewer.py diff --git a/kivymd/vendor/__init__.py b/src/kivymd/vendor/__init__.py similarity index 100% rename from kivymd/vendor/__init__.py rename to src/kivymd/vendor/__init__.py diff --git a/kivymd/vendor/circleLayout/LICENSE b/src/kivymd/vendor/circleLayout/LICENSE similarity index 100% rename from kivymd/vendor/circleLayout/LICENSE rename to src/kivymd/vendor/circleLayout/LICENSE diff --git a/kivymd/vendor/circleLayout/README.md b/src/kivymd/vendor/circleLayout/README.md similarity index 100% rename from kivymd/vendor/circleLayout/README.md rename to src/kivymd/vendor/circleLayout/README.md diff --git a/kivymd/vendor/circleLayout/__init__.py b/src/kivymd/vendor/circleLayout/__init__.py similarity index 100% rename from kivymd/vendor/circleLayout/__init__.py rename to src/kivymd/vendor/circleLayout/__init__.py diff --git a/kivymd/vendor/circularTimePicker/LICENSE b/src/kivymd/vendor/circularTimePicker/LICENSE similarity index 100% rename from kivymd/vendor/circularTimePicker/LICENSE rename to src/kivymd/vendor/circularTimePicker/LICENSE diff --git a/kivymd/vendor/circularTimePicker/README.md b/src/kivymd/vendor/circularTimePicker/README.md similarity index 100% rename from kivymd/vendor/circularTimePicker/README.md rename to src/kivymd/vendor/circularTimePicker/README.md diff --git a/kivymd/vendor/circularTimePicker/__init__.py b/src/kivymd/vendor/circularTimePicker/__init__.py similarity index 100% rename from kivymd/vendor/circularTimePicker/__init__.py rename to src/kivymd/vendor/circularTimePicker/__init__.py diff --git a/src/main.kv b/src/main.kv new file mode 100644 index 0000000..9d5de29 --- /dev/null +++ b/src/main.kv @@ -0,0 +1,10 @@ +#:include forestmapview.kv + +BoxLayout: + orientation: 'vertical' + MDToolbar: + title: "Global Forest" + right_action_items: [['magnify', lambda x: app.search_menu.open()]] + md_bg_color: app.theme_cls.primary_color + ForestMapView: + id: forestmapview diff --git a/main.py b/src/main.py similarity index 89% rename from main.py rename to src/main.py index 394a16a..f8ac644 100644 --- a/main.py +++ b/src/main.py @@ -17,6 +17,7 @@ from kivy.graphics import Rectangle # Import local modules from forestmapview import ForestMapView +from searchpopupmenu import SearchPopupMenu from gpshelper import GpsHelper from settings import SampleBoxLayout from game import GameWidget @@ -57,15 +58,20 @@ class GlobalForest(MDApp): return GameWidget() class MainApp(MDApp): + connection = None + cursor = None + search_menu = None + def build(self): pass #Window.clearcolor = (0, 0, 0, 0) #return SampleBoxLayout() def on_start(self): + # Welcome print(motd) - connection = None - cursor = None + + self.theme_cls.primary_palette = 'BlueGray' # Initialize GPS GpsHelper().run() @@ -75,6 +81,7 @@ class MainApp(MDApp): self.cursor = self.connection.cursor() # Instantiate SearchPopupMenu + self.search_menu = SearchPopupMenu() if __name__ == '__main__': #screen_manager = ScreenManager() diff --git a/music.kv b/src/music.kv similarity index 100% rename from music.kv rename to src/music.kv diff --git a/music.py b/src/music.py similarity index 100% rename from music.py rename to src/music.py diff --git a/src/searchpopupmenu.py b/src/searchpopupmenu.py new file mode 100644 index 0000000..fa620ee --- /dev/null +++ b/src/searchpopupmenu.py @@ -0,0 +1,48 @@ +from kivymd.uix.dialog2 import MDInputDialog +from urllib import parse +from kivy.network.urlrequest import UrlRequest +from kivy.app import App +import certifi +from kivy.clock import Clock + +class SearchPopupMenu(MDInputDialog): + title = 'Search by Address' + text_button_ok = 'Search' + + def __init__(self): + super().__init__() + self.size_hint = [.9, .3] + self.events_callback = self.callback + + def open(self): + super().open() + Clock.schedule_once(self.set_field_focus, 0.5) + + def callback(self, *args): + address = self.text_field.text + self.geocode_get_lat_lon(address) + + def geocode_get_lat_lon(self, address): + with open('app_id.txt', 'r') as f: + app_id = f.read() + with open('app_code.txt', 'r') as f: + app_code = f.read() + address = parse.quote(address) + url = "https://geocoder.api.here.com/6.2/geocode.json?searchtext=%s&app_id=%s&app_code=%s"%(address, app_id, app_code) + UrlRequest(url, on_success=self.success, on_failure=self.failure, on_error=self.error, ca_file=certifi.where()) + + def success(self, urlrequest, result): + print("Success") + latitude = result['Response']['View'][0]['Result'][0]['Location']['NavigationPosition'][0]['Latitude'] + longitude = result['Response']['View'][0]['Result'][0]['Location']['NavigationPosition'][0]['Longitude'] + app = App.get_running_app() + mapview = app.root.ids.mapview + mapview.center_on(latitude, longitude) + + def error(self, urlrequest, result): + print("error") + print(result) + + def failure(self, urlrequest, result): + print("failure") + print(result) diff --git a/settings.kv b/src/settings.kv similarity index 100% rename from settings.kv rename to src/settings.kv diff --git a/settings.py b/src/settings.py similarity index 100% rename from settings.py rename to src/settings.py diff --git a/src/treemarker.kv b/src/treemarker.kv new file mode 100644 index 0000000..4e83494 --- /dev/null +++ b/src/treemarker.kv @@ -0,0 +1,2 @@ +: + source: 'assets/images/markers/fountain.png' diff --git a/treemarker.py b/src/treemarker.py similarity index 100% rename from treemarker.py rename to src/treemarker.py diff --git a/treepopupmenu.py b/src/treepopupmenu.py similarity index 100% rename from treepopupmenu.py rename to src/treepopupmenu.py diff --git a/start.sh b/start.sh new file mode 100755 index 0000000..5e9c2bb --- /dev/null +++ b/start.sh @@ -0,0 +1,6 @@ +#!/bin/bash + +# exec inside the venv +source venv/bin/activate + +python3 src/main.py