Uses layoutmargin fork, fixes #88

AndreMiras · May 16, 2018 · 2cd2b9f · 2cd2b9f
1 parent f83faab
commit 2cd2b9f
Show file tree

Hide file tree

Showing 9 changed files with 6 additions and 197 deletions.
diff --git a/Makefile b/Makefile
@@ -29,7 +29,7 @@ endif
 clean:
 	rm -rf venv/ .tox/
 
-test: virtualenv
+test:
 	$(TOX)
 
 uitest: virtualenv

diff --git a/requirements.txt b/requirements.txt
@@ -23,3 +23,4 @@ rlp==0.6.0
 # compatible with libcrypto.so.1.1
 # https://github.com/golemfactory/golem-messages/pull/112/files
 https://github.com/mfranciszkiewicz/pyelliptic/archive/1.5.10.tar.gz#egg=pyelliptic
+https://github.com/AndreMiras/garden.layoutmargin/archive/20180517.zip#egg=layoutmargin
diff --git a/src/CHANGELOG.md b/src/CHANGELOG.md
@@ -4,6 +4,7 @@
 
   - Show account balance, refs #8
   - Configurable gas price, refs #23
+  - UI improvements, refs #34, #88
   - File split & refactoring, refs #43
   - Lazy screen loading, refs #47, #75
   - Updated contract deployment doc, refs #52

diff --git a/src/etheroll/layout_mixins/README.md b/src/etheroll/layout_mixins/README.md
diff --git a/src/etheroll/layout_mixins/__init__.py b/src/etheroll/layout_mixins/__init__.py
diff --git a/src/etheroll/layout_mixins/_add_background.py b/src/etheroll/layout_mixins/_add_background.py
diff --git a/src/etheroll/layout_mixins/_margin_layout.py b/src/etheroll/layout_mixins/_margin_layout.py
diff --git a/src/etheroll/roll.kv b/src/etheroll/roll.kv
@@ -69,7 +69,7 @@
             on_release: app.root.open_address_options()
         BoxLayoutAddMargin:
             orientation: "vertical"
-            margin: (30, 10, 30, 10)
+            margin: 30, 10, 30, 10
             MDLabel:
                 text: "Balance: {} ETH".format(root.balance_property)
                 text: "Balance: {0:.{1}f} ETH".format(root.balance_property, ROUND_DIGITS)

diff --git a/src/etheroll/roll.py b/src/etheroll/roll.py
@@ -3,9 +3,9 @@
 from kivy.properties import NumericProperty, StringProperty
 from kivy.uix.boxlayout import BoxLayout
 from kivy.uix.screenmanager import Screen
+from layoutmargin import AddMargin, MarginLayout
 
 import constants
-from etheroll.layout_mixins import Add_Margin, MarginLayout
 from etheroll.utils import load_kv_from_py, run_in_thread
 
 load_kv_from_py(__file__)
@@ -103,7 +103,7 @@ class BoxLayoutMarginLayout(MarginLayout, BoxLayout):
     pass
 
 
-class BoxLayoutAddMargin(Add_Margin, BoxLayout):
+class BoxLayoutAddMargin(AddMargin, BoxLayout):
     pass