Skip to content

Commit 7bea80b

Browse files
authored
Merge pull request #127 from pythonindia/feedback
include feedback
2 parents a92290e + ba11328 commit 7bea80b

File tree

7 files changed

+83
-15
lines changed

7 files changed

+83
-15
lines changed

eventsapp/data/default-0.png

121 KB
Loading

eventsapp/data/default.atlas

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"default-0.png": {"logo": [2, 1825, 847, 221], "circle1": [851, 1831, 215, 215], "close": [1068, 1888, 158, 158], "tick": [1228, 1907, 141, 139], "feedback": [1371, 1918, 128, 128], "googleplus": [1501, 1918, 128, 128], "meetup": [1631, 1918, 128, 128], "reminder": [1761, 1918, 128, 128], "share": [1891, 1918, 128, 128], "youtube": [2, 1695, 128, 128], "but_light": [132, 1763, 249, 60], "but_overlay": [383, 1763, 249, 60], "facebook": [2, 1593, 100, 100], "github": [104, 1593, 100, 100], "linkedin": [206, 1593, 100, 100], "proposal": [308, 1593, 100, 100], "telegram": [410, 1593, 100, 100], "twitter": [512, 1593, 100, 100], "website": [614, 1593, 100, 100], "spinner": [1068, 1841, 157, 45], "ti_white": [1227, 1841, 157, 45], "hamburger": [132, 1697, 64, 64], "transparent": [2021, 2034, 12, 12]}}
1+
{"default-0.png": {"logo": [2, 1825, 847, 221], "ratingrankin": [851, 1882, 903, 164], "circle1": [2, 1608, 215, 215], "close": [1756, 1888, 158, 158], "tick": [219, 1684, 141, 139], "feedback": [1916, 1918, 128, 128], "googleplus": [362, 1695, 128, 128], "meetup": [492, 1695, 128, 128], "reminder": [622, 1695, 128, 128], "share": [752, 1695, 128, 128], "youtube": [882, 1695, 128, 128], "but_light": [1012, 1763, 249, 60], "but_overlay": [1263, 1763, 249, 60], "facebook": [2, 1506, 100, 100], "github": [104, 1506, 100, 100], "linkedin": [206, 1506, 100, 100], "proposal": [308, 1506, 100, 100], "telegram": [410, 1506, 100, 100], "twitter": [512, 1506, 100, 100], "website": [614, 1506, 100, 100], "spinner": [1514, 1778, 157, 45], "ti_white": [1673, 1778, 157, 45], "hamburger": [1012, 1697, 64, 64], "transparent": [1916, 1904, 12, 12]}}

eventsapp/myconfig.ini

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
[pycon2018]
2+
register_data_dir = /Users/quanon/Downloads/attendees_data
3+

eventsapp/uix/screens/navigationscreen.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ class NavigationScreen(Screen):
133133
keep_ratio: False
134134
on_parent:
135135
self.texture.wrap = 'repeat'
136-
self.texture.uvsize = 7, 22
136+
self.texture.uvsize = self.width/2., self.height/2
137137
#color: 225./255., 225./255., 225./255., 1
138138
Image
139139
mipmap: True
Lines changed: 67 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,79 @@
11
from kivy.uix.screenmanager import Screen
22
from kivy.lang import Builder
3-
from kivy.app import App
4-
import webbrowser
53

64

