From 3de81cfe761e87d3cc81b7f4ead389a698236ec6 Mon Sep 17 00:00:00 2001
From: petrucci4prez <natedwarshuis@gmail.com>
Date: Wed, 19 Jul 2017 00:22:51 -0400
Subject: [PATCH] clean up default_patterns.lua

---
 core                        |  2 +-
 module/Memory.lua           |  2 +-
 module/Weather.lua          |  2 +-
 schema/default_patterns.lua | 97 ++++++++++++++++++-------------------
 4 files changed, 49 insertions(+), 54 deletions(-)

diff --git a/core b/core
index 466d194..4c481f8 160000
--- a/core
+++ b/core
@@ -1 +1 @@
-Subproject commit 466d19425481babffe1367f50cccb62593ce013d
+Subproject commit 4c481f811ab7107883dc9ada123652574a8575f6
diff --git a/module/Memory.lua b/module/Memory.lua
index efc2f8a..9d56a05 100644
--- a/module/Memory.lua
+++ b/module/Memory.lua
@@ -67,7 +67,7 @@ local cache_arc = Widget.Arc{
 	y 			= DIAL_Y,			
 	radius 		= DIAL_RADIUS,
 	thickness 	= _DIAL_THICKNESS_,
-	arc_pattern	= schema.purple_rounded
+	arc_pattern	= schema.PURPLE_ROUNDED
 }
 
 local total_used = Widget.CriticalText{
diff --git a/module/Weather.lua b/module/Weather.lua
index 7bfbc6c..26c1c95 100644
--- a/module/Weather.lua
+++ b/module/Weather.lua
@@ -99,7 +99,7 @@ local create_side_rows = function(side_rows_x, side_rows_y, side_rows_tbl)
 					x = side_rows_x + _G_INIT_DATA_.SECTION_WIDTH,
 					y = current_row_y + _SECTION_HEIGHT_ - 18
 				},
-				line_pattern = schema.mid_grey
+				line_pattern = schema.MID_GREY
 			}
 		end
 	end
diff --git a/schema/default_patterns.lua b/schema/default_patterns.lua
index 49e2cd3..64cbb73 100644
--- a/schema/default_patterns.lua
+++ b/schema/default_patterns.lua
@@ -1,73 +1,68 @@
-local c = {}
+local M = {}
 
 local Color = require 'Color'
 
-local white = 0xffffffff
+local WHITE = 0xffffffff
 	
-local grey1 = 0xeeeeeeff
-local grey2 = 0xbfbfbfff
-local grey3 = 0xd6d6d6ff
-local grey4 = 0x888888ff
-local grey5 = 0x565656ff
-local grey6 = 0x2f2f2fb2
-local black = 0x000000ff
+local GREY1 = 0xeeeeeeff
+local GREY2 = 0xbfbfbfff
+local GREY3 = 0xd6d6d6ff
+local GREY4 = 0x888888ff
+local GREY5 = 0x565656ff
+local GREY6 = 0x2f2f2fb2
+local BLACK = 0x000000ff
 
-local blue1 = 0x99CEFFff
-local blue2 = 0xBFE1FFff
-local blue3 = 0x316BA6ff
+local BLUE1 = 0x99CEFFff
+local BLUE2 = 0xBFE1FFff
+local BLUE3 = 0x316BA6ff
 
-local red1 = 0xFF3333ff
-local red2 = 0xFF8282ff
-local red3 = 0xFFB8B8ff
+local RED1 = 0xFF3333ff
+local RED2 = 0xFF8282ff
+local RED3 = 0xFFB8B8ff
 
-local purple1 = 0xeecfffff
-local purple2 = 0xcb91ffff
-local purple3 = 0x9523ffff
+local PURPLE1 = 0xeecfffff
+local PURPLE2 = 0xcb91ffff
+local PURPLE3 = 0x9523ffff
 
-c.white = Color.init{hex_rgba = white}
+M.WHITE = Color.init{hex_rgba = WHITE}
 
-c.light_grey = Color.init{hex_rgba = grey1}
-c.mid_grey = Color.init{hex_rgba = grey3}
-c.dark_grey = Color.init{hex_rgba = grey4}
+M.LIGHT_GREY = Color.init{hex_rgba = GREY1}
+M.MID_GREY = Color.init{hex_rgba = GREY3}
+M.DARK_GREY = Color.init{hex_rgba = GREY4}
 
-c.blue = Color.init{hex_rgba = blue2}
-c.red = Color.init{hex_rgba = red2}
-c.purple = Color.init{hex_rgba = purple2}
+M.blue = Color.init{hex_rgba = BLUE2}
+M.red = Color.init{hex_rgba = RED2}
+M.purple = Color.init{hex_rgba = PURPLE2}
 
-c.grey_rounded = Color.Gradient{
-	Color.ColorStop{hex_rgba = grey5, stop = 0.0},
-	Color.ColorStop{hex_rgba = grey2, stop = 0.5},
-	Color.ColorStop{hex_rgba = grey5, stop = 1.0}	
+M.GREY_ROUNDED = Color.Gradient{
+	Color.ColorStop{hex_rgba = GREY5, stop = 0.0},
+	Color.ColorStop{hex_rgba = GREY2, stop = 0.5},
+	Color.ColorStop{hex_rgba = GREY5, stop = 1.0}	
 }
 
-c.blue_rounded = Color.Gradient{
-	Color.ColorStop{hex_rgba = blue3, stop = 0.0},
-	Color.ColorStop{hex_rgba = blue1, stop = 0.5},
-	Color.ColorStop{hex_rgba = blue3, stop = 1.0}
+M.BLUE_ROUNDED = Color.Gradient{
+	Color.ColorStop{hex_rgba = BLUE3, stop = 0.0},
+	Color.ColorStop{hex_rgba = BLUE1, stop = 0.5},
+	Color.ColorStop{hex_rgba = BLUE3, stop = 1.0}
 }
 
-c.red_rounded = Color.Gradient{
-	Color.ColorStop{hex_rgba = red1, stop = 0.0},
-	Color.ColorStop{hex_rgba = red3, stop = 0.5},
-	Color.ColorStop{hex_rgba = red1, stop = 1.0}
+M.RED_ROUNDED = Color.Gradient{
+	Color.ColorStop{hex_rgba = RED1, stop = 0.0},
+	Color.ColorStop{hex_rgba = RED3, stop = 0.5},
+	Color.ColorStop{hex_rgba = RED1, stop = 1.0}
 }
 
-c.purple_rounded = Color.Gradient{
-	Color.ColorStop{hex_rgba = purple3, stop = 0.0},
-	Color.ColorStop{hex_rgba = purple1, stop = 0.5},
-	Color.ColorStop{hex_rgba = purple3, stop = 1.0}
+M.PURPLE_ROUNDED = Color.Gradient{
+	Color.ColorStop{hex_rgba = PURPLE3, stop = 0.0},
+	Color.ColorStop{hex_rgba = PURPLE1, stop = 0.5},
+	Color.ColorStop{hex_rgba = PURPLE3, stop = 1.0}
 }
 
---~ c.transparent_black = Color.Gradient{
-	--~ Color.ColorStop{hex_rgba = grey6, stop = 0.0, force_alpha = 0.7},
-	--~ Color.ColorStop{hex_rgba = black, stop = 1.0, force_alpha = 0.7}
---~ }
+M.TRANSPARENT_BLACK = Color.init{hex_rgba = BLACK, force_alpha = 0.7}
 
-c.transparent_black = Color.init{hex_rgba = black, force_alpha = 0.7}
-
-c.transparent_blue = Color.Gradient{
-	Color.ColorStop{hex_rgba = blue3, stop = 0.0, force_alpha = 0.2},
-	Color.ColorStop{hex_rgba = blue1, stop = 1.0, force_alpha = 1.0}
+M.TRANSPARENT_BLUE = Color.Gradient{
+	Color.ColorStop{hex_rgba = BLUE3, stop = 0.0, force_alpha = 0.2},
+	Color.ColorStop{hex_rgba = BLUE1, stop = 1.0, force_alpha = 1.0}
 }
 
-return c
+return M