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

dark and bright themes

Browse Source
This commit is contained in:
rgarcia-herrera 2020-09-03 14:08:34 -05:00
parent 0293057d8f
commit c96e6a7ef9
2 changed files with 41 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
flockompass.kv
View File

@ -144,24 +144,24 @@
cols: 2 cols: 2
BackgroundLabel: BackgroundLabel:
text: "Dark theme" text: "Dark theme"
background_color: rgba("#f3e8d2") background_color: rgba(app.theme['bgcolor'])
color: rgba("#346645") color: rgba(app.theme['fgcolor'])
font_size: '14sp' font_size: '14sp'
BgSwitch: BgSwitch:
id: dark_theme id: dark_theme
active: True active: True
background_color: rgba("#f3e8d2") background_color: rgba(app.theme['bgcolor'])
color: rgba("#346645") color: rgba(app.theme['fgcolor'])
on_active: app.set_dark_theme(self.active) on_active: app.set_dark_theme(self.active)
BackgroundLabel: BackgroundLabel:
text: "Compas smoothing" text: "Compas smoothing"
background_color: rgba("#f3e8d2") background_color: rgba(app.theme['bgcolor'])
color: rgba("#346645") color: rgba("#346645")
font_size: '14sp' font_size: '14sp'
BgSlider: BgSlider:
id: slider_smoothing id: slider_smoothing
background_color: rgba("#f3e8d2") background_color: rgba(app.theme['bgcolor'])
color: rgba("#346645") color: rgba(app.theme['fgcolor'])
min: 0.05 min: 0.05
max: 0.99 max: 0.99
step: 0.05 step: 0.05
@ -171,13 +171,13 @@
BackgroundLabel: BackgroundLabel:
text: "Compas update frequency" text: "Compas update frequency"
background_color: rgba("#f3e8d2") background_color: rgba(app.theme['bgcolor'])
color: rgba("#346645") color: rgba(app.theme['fgcolor'])
font_size: '14sp' font_size: '14sp'
BgSlider: BgSlider:
id: slider_compass_update id: slider_compass_update
background_color: rgba("#f3e8d2") background_color: rgba(app.theme['bgcolor'])
color: rgba("#346645") color: rgba(app.theme['fgcolor'])
min: 0.1 min: 0.1
max: 0.9 max: 0.9
step: 0.05 step: 0.05
@ -187,13 +187,13 @@
BackgroundLabel: BackgroundLabel:
text: "Update frequency" text: "Update frequency"
background_color: rgba("#f3e8d2") background_color: rgba(app.theme['bgcolor'])
color: rgba("#346645") color: rgba(app.theme['fgcolor'])
font_size: '14sp' font_size: '14sp'
BgSlider: BgSlider:
id: slider_update_freq id: slider_update_freq
background_color: rgba("#f3e8d2") background_color: rgba(app.theme['bgcolor'])
color: rgba("#346645") color: rgba(app.theme['fgcolor'])
min: 0 min: 0
max: 1 max: 1
step: 0.1 step: 0.1
@ -201,13 +201,13 @@
value: 0.5 value: 0.5
BackgroundLabel: BackgroundLabel:
text: "Local altruism" text: "Local altruism"
background_color: rgba("#f3e8d2") background_color: rgba(app.theme['bgcolor'])
color: rgba("#346645") color: rgba(app.theme['fgcolor'])
font_size: '14sp' font_size: '14sp'
BgSlider: BgSlider:
id: slider_local_altruism id: slider_local_altruism
background_color: rgba("#f3e8d2") background_color: rgba(app.theme['bgcolor'])
color: rgba("#346645") color: rgba(app.theme['fgcolor'])
min: 0 min: 0
max: 1 max: 1
step: 0.1 step: 0.1
@ -215,13 +215,13 @@
value: 0.1 value: 0.1
BackgroundLabel: BackgroundLabel:
text: "Destination altruism" text: "Destination altruism"
background_color: rgba("#f3e8d2") background_color: rgba(app.theme['bgcolor'])
color: rgba("#346645") color: rgba(app.theme['fgcolor'])
font_size: '14sp' font_size: '14sp'
BgSlider: BgSlider:
id: slider_dest_altruism id: slider_dest_altruism
background_color: rgba("#f3e8d2") background_color: rgba(app.theme['bgcolor'])
color: rgba("#346645") color: rgba(app.theme['fgcolor'])
min: 0 min: 0
max: 1 max: 1
step: 0.2 step: 0.2

22
main.py
View File

@ -79,13 +79,20 @@ class FlockompassApp(App):
settings = pickle.load(f) settings = pickle.load(f)
else: else:
settings = {'settings_smoothing': 0.88, settings = {'settings_smoothing': 0.88,
'settings_compass_update': 0.777 'settings_compass_update': 0.777,
'settings_theme': "dark"
} }
with open(pickle_path, 'wb') as f: with open(pickle_path, 'wb') as f:
pickle.dump(settings, f) pickle.dump(settings, f)
self.session_data.update(settings) self.session_data.update(settings)
if self.session_data['settings_theme'] == "dark":
self.set_dark_theme(True)
else:
self.set_dark_theme(False)
def save_settings(self): def save_settings(self):
app_folder = os.path.dirname(os.path.abspath(__file__)) app_folder = os.path.dirname(os.path.abspath(__file__))
pickle_path = path.join(app_folder, 'settings.pickle') pickle_path = path.join(app_folder, 'settings.pickle')
@ -114,16 +121,23 @@ 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): def set_dark_theme(self, active):
if active: if active:
self.theme = {'needle': "assets/needle_dark.png", self.theme = {'needle': "assets/needle_dark.png",
'to_map': "assets/to_map_dark.png", 'to_map': "assets/to_map_dark.png",
'bgcolor': "#336645"} 'bgcolor': "#336645",
'fgcolor': "#f3e8d2"
}
self.session_data['settings_theme'] = 'dark'
else: else:
self.theme = {'needle': "assets/needle_bright.png", self.theme = {'needle': "assets/needle_bright.png",
'to_map': "assets/to_map_bright.png", 'to_map': "assets/to_map_bright.png",
'bgcolor': "#f3e8d2"} 'bgcolor': "#f3e8d2",
'fgcolor': "#346645"
}
self.session_data['settings_theme'] = 'bright'
self.save_settings()
def request_android_permissions(self): def request_android_permissions(self):
from android.permissions import request_permissions, Permission from android.permissions import request_permissions, Permission