From fd8e55e92b37f74186c40e44dba40b94288ac450 Mon Sep 17 00:00:00 2001
From: Ale32bit <ale.proto00@gmail.com>
Date: Mon, 21 Sep 2015 21:34:35 +0200
Subject: [PATCH] Update settings.lua

---
 src/apps/system/settings.lua | 87 ++++++++++++++----------------------
 1 file changed, 33 insertions(+), 54 deletions(-)

diff --git a/src/apps/system/settings.lua b/src/apps/system/settings.lua
index 617ade8..4b42168 100644
--- a/src/apps/system/settings.lua
+++ b/src/apps/system/settings.lua
@@ -1,3 +1,6 @@
+local pwChange
+local pwChangeRep
+
 local menu = {
 	"Update",
 	"Change PIN",
@@ -13,7 +16,7 @@ end
 local function header()
 	clear()
 	local w, h = term.getSize()
-	paintutils.drawLine(1,1,w,1, colors.gray)
+	paintutils.drawLine(1,1,w,1, colors.blue)
 	term.setTextColor(colors.white)
 	term.setCursorPos(1,1)
 	write(" "..sPhone.user)
@@ -28,7 +31,7 @@ local function changePassword()
 	term.setCursorPos(1,1)
 	paintutils.drawImage(paintutils.loadImage("/.sPhone/interfaces/login"),1,1)
 	term.setTextColor(colors.white)
-	term.setBackgroundColor(colors.gray)
+	term.setBackgroundColor(colors.blue)
 	term.setCursorPos(1,1)
 	write(" "..sPhone.user)
 	if sPhone.wrongPassword then
@@ -39,22 +42,14 @@ local function changePassword()
 	term.setTextColor(colors.black)
 	term.setBackgroundColor(colors.white)
 	sertextext.center(7,"  Current Password")
-	term.setTextColor(colors.black)
-	term.setCursorBlink(true)
-	term.setCursorPos(9,10)
-	local _, k1 = os.pullEvent("char")
-	write("*")
-	term.setCursorPos(12,10)
-	local _, k2 = os.pullEvent("char")
-	write("*")
-	term.setCursorPos(15,10)
-	local _, k3 = os.pullEvent("char")
-	write("*")
-	term.setCursorPos(18,10)
-	local _, k4 = os.pullEvent("char")
-	write("*")
-	term.setCursorBlink(false)
-	local password = k1..k2..k3..k4
+	local loginTerm = window.create(term.native(), 8,10,12,1, true)
+  term.redirect(loginTerm)
+  term.setBackgroundColor(colors.white)
+  term.clear()
+  term.setCursorPos(1,1)
+  term.setTextColor(colors.black)
+	local password = read("*")
+  term.redirect(sPhone.mainTerm)
 	local fpw = fs.open("/.sPhone/.password","r")
 	if sha256.sha256(password) ~= fpw.readLine() then
 		sPhone.wrongPassword = true
@@ -71,7 +66,7 @@ local function changePassword()
 	term.setCursorPos(1,1)
 	paintutils.drawImage(paintutils.loadImage("/.sPhone/interfaces/login"),1,1)
 	term.setTextColor(colors.white)
-	term.setBackgroundColor(colors.gray)
+	term.setBackgroundColor(colors.blue)
 	term.setCursorPos(1,1)
 	write(" "..sPhone.user)
 	if sPhone.wrongPassword then
@@ -82,49 +77,33 @@ local function changePassword()
 	term.setTextColor(colors.black)
 	term.setBackgroundColor(colors.white)
 	sertextext.center(7,"  New Password")
-	term.setTextColor(colors.black)
-	term.setCursorBlink(true)
-	term.setCursorPos(9,10)
-	local _, k1 = os.pullEvent("char")
-	write("*")
-	term.setCursorPos(12,10)
-	local _, k2 = os.pullEvent("char")
-	write("*")
-	term.setCursorPos(15,10)
-	local _, k3 = os.pullEvent("char")
-	write("*")
-	term.setCursorPos(18,10)
-	local _, k4 = os.pullEvent("char")
-	write("*")
-	term.setCursorBlink(false)
-	local pwChange = k1..k2..k3..k4
+	local loginTerm = window.create(term.native(), 8,10,12,1, true)
+  term.redirect(loginTerm)
+  term.setBackgroundColor(colors.white)
+  term.clear()
+  term.setCursorPos(1,1)
+  term.setTextColor(colors.black)
+	pwChange = read("*")
+  term.redirect(sPhone.mainTerm)
 
 	term.clear()
 	term.setCursorPos(1,1)
 	paintutils.drawImage(paintutils.loadImage("/.sPhone/interfaces/login"),1,1)
 	term.setTextColor(colors.white)
-	term.setBackgroundColor(colors.gray)
+	term.setBackgroundColor(colors.blue)
 	term.setCursorPos(1,1)
 	write(" "..sPhone.user)
 	term.setTextColor(colors.black)
 	term.setBackgroundColor(colors.white)
 	sertextext.center(7,"  Repeat Password")
-	term.setTextColor(colors.black)
-	term.setCursorBlink(true)
-	term.setCursorPos(9,10)
-	local _, r1 = os.pullEvent("char")
-	write("*")
-	term.setCursorPos(12,10)
-	local _, r2 = os.pullEvent("char")
-	write("*")
-	term.setCursorPos(15,10)
-	local _, r3 = os.pullEvent("char")
-	write("*")
-	term.setCursorPos(18,10)
-	local _, r4 = os.pullEvent("char")
-	write("*")
-	term.setCursorBlink(false)
-	pwChangeRep = r1..r2..r3..r4
+	local loginTerm = window.create(term.native(), 8,10,12,1, true)
+  term.redirect(loginTerm)
+  term.setBackgroundColor(colors.white)
+  term.clear()
+  term.setCursorPos(1,1)
+  term.setTextColor(colors.black)
+	pwChangeRep = read("*")
+  term.redirect(sPhone.mainTerm)
 	if sha256.sha256(pwChange) ~= sha256.sha256(pwChangeRep) then
 		sPhone.wrongPassword = true
 		
@@ -150,7 +129,7 @@ local w, h = term.getSize()
 local function redraw()
 	clear()
 	local w, h = term.getSize()
-			paintutils.drawLine(1,1,w,1, colors.gray)
+			paintutils.drawLine(1,1,w,1, colors.blue)
 			term.setTextColor(colors.white)
 			term.setCursorPos(2,1)
 			write(sPhone.user)
@@ -164,7 +143,7 @@ local function redraw()
 		
 		while true do
 			redraw()
-			local name, id = ui.menu(menu, "Settings",true)
+			local name, id = sPhone.menu(menu, "Settings",true)
 			if id == 0 then
 				return
 			elseif id == 1 then