few path fixes

uralys · Sep 15, 2017 · 3469a81 · 3469a81
1 parent fa2cc40
commit 3469a81
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 17 deletions.
diff --git a/cherry/components/chapters.lua b/cherry/components/chapters.lua
@@ -5,7 +5,7 @@ local analytics = require 'cherry.libs.analytics'
 local animation = require 'cherry.libs.animation'
 local Text      = require 'cherry.libs.text'
 local gesture   = require 'cherry.libs.gesture'
-local Screen    = require 'cherry.components.Screen'
+local Screen    = require 'cherry.components.screen'
 local Scroller  = require 'cherry.components.scroller'
 local Panel     = require 'cherry.components.panel'
 local GUI       = require 'cherry.components.gui'
@@ -245,7 +245,7 @@ function Chapters:drawClosedChapter(options, panel, parent)
         y        = y1,
         width    = panel.width * 0.4,
         height   = panel.height * 0.15,
-        item     = 'mini-phantom',
+        path     = 'assets/images/gui/items/mini-phantom.icon.png',
         step     = options.percentLevels,
         disabled = true
     })
@@ -256,7 +256,7 @@ function Chapters:drawClosedChapter(options, panel, parent)
         y        = y2,
         width    = panel.width * 0.4,
         height   = panel.height * 0.15,
-        item     = 'gem',
+        path     = 'cherry/assets/images/gui/items/gem.icon.png',
         step     = options.percentGems,
         disabled = true
     })

diff --git a/cherry/components/icon.lua b/cherry/components/icon.lua
@@ -5,7 +5,6 @@ local Icon = {}
 --------------------------------------------------------------------------------
 
 function Icon:draw(options)
-print(options.path)
     local icon = display.newImage(
         options.parent,
         options.path

diff --git a/cherry/components/profile.lua b/cherry/components/profile.lua
@@ -1,7 +1,6 @@
 --------------------------------------------------------------------------------
 
 local _           = require 'cherry.libs.underscore'
-local file        = require 'cherry.libs.file'
 local ProgressBar = require 'cherry.components.progress-bar'
 
 --------------------------------------------------------------------------------
@@ -20,18 +19,9 @@ end
 --------------------------------------------------------------------------------
 
 function Profile:status(options)
-    local path = nil
-    if(options.item) then
-        path = 'assets/images/gui/items/'.. options.item ..'.icon.png'
-
-        if(not file.exists(path)) then
-            path = 'cherry/assets/images/gui/items/'.. options.item ..'.icon.png'
-        end
-    end
-
     local progress = ProgressBar:new()
     progress:draw(_.extend({
-        path = path
+        path = options.path or 'cherry/assets/images/gui/items/gem.icon.png'
     }, options))
 
     progress:set(0)

diff --git a/cherry/libs/file.lua b/cherry/libs/file.lua
@@ -25,7 +25,7 @@ end
 
 function file.exists(filename)
     local path = system.pathForFile( filename, system.ResourceDirectory)
-    return path
+    return path ~= nil
 end
 
 --------------------------------------------------------

diff --git a/cherry/main.lua b/cherry/main.lua
@@ -1,5 +1,5 @@
 --------------------------------------------------------------------------------
-_G.CHERRY_VERSION = '2.6.0'
+_G.CHERRY_VERSION = '2.6.1'
 --------------------------------------------------------------------------------
 -- corona
 _G.composer = _G.composer or require 'composer'