75
class ScreenFeedback(Screen):
86
Builder.load_string('''
97
<ScreenFeedback>
108
name: 'ScreenFeedback'
9+
talk: ''
10+
ScrollView
11+
id: main
12+
ScrollGrid
13+
padding: '9dp'
14+
spacing: '9dp'
15+
BackLabel
16+
text: "Feedback for " + root.talk
17+
backcolor: app.base_active_color[:3] + [.5]
18+
# size_hint_y: None
19+
# height: dp(100)
20+
BoxLayout
21+
size_hint_y: None
22+
height: dp(45)
23+
BackLabel
24+
text: 'Rating: {}'.format(sldr.value)
25+
size_hint_x: .5
26+
pos_hint: {'center_y': .5}
27+
Slider
28+
id: sldr
29+
canvas.after:
30+
Color:
31+
rgba: 1, 1, 1, .9
32+
Rectangle:
33+
size: self.size
34+
pos: self.value_pos[0], self.y
35+
cursor_image: 'atlas://data/default/transparent'
36+
background_horizontal: 'atlas://data/default/ratingrankin'
37+
border_horizontal: 0, 0, 0, 0
38+
min: 0
39+
max: 10
40+
TextInput:
41+
id: ti_description
42+
size_hint_y: None
43+
height: dp(220)
44+
hint_text: 'Enter detailed feedback here...'
45+
TextInput:
46+
id: ti_name
47+
size_hint_y: None
48+
height: dp(45)
49+
hint_text: 'Your Name here...'
50+
TextInput:
51+
id: ti_ticketid
52+
size_hint_y: None
53+
height: dp(45)
54+
hint_text: 'Your Ticket ID...'
55+
ActiveButton
56+
text: 'Submit'
57+
size_hint_y: None
58+
height: dp(45)
59+
on_released:
60+
rating = '{} out of {}'.format(sldr.value, sldr.max)
61+
title = 'Title: ' + root.talk
62+
detailed_description = "Description:" + ti_description.text
63+
name = "Name: " + ti_name.text
64+
ticketid = "Ticketid: " + ti_ticketid.text
65+
import webbrowser
66+
webbrowser.open(\
67+
"mailto:[email protected]?Subject=TalkFeedback&body" +\
68+
"={}".format("\\n\\n".join((rating, title, detailed_description\
69+
, name, ticketid))))
1170
''')
1271

1372
def on_pre_enter(self):
14-
webbrowser.open('https://feedback.in.pycon.org')
73+
self.manager.transition.direction = 'up'
1574

16-
def on_enter(self):
17-
pass
75+
def on_pre_leave(self):
76+
self.manager.transition.direction = 'down'
77+
78+
def on_leave(self):
79+
self.manager.transition.direction = 'left'

eventsapp/uix/screens/screentalks.py

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -86,13 +86,16 @@ class ScreenTalks(Screen):
8686
source: 'atlas://data/default/share'
8787
color: app.base_active_bright[:3] + [.9]
8888
on_release: do_share(self.data, "PyCon India 2018")
89-
ImBut
90-
data: ''
91-
source: 'atlas://data/default/reminder'
92-
color: app.base_active_bright[:3] + [.9]
89+
# ImBut
90+
# data: ''
91+
# source: 'atlas://data/default/reminder'
92+
# color: app.base_active_bright[:3] + [.9]
9393
ImBut
9494
source: 'atlas://data/default/feedback'
9595
color: app.base_active_bright[:3] + [.9]
96+
on_release:
97+
scr = load_screen("ScreenFeedback", manager=root.manager)
98+
scr.talk = talk_title.text
9699
''')
97100

98101
def on_pre_enter(self):
@@ -103,6 +106,7 @@ def on_enter(self, onsuccess=False):
103106
container = self.ids.container
104107

105108
if self.from_back:
109+
Factory.Animation(opacity=1, d=.3).start(container)
106110
return
107111

108112
if len(container.children) > 2:

eventsapp/uix/screens/screenvenue.py

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,11 @@
44

55
from kivy.uix.screenmanager import Screen
66
from kivy.lang import Builder
7-
from kivy.uix.image import Image
8-
from kivy.garden.mapview import MapView
9-
from kivy.garden.mapview import MapMarker
7+
from kivy.garden.mapview import MapView, MapMarker
8+
109

1110
class ScreenVenue(Screen):
12-
11+
1312
Builder.load_string('''
1413
<ScreenVenue>
1514
name: 'ScreenVenue'

0 commit comments

Comments
 (0)