Merge pull request #37 from andrejusk/master

Stylise homescreen

home_default/main.py

@@ -8,7 +8,7 @@ newly activated or reset.
 ___name___         = "Homescreen (Default)"
 ___license___      = "MIT"
 ___categories___   = ["Homescreens"]
-___dependencies___ = ["homescreen"]
+___dependencies___ = ["homescreen", "shared/logo.png"]
 ___launchable___   = False
 ___bootstrapped___ = True
 
@@ -16,21 +16,64 @@ import ugfx
 from homescreen import *
 import time
 
+# Padding for name
+intro_height = 30
+intro_text = "Hi! I'm"
+name_height = 60
+status_height = 20
+info_height = 30
+logo_path = "shared/logo.png"
+logo_height = 150
+logo_width = 56
+
+# Maximum length of name before downscaling
+max_name = 8
+
+# Background stuff
 init()
-ugfx.clear()
+ugfx.clear(ugfx.html_color(0x800080))
 
-# title
-#ugfx.set_default_font(ugfx.FONT_MEDIUM_BOLD)
-ugfx.Label(0, 20, ugfx.width(), 40, "TiLDA Mk4") # , justification=ugfx.Label.CENTERTOP
+# Colour stuff
+style = ugfx.Style()
+style.set_enabled([ugfx.WHITE, ugfx.html_color(0x800080), ugfx.html_color(0x800080), ugfx.html_color(0x800080)])
+style.set_background(ugfx.html_color(0x800080))
+ugfx.set_default_style(style)
 
-#ugfx.set_default_font(ugfx.FONT_NAME)
-ugfx.Label(0, 60, ugfx.width(), 40, name("Set your name in the settings app")) # , justification=ugfx.Label.CENTERTOP
+# Logo stuff
+ugfx.display_image(
+    int((ugfx.width() - logo_width) / 2), 
+    int((ugfx.height() - logo_height) / 2), 
+    logo_path
+)
 
+
+
+# Draw for people to see
+ugfx.orientation(90)
+# Draw introduction
+ugfx.set_default_font(ugfx.FONT_TITLE)
+ugfx.Label(0, ugfx.height() - name_height - intro_height, ugfx.width(), intro_height, intro_text, justification=ugfx.Label.CENTER)
+# Process name
+name_setting = name("Set your name in the settings app")
+if len(name_setting) <= max_name:
+    ugfx.set_default_font(ugfx.FONT_NAME)
+else:
+    ugfx.set_default_font(ugfx.FONT_MEDIUM_BOLD)   
+# Draw name
+ugfx.Label(0, ugfx.height() - name_height, ugfx.width(), name_height, name_setting, justification=ugfx.Label.CENTER)
+
+
+
+# Draw for wearer to see
+ugfx.orientation(270)
+# Title
+ugfx.set_default_font(ugfx.FONT_TITLE)
+ugfx.Label(0, ugfx.height() - info_height * 2, ugfx.width(), info_height, "TiLDA Mk4", justification=ugfx.Label.CENTER) 
 # info
-ugfx.Label(0, 200, ugfx.width(), 40, "Press MENU") # , justification=ugfx.Label.CENTERTOP
+ugfx.Label(0, ugfx.height() - info_height, ugfx.width(), info_height, "Press MENU", justification=ugfx.Label.CENTER)
 
-#ugfx.set_default_font(ugfx.FONT_MEDIUM)
-status = ugfx.Label(0, 130, ugfx.width(), 40, "") # , justification=ugfx.Label.CENTERTOP
+ugfx.set_default_font(ugfx.FONT_SMALL)
+status = ugfx.Label(0, ugfx.height() - info_height * 2 - status_height, ugfx.width(), status_height, "", justification=ugfx.Label.CENTER)
 
 # update loop
 while True:
@@ -38,8 +81,8 @@ while True:
     value_wifi_strength = wifi_strength()
     value_battery = battery()
     if value_wifi_strength:
-        text += "wifi: %s%%\n" % int(value_wifi_strength)
+        text += "Wi-Fi: %s%%, " % int(value_wifi_strength)
     if value_battery:
-        text += "battery: %s%%\n" % int(value_battery)
+        text += "Battery: %s%%" % int(value_battery)
     status.text(text)
     sleep_or_exit(0.5)

lib/homescreen.py

@@ -17,9 +17,9 @@ They also *may*:
 """
 
 ___license___      = "MIT"
-___dependencies___ = ["database", "buttons", "random", "app", "sleep", "ugfx_helper", "wifi"]
+___dependencies___ = ["database", "buttons", "random", "app", "sleep", "ugfx_helper", "wifi", "sim800"]
 
-import database, ugfx, random, buttons, tilda, sleep, ugfx_helper, wifi, time
+import database, ugfx, random, buttons, tilda, sleep, ugfx_helper, wifi, time, sim800
 from app import App
 
 _state = None
@@ -64,6 +64,6 @@ def wifi_strength():
 
 # Charge in %, None if unavailable
 def battery():
-    return None # todo: fix me, we can get this from the sim800
+    return sim800.batterycharge() # todo: fix me, we can get this from the sim800