Skip to content

Commit

Permalink
merge with main
Browse files Browse the repository at this point in the history
  • Loading branch information
LupaDevStudio committed Feb 13, 2024
2 parents 276462a + 3afce01 commit 85e422f
Show file tree
Hide file tree
Showing 88 changed files with 86,116 additions and 188,125 deletions.
4 changes: 3 additions & 1 deletion Todo.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,14 @@

## Design

- [ ] add the link to the lupadevstudio website
- [x] add the link to the lupadevstudio website

## Back

## Front

- [ ] Create the tree display layout

## Ideas

- [ ] add a hint system to indicate the number of words used by the best solution
Expand Down
2 changes: 1 addition & 1 deletion buildozer.spec
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ version.filename = tools/constants.py
# (list) Application requirements
# comma separated e.g. requirements = sqlite3,kivy
requirements = python3, kivy, androidstorage4kivy
requirements = python3, kivy, androidstorage4kivy, Pillow
# (str) Custom source folders for requirements
# Sets custom source for any requirements with recipes
Expand Down
78 changes: 69 additions & 9 deletions data.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,24 +18,84 @@
"settings": {
"music_volume": 0.0,
"sound_volume": 0.46621621621621623,
"current_theme_image": "japanese_1",
"current_theme_image": "beach_hammock",
"current_music": "kids_party",
"current_theme_colors": "japanese_1"
"current_theme_colors": "beach_hammock"
},
"unlocked_themes": {
"japanese_1": {
"japanese_etching": {
"image": true,
"colors": true
},
"lake": {
"retro_race": {
"image": true,
"colors": false
"colors": true
},
"westerlund_2": {
"image": true,
"colors": true
},
"desert_sunset": {
"image": true,
"colors": true
},
"beach_hammock": {
"image": true,
"colors": true
},
"flowered_garden": {
"image": true,
"colors": true
},
"beach_sunset": {
"image": true,
"colors": true
},
"diskopolys": {
"image": true,
"colors": true
},
"dream": {
"image": true,
"colors": true
},
"japanese_2": {
"image": false,
"galaxy_messier_96": {
"image": true,
"colors": true
},
"sunflower": {
"image": true,
"colors": true
},
"space_clocks": {
"image": true,
"colors": true
},
"snow_covered_chalet": {
"image": true,
"colors": true
},
"polar_fox": {
"image": true,
"colors": true
},
"mystic_mountain": {
"image": true,
"colors": true
},
"mushroom_planet": {
"image": true,
"colors": true
},
"magic_forest": {
"image": true,
"colors": true
},
"london_street": {
"image": true,
"colors": true
},
"japanese_3": {
"japanese_temple": {
"image": true,
"colors": true
}
Expand All @@ -47,7 +107,7 @@
"status": "Beginner",
"level": 1,
"experience": 0,
"coins": 1800
"coins": 877000
},
"ads": {
"1": true,
Expand Down
7 changes: 6 additions & 1 deletion licenses/Licenses.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,9 @@ The following list includes all the references of the assets used by this applic
- <a href="https://www.flaticon.com/free-icons/google-play-music" title="google play music icons">Google play music icons created by Pixel perfect - Flaticon</a>
- <a href="https://www.flaticon.com/free-icons/art" title="art icons">Art icons created by Freepik - Flaticon</a>
- <a href="https://www.flaticon.com/free-icons/backspace" title="backspace icons">Backspace icons created by Icon Smart - Flaticon</a>
- Music by <a href="https://pixabay.com/fr/users/arturaravidimusic-37133175/?utm_source=link-attribution&utm_medium=referral&utm_campaign=music&utm_content=160360">Artur Aravidi</a> from <a href="https://pixabay.com/music//?utm_source=link-attribution&utm_medium=referral&utm_campaign=music&utm_content=160360">Pixabay</a>
- <a href="https://www.flaticon.com/free-icons/quest" title="quest icons">Quest icons created by Vitaly Gorbachev - Flaticon</a>
- <a href="https://www.flaticon.com/free-icons/achievement" title="achievement icons">Achievement icons created by VectorPortal - Flaticon</a>
- Music by <a href="https://pixabay.com/fr/users/arturaravidimusic-37133175/?utm_source=link-attribution&utm_medium=referral&utm_campaign=music&utm_content=160360">Artur Aravidi</a> from <a href="https://pixabay.com/music//?utm_source=link-attribution&utm_medium=referral&utm_campaign=music&utm_content=160360">Pixabay</a>
- https://science.nasa.gov/image-detail/38426715186-1c2c403ca2-o/
- https://science.nasa.gov/image-detail/41428774775-243864f71e-o/
- https://science.nasa.gov/image-detail/42916480792-cd4b5fcfdf-o/
25 changes: 25 additions & 0 deletions main.kv
Original file line number Diff line number Diff line change
@@ -1,3 +1,28 @@
#:kivy 2.2.1
#############
### PATHS ###
#############

#:import PATH_IMAGES tools.path.PATH_IMAGES
#:import PATH_TITLE_FONT tools.path.PATH_TITLE_FONT
#:import PATH_TEXT_FONT tools.path.PATH_TEXT_FONT

############
### FONT ###
############

#:import TITLE_FONT_SIZE tools.constants.TITLE_FONT_SIZE
#:import MAIN_BUTTON_FONT_SIZE tools.constants.MAIN_BUTTON_FONT_SIZE
#:import TITLE_OUTLINE_WIDTH tools.constants.TITLE_OUTLINE_WIDTH
#:import TITLE_OUTLINE_COLOR tools.constants.TITLE_OUTLINE_COLOR
#:import TEXT_FONT_COLOR tools.constants.TEXT_FONT_COLOR

################
### POSITION ###
################

#:import BOTTOM_BAR_HEIGHT tools.constants.BOTTOM_BAR_HEIGHT
#:import POS_HINT_BACK_ARROW tools.constants.POS_HINT_BACK_ARROW
#:import POS_HINT_RIGHT_TOP_BUTTON tools.constants.POS_HINT_RIGHT_TOP_BUTTON

WindowManager:
17 changes: 15 additions & 2 deletions main.py
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ class WindowManager(ScreenManager):
def __init__(self, **kwargs):
super().__init__(**kwargs)
self.transition = NoTransition()
self.list_former_screens = []
self.list_previous_screens = []
current_screen = Screen(name="temp")
self.add_widget(current_screen)
self.current = "temp"
Expand All @@ -64,6 +64,18 @@ def change_all_background_images(self, new_image_path):
screen = self.get_screen(screen_name)
screen.set_back_image_path(new_image_path)

def go_to_previous_screen(self):
if len(self.list_previous_screens) != 0:
previous_screen = self.list_previous_screens.pop()
screen_name = previous_screen[0]
self.get_screen(screen_name).reload_kwargs(previous_screen[1])
self.current = screen_name

def go_to_next_screen(self, next_screen_name, current_dict_kwargs={}, next_dict_kwargs={}):
current_screen_name = self.current
self.list_previous_screens.append((current_screen_name, current_dict_kwargs))
self.get_screen(next_screen_name).reload_kwargs(next_dict_kwargs)
self.current = next_screen_name

class MainApp(App, Widget):
"""
Expand Down Expand Up @@ -127,5 +139,6 @@ def on_start(self):

# Run the application
if __name__ == "__main__":
Window.size = (480, 854)
if not MOBILE_MODE:
Window.size = (480, 854)
MainApp().run()
3 changes: 3 additions & 0 deletions prompts.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# Prompts

badge design for a novice, realistic, metal intricated, highly detailed, render, no background
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -34,5 +34,5 @@ reports = "y"
# [tool.pytest.ini_options]
# addopts = "--ignore=.buildozer --cov-report html:reports/coverage --cov-report xml --cov"

# To generate html report with pytlint : python -m pylint . | pylint_report > reports/linting/report.html
# To generate html report with pytlint : python -m pylint . | pylint_report > report.html
# To generate html reports with pytest : pytest . --ignore=.buildozer --cov-report html:reports/coverage --cov-report xml --cov
3 changes: 2 additions & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
kivy==2.2.1
kivy==2.2.1
Pillow==10.2.0
2 changes: 2 additions & 0 deletions requirements_dev.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
pylint
pylint-report
Loading

0 comments on commit 85e422f

Please sign in to comment.