Social-Cycling/flockompass
Social-Cycling/flockompass
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

switch dark and bright themes, stub

Browse Source
This commit is contained in:
rgarcia-herrera 2020-09-03 13:38:41 -05:00
parent 29987d126b
commit 0293057d8f
2 changed files with 30 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
flockompass.kv
View File

@ -44,13 +44,11 @@
centermark.lon = mapview.lon centermark.lon = mapview.lon
selfmark.lat = app.gps_data.get('lat', 0) selfmark.lat = app.gps_data.get('lat', 0)
selfmark.lon = app.gps_data.get('lon', 0) selfmark.lon = app.gps_data.get('lon', 0)
MapMarker: MapMarker:
source: 'assets/marker_self.png' source: 'assets/marker_self.png'
id: selfmark id: selfmark
anchor_x: 0.5 anchor_x: 0.5
anchor_y: 0 anchor_y: 0
MapMarker: MapMarker:
source: 'assets/marker_dest.png' source: 'assets/marker_dest.png'
id: centermark id: centermark
@ -88,11 +86,12 @@
FloatLayout: FloatLayout:
canvas: canvas:
Color: Color:
rgba: rgba("#336645") rgba: rgba(app.theme['bgcolor'])
Rectangle: Rectangle:
size: self.size size: self.size
Image: Image:
source: 'assets/needle_dark.png' id: needle
source: app.theme['needle']
pos_hint: {"center_x": 0.5, "center_y": 0.7} pos_hint: {"center_x": 0.5, "center_y": 0.7}
canvas.before: canvas.before:
PushMatrix PushMatrix
@ -119,7 +118,7 @@
pos_hint: {"center_x": 0.5, "center_y": 0.7} pos_hint: {"center_x": 0.5, "center_y": 0.7}
size_hint: 1, 1 size_hint: 1, 1
IconButton: IconButton:
source: 'assets/to_map_dark.png' source: app.theme['to_map']
pos_hint: {"center_x": 0.1, "center_y": 0.95} pos_hint: {"center_x": 0.1, "center_y": 0.95}
size_hint: 0.2, 0.2 size_hint: 0.2, 0.2
on_press: root.manager.current = 'map'; on_press: root.manager.current = 'map';
@ -153,6 +152,7 @@
active: True active: True
background_color: rgba("#f3e8d2") background_color: rgba("#f3e8d2")
color: rgba("#346645") color: rgba("#346645")
on_active: app.set_dark_theme(self.active)
BackgroundLabel: BackgroundLabel:
text: "Compas smoothing" text: "Compas smoothing"
background_color: rgba("#f3e8d2") background_color: rgba("#f3e8d2")

31
main.py
View File

@ -62,6 +62,11 @@ class FlockompassApp(App):
dashboard_dest = StringProperty("") dashboard_dest = StringProperty("")
dashboard_flock = StringProperty("") dashboard_flock = StringProperty("")
theme = DictProperty(
{'needle': "assets/needle_dark.png",
'to_map': "assets/to_map_dark.png",
'bgcolor': "#336645"})
def dump(self, dt): def dump(self, dt):
print(dt, self.gps_data, self.session_data) print(dt, self.gps_data, self.session_data)
@ -109,6 +114,17 @@ class FlockompassApp(App):
self.ms.ids.mapview.center_on(self.session_data['dest_lat'], self.ms.ids.mapview.center_on(self.session_data['dest_lat'],
self.session_data['dest_lon']) self.session_data['dest_lon'])
def set_dark_theme(self, active):
if active:
self.theme = {'needle': "assets/needle_dark.png",
'to_map': "assets/to_map_dark.png",
'bgcolor': "#336645"}
else:
self.theme = {'needle': "assets/needle_bright.png",
'to_map': "assets/to_map_bright.png",
'bgcolor': "#f3e8d2"}
def request_android_permissions(self): def request_android_permissions(self):
from android.permissions import request_permissions, Permission from android.permissions import request_permissions, Permission
@ -247,22 +263,25 @@ class FlockompassApp(App):
# setup app screens # setup app screens
screen_manager = ScreenManager(transition=RiseInTransition()) screen_manager = ScreenManager(transition=RiseInTransition())
# map screen
self.ms = MapScreen(name='map') self.ms = MapScreen(name='map')
screen_manager.add_widget(self.ms) screen_manager.add_widget(self.ms)
self.cs = CompassScreen(name='compass') # settings screen
self.cs._anim = None
self.cs._anim1 = None
screen_manager.add_widget(self.cs)
self.ss = SettingsScreen(name='settings') self.ss = SettingsScreen(name='settings')
screen_manager.add_widget(self.ss) screen_manager.add_widget(self.ss)
# compass screen
# smoothing vars for compass # smoothing vars for compass
self.last_angle = 0 self.last_angle = 0
self.cs = CompassScreen(name='compass')
self.cs._anim = None
self.cs._anim1 = None
screen_manager.add_widget(self.cs)
#Clock.schedule_interval(self.dump, 2.0) #Clock.schedule_interval(self.dump, 2.0)
return screen_manager return screen_manager