Merge pull request #112 from pythonindia/feedback

include icons for feedback and reminder

Author: akshayaurora

eventsapp/data/default-0.png

@@ -1 +1 @@
-{"default-0.png": {"logo": [2, 1825, 847, 221], "circle1": [851, 1831, 215, 215], "googleplus": [1068, 1918, 128, 128], "meetup": [1198, 1918, 128, 128], "youtube": [1328, 1918, 128, 128], "but_light": [1458, 1986, 249, 60], "but_overlay": [1709, 1986, 249, 60], "facebook": [2, 1723, 100, 100], "github": [104, 1723, 100, 100], "linkedin": [206, 1723, 100, 100], "proposal": [308, 1723, 100, 100], "telegram": [410, 1723, 100, 100], "twitter": [512, 1723, 100, 100], "website": [614, 1723, 100, 100], "hamburger": [1458, 1920, 64, 64], "transparent": [1960, 2034, 12, 12]}}
+{"default-0.png": {"logo": [2, 1825, 847, 221], "circle1": [851, 1831, 215, 215], "feedback": [1068, 1918, 128, 128], "googleplus": [1198, 1918, 128, 128], "meetup": [1328, 1918, 128, 128], "reminder": [1458, 1918, 128, 128], "share": [1588, 1918, 128, 128], "youtube": [1718, 1918, 128, 128], "but_light": [1068, 1856, 249, 60], "but_overlay": [1319, 1856, 249, 60], "facebook": [1848, 1946, 100, 100], "github": [2, 1723, 100, 100], "linkedin": [104, 1723, 100, 100], "proposal": [206, 1723, 100, 100], "telegram": [308, 1723, 100, 100], "twitter": [410, 1723, 100, 100], "website": [512, 1723, 100, 100], "hamburger": [1950, 1982, 64, 64], "transparent": [2016, 2034, 12, 12]}}

eventsapp/data/default.atlas

@@ -83,7 +83,7 @@
           "track": "all"
         },
         {
-          "talk_id": "06",
+          "talk_id": "05",
           "title": "Lunch",
           "start_time": "13:00",
           "end_time": "14:00",
@@ -106,7 +106,7 @@
           "track": "all"
         },
         {
-          "talk_id": "06",
+          "talk_id": "05",
           "title": "Lunch",
           "start_time": "13:15",
           "end_time": "14:05",
@@ -136,7 +136,7 @@
           "track": "all"
         },
         {
-          "talk_id": "06",
+          "talk_id": "05",
           "title": "Lunch",
           "start_time": "13:15",
           "end_time": "14:05",
@@ -166,7 +166,7 @@
           "track": "all"
         },
         {
-          "talk_id": "06",
+          "talk_id": "07",
           "title": "Lunch",
           "start_time": "13:15",
           "end_time": "14:05",

eventsapp/data/schedule.json

@@ -40,7 +40,7 @@ class PyConApp(App):
     Our main app class:
     '''
 
-    base_active_bright = ListProperty((226/255., 168/255., 180/255., 1))
+    base_active_bright = ListProperty((216/255., 34/255., 118/255., 1))
     '''
     '''
 

eventsapp/data/tracks.json

@@ -22,7 +22,7 @@ class NavigationScreen(Screen):
     halign: 'left'
     valign: 'center'
     padding: dp(15), dp(15)
-    color: app.base_active_color
+    color: app.base_active_bright
     on_released: app.navigationdrawer.toggle_state()
 
 <LeftPanel@BoxLayout+Image>

eventsapp/main.py

@@ -2,6 +2,7 @@
 from kivy.factory import Factory
 from kivy.lang import Builder
 from functools import partial
+from kivy.app import App
 
 
 class ScreenCommunity(Screen):
@@ -44,12 +45,13 @@ def on_enter(self, onsuccess=False):
 
         social_comm = community['social']
         # social_len = len(social_comm)
-
+        app = App.get_running_app()
         gl = self.ids.container
         gl.clear_widgets()
         import webbrowser
         for social_acc, social_link in social_comm.items():
             imbt = Factory.ImBut()
+            imbt.color = app.base_active_bright
             imbt.source = 'atlas://data/default/' + social_acc.lower()
             imbt.on_released = partial(webbrowser.open, social_link)
             gl.add_widget(imbt)

eventsapp/uix/screens/navigationscreen.py

@@ -28,11 +28,6 @@ class SpeakerDetails(Factory.ScrollGrid):
         text: root.speaker['name']
     BackLabel
         text: root.speaker['info']
-    ActiveButton
-        text: "More details on cfp..."
-        on_release:
-            import webbrowser
-            if 'cfp' in root.speaker: webbrowser.open(root.speaker['cfp'])
         ''')
 
 
@@ -69,15 +64,30 @@ class ScreenTalks(Screen):
 <ScreenTalks>
     spacing: dp(9)
     name: 'ScreenTalks'
-    ScrollView
-        id: scroll
-        ScrollGrid
-            id: container
-            BackLabel:
-                active: True
-                id: talk_title
-            BackLabel:
-                id: talk_desc
+    BoxLayout:
+        orientation: 'vertical'
+        ScrollView
+            id: scroll
+            ScrollGrid
+                id: container
+                BackLabel:
+                    active: True
+                    id: talk_title
+                BackLabel:
+                    id: talk_desc
+        BoxLayout
+            size_hint_y: None
+            height: dp(54)
+            padding: dp(9)
+            ImBut
+                source: 'atlas://data/default/share'
+                color: app.base_active_bright[:3] + [.9]
+            ImBut
+                source: 'atlas://data/default/reminder'
+                color: app.base_active_bright[:3] + [.9]
+            ImBut
+                source: 'atlas://data/default/feedback'
+                color: app.base_active_bright[:3] + [.9]
         ''')
 
     def on_pre_enter(self):
@@ -118,7 +128,7 @@ def on_enter(self, onsuccess=False):
                             social_acc.lower()
                         imbt.on_released = partial(
                             webbrowser.open, social_link)
-                        imbt.color = app.base_active_color
+                        imbt.color = app.base_active_bright[:3] + [.9]
                         gl.add_widget(imbt)
                     speaker_details.add_widget(gl)
                 self.ids.container.add_widget(speaker_details)

eventsapp/uix/screens/screencommunity.py

@@ -16,7 +16,7 @@ class ScreenTicket(Screen):
         spacing: dp(12)
         orientation: 'vertical'
         AsyncImage:
-            source: 'https://www.wwkd.org/wp-content/uploads/2018/08/tickets.png'
+            source: 'https://encrypted-tbn0.gstatic.com/images?q=tbn:ANd9GcTfnU9KBKU6YoSa7bLg08XxPvq7_sujdQoEJRAzD9sDCCaUcTYXnA'
             allow_stretch: True
             size: root.size
             opacity: 1

eventsapp/uix/screens/screentalks.py

@@ -41,7 +41,9 @@ class StartupScreen(Screen):
     size_hint_y: None
     active: False
     height: (self.texture_size[1] + dp(9)) if self.text else 0
-    backcolor: (app.base_active_color[:3] if self.active else app.base_inactive_color[:3]) + [.3]
+    backcolor:
+        (app.base_active_color[:3] if self.active else\
+        app.base_inactive_color[:3]) + [.3]
     color: (.22, .22, .22, 1) if not self.active else (1, 1, 1, 1)
     text_size: self.width - dp(9), None
     halign: 'center'