Lots of style improvements
This commit is contained in:
@@ -1,26 +1,30 @@
|
||||
module Wince
|
||||
@[Gtk::UiTemplate(resource: "/wince/ui/compiled/templates.ui", children: %w(businessName businessRating businessHours businessWebsite))]
|
||||
@[Gtk::UiTemplate(resource: "/wince/ui/compiled/templates.ui", children: %w(businessName businessRating businessOpen businessDistance))]
|
||||
class BusinessRow < Gtk::ListBoxRow
|
||||
include Gtk::WidgetTemplate
|
||||
|
||||
@name : Gtk::Label
|
||||
@rating : Gtk::Label
|
||||
@hours : Gtk::Label
|
||||
@website : Gtk::LinkButton
|
||||
@open : Gtk::Label
|
||||
@distance : Gtk::Label
|
||||
|
||||
def initialize(name : String, rating : String, hours : String, website : String)
|
||||
def initialize(name : String, rating : Float32, open : Bool, distance : Float32)
|
||||
super()
|
||||
|
||||
@name = Gtk::Label.cast(template_child("businessName"))
|
||||
@rating = Gtk::Label.cast(template_child("businessRating"))
|
||||
@hours = Gtk::Label.cast(template_child("businessHours"))
|
||||
@website = Gtk::LinkButton.cast(template_child("businessWebsite"))
|
||||
@open = Gtk::Label.cast(template_child("businessOpen"))
|
||||
@distance = Gtk::Label.cast(template_child("businessDistance"))
|
||||
|
||||
@name.text = name
|
||||
@rating.text = rating
|
||||
@hours.text = hours
|
||||
@website.uri = website
|
||||
@website.label = "view on yelp"
|
||||
@rating.text = rating.round(2).to_s
|
||||
if open
|
||||
@open.markup = "<span foreground=\"green\">open</span>"
|
||||
else
|
||||
@open.markup = "<span foreground=\"red\">closed</span>"
|
||||
end
|
||||
distance_miles = distance / 1609.344
|
||||
@distance.text = distance_miles.round(2).to_s + "mi"
|
||||
end
|
||||
end
|
||||
end
|
||||
@@ -28,11 +28,11 @@ module Wince
|
||||
|
||||
businesses.map do |business|
|
||||
name = business["name"].as_s? || ""
|
||||
rating = business["rating"].as_f.to_s
|
||||
hours = business["is_closed"].as_bool.to_s
|
||||
website = business["url"].as_s? || ""
|
||||
rating = business["rating"].as_f32
|
||||
open = business["is_closed"].as_bool
|
||||
distance = business["distance"].as_f32
|
||||
|
||||
BusinessRow.new(name, rating, hours, website)
|
||||
BusinessRow.new(name, rating, open, distance)
|
||||
end
|
||||
end
|
||||
|
||||
@@ -44,10 +44,15 @@ module Wince
|
||||
search = SEARCH_ENTRY.buffer.text
|
||||
location = LOCATION_ENTRY.buffer.text
|
||||
|
||||
if !search || !location
|
||||
if search.blank? || location.blank?
|
||||
SCROLL_VIEW.visible = false
|
||||
POWERD_BY_TEXT.visible = true
|
||||
return
|
||||
end
|
||||
|
||||
SCROLL_VIEW.visible = true
|
||||
POWERD_BY_TEXT.visible = false
|
||||
|
||||
response = Yelp.search_businesses(search, location)
|
||||
|
||||
if response.status_code != 200
|
||||
|
||||
@@ -10,6 +10,8 @@ module Wince
|
||||
LOCATION_ENTRY = Gtk::Entry.cast(B_UI["locationEntry"])
|
||||
SEARCH_BUTTON = Gtk::Button.cast(B_UI["searchButton"])
|
||||
BUSINESS_LIST = Gtk::ListBox.cast(B_UI["searchResults"])
|
||||
POWERD_BY_TEXT = Gtk::Label.cast(B_UI["poweredByText"])
|
||||
SCROLL_VIEW = Gtk::ScrolledWindow.cast(B_UI["scrollWindow"])
|
||||
|
||||
APP = Adw::Application.new("dev.wince", Gio::ApplicationFlags::None)
|
||||
end
|
||||
|
||||
Reference in New Issue
Block a user