diff --git a/dark_to_compass_icon.png b/dark_to_compass_icon.png new file mode 100644 index 0000000..d536982 Binary files /dev/null and b/dark_to_compass_icon.png differ diff --git a/dark_to_compass_icon.svg b/dark_to_compass_icon.svg new file mode 100644 index 0000000..fccacfb --- /dev/null +++ b/dark_to_compass_icon.svg @@ -0,0 +1,218 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/flockompass.kv b/flockompass.kv index ac24f1e..d95104a 100644 --- a/flockompass.kv +++ b/flockompass.kv @@ -39,16 +39,21 @@ font_size: '20sp' hint_text: 'buscar destino' multiline: False - Button: - pos_hint: {"x":0.35, "top":0.9} - size_hint: 0.6, 0.07 - text: 'go to current loc' + IconButton: + pos_hint: {"x":.8, "top":0.95} + size_hint: 0.2, 0.2 + source: 'dark_to_compass_icon.png' + on_press: root.manager.current = 'compass'; app.set_destination() + IconButton: + source: 'to_self.png' + pos_hint: {"x":0.4, "bottom":0.1} + size_hint: 0.2, 0.2 on_press: app.center_map_on_gps() - Button: - pos_hint: {"x":.35, "top":0.83} - size_hint: 0.6, 0.07 - text: 'we ride together' - on_press: root.manager.current = 'compass'; app.set_destination() + IconButton: + pos_hint: {"x":0.8, "bottom":0.1} + size_hint: 0.2, 0.2 + source: 'to_settings.png' + on_press: root.manager.current = 'settings'; diff --git a/main.py b/main.py index cf079f0..d6e33bd 100644 --- a/main.py +++ b/main.py @@ -5,9 +5,9 @@ from kivy.properties import DictProperty, NumericProperty, StringProperty from kivy.clock import mainthread from kivy.utils import platform from kivy_garden.mapview import MapView - from kivy.uix.screenmanager import ScreenManager, Screen, RiseInTransition - +from kivy.uix.behaviors import ButtonBehavior +from kivy.uix.image import Image from kivy.vector import Vector from kivy.animation import Animation from math import atan2, sin, cos, degrees, floor @@ -15,6 +15,10 @@ from math import atan2, sin, cos, degrees, floor from geopy.distance import geodesic +class IconButton(ButtonBehavior, Image): + pass + + class MapScreen(Screen): pass diff --git a/marker.png b/marker.png index 2824540..6318d25 100644 Binary files a/marker.png and b/marker.png differ diff --git a/marker_dest.svg b/marker_dest.svg new file mode 100644 index 0000000..05f4784 --- /dev/null +++ b/marker_dest.svg @@ -0,0 +1,67 @@ + + + + + + image/svg+xml + + + + + + + + + + + + diff --git a/marker_self.png b/marker_self.png index 0652a0f..c6b51a1 100644 Binary files a/marker_self.png and b/marker_self.png differ diff --git a/marker_self.svg b/marker_self.svg index 3667d01..7bac541 100644 --- a/marker_self.svg +++ b/marker_self.svg @@ -20,8 +20,8 @@ sodipodi:docname="marker_self.svg" inkscape:version="0.92.3 (2405546, 2018-03-11)" inkscape:export-filename="/home/rgarcia/flockompass/marker_self.png" - inkscape:export-xdpi="96" - inkscape:export-ydpi="96">image/svg+xml - @@ -65,7 +60,12 @@ id="path1579" inkscape:connector-curvature="0" style="fill:#629860;fill-opacity:1" /> - + @@ -129,7 +129,7 @@ \ No newline at end of file diff --git a/to_map.svg b/to_map.svg new file mode 100644 index 0000000..5939f02 --- /dev/null +++ b/to_map.svg @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/to_self.png b/to_self.png new file mode 100644 index 0000000..49357bb Binary files /dev/null and b/to_self.png differ diff --git a/to_self.svg b/to_self.svg new file mode 100644 index 0000000..dc697bc --- /dev/null +++ b/to_self.svg @@ -0,0 +1,113 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + diff --git a/to_settings.png b/to_settings.png new file mode 100644 index 0000000..86299cd Binary files /dev/null and b/to_settings.png differ diff --git a/to_settings.svg b/to_settings.svg new file mode 100644 index 0000000..bda4f90 --- /dev/null +++ b/to_settings.svg @@ -0,0 +1,75 @@ + + + + +to turnAn icon for "turn" from the Lines and Angles series on to [icon]. Downloaded from http://www.toicon.com/icons/lines-and-angles_turn by 127.0.0.1 on 2017-07-10. Licensed CC-BY, see http://toicon.com/license/ for details. + +image/svg+xmlShannon E Thomashttp://www.toicon.com/icons/lines-and-angles_turnimage/svg+xmlto turn \ No newline at end of file