Merge branch 'release/v1.1.0'

img/atribuicao_newspaper.txt

@@ -0,0 +1,4 @@
+<div>Icons made by <a href="https://www.flaticon.com/authors/dinosoftlabs" title="DinosoftLabs">DinosoftLabs</a> from <a href="https://www.flaticon.com/" 			    title="Flaticon">www.flaticon.com</a> is licensed by <a href="http://creativecommons.org/licenses/by/3.0/" 			    
+
+
+title="Creative Commons BY 3.0" target="_blank">CC 3.0 BY</a></div>

infra/regras/meses.py → infra/controller/meses.py

@@ -5,7 +5,7 @@ class Mes():
 
     @staticmethod
     def nomes():
-        return ("Auran", "Borean", "Coronian", "Driadan", "Electran",
+        return ("Auroran", "Borean", "Coronian", "Driadan", "Electran",
                 "Faian", "Gaian", "Hermetian", "Irisian", "Kaosian",
                 "Lunan", "Maian", "Nixian")
 

infra/view/kv/anocalendario.kv → infra/view/ano_calendario.kv

@@ -1,8 +1,5 @@
 <AnoCalendario>:
     color:  C("#FFFFFF")   
-    background_color:  C("#00BFFF") 
+    background_color:  C("#4A93E7") 
     background_normal: ""          
     on_press: root.on_press()
-
-
-

infra/view/ano_calendario.py

@@ -7,7 +7,7 @@
 from kivy.utils import get_color_from_hex
 from kivy.uix.boxlayout import BoxLayout
 
-from infra.regras.data import Data
+from infra.controller.data import Data
 
 
 class AnoCalendario(Button):

infra/view/kv/areaanos.kv → infra/view/area_anos.kv

@@ -1,7 +1,7 @@
 <AreaAnos>:    
     orientation: "lr-tb"
     padding: 3
- 
+
 
 
 

infra/view/area_anos.py

@@ -7,7 +7,7 @@
 from kivy.utils import get_color_from_hex
 
 from infra.view.ano_calendario import AnoCalendario
-from infra.regras.data import Data
+from infra.controller.data import Data
 
 
 class AreaAnos(StackLayout):
@@ -24,7 +24,7 @@ def monta_anos(self):
         for numeroAno in range(anoSelecionado-4, anoSelecionado+8):
             ano = AnoCalendario(str(numeroAno))
             if numeroAno == anoAtual:
-                ano.background_color = get_color_from_hex("#ADD8E6")
+                ano.background_color = get_color_from_hex("#DDDDDD")
             self.add_widget(ano)
 
 __author__ = "Lário dos Santos Diniz"

infra/view/kv/areacalendario.kv → infra/view/area_calendario.kv

@@ -1,7 +1,7 @@
 <AreaCalendario>:    
     orientation: "lr-tb"
     padding: 3
- 
+
 
 
 

infra/view/area_calendario.py

@@ -6,8 +6,8 @@
 from kivy.uix.label import Label
 
 from infra.view.dia_calendario import DiaCalendario
-from infra.regras.dia import Dia
-from infra.regras.data import Data
+from infra.controller.dia import Dia
+from infra.controller.data import Data
 
 
 class AreaCalendario(StackLayout):

infra/view/kv/areadata.kv → infra/view/area_data.kv

@@ -1,9 +1,10 @@
 <AreaData>:  
     orientation: "vertical"   
-    padding: 5        
+    padding: 7        
     canvas:
+
         Color:            
-            rgb: C("#80b3ff")
+            rgb: C("#1374E4")
         Rectangle:
             size: root.size
             pos: root.pos                 
@@ -16,7 +17,7 @@
             text: root.dia
             bold: True 
             color:  C("#FFFFFF")   
-            background_color:  C("#A9A9A9") 
+            background_color:  C("#044590") 
             background_normal: ""
             on_press: root.on_press_dia()
 
@@ -27,7 +28,7 @@
             text: root.mes     
             bold: True 
             color:  C("#FFFFFF")   
-            background_color:  C("#A9A9A9") 
+            background_color:  C("#044590") 
             background_normal: ""
             on_press: root.on_press_mes()
         Button:   
@@ -37,7 +38,7 @@
             text: root.ano  
             bold: True 
             color:  C("#FFFFFF")   
-            background_color:  C("#A9A9A9") 
+            background_color:  C("#044590") 
             background_normal: ""
             on_press: root.on_press_ano()
 

infra/view/area_data.py

@@ -4,7 +4,7 @@
 from kivy.app import App
 from kivy.uix.boxlayout import BoxLayout
 
-from infra.regras.data import Data
+from infra.controller.data import Data
 from kivy.uix.button import Button
 
 from infra.view.area_meses import AreaMeses

infra/view/area_menu.kv

@@ -0,0 +1,18 @@
+#:import C kivy.utils.get_color_from_hex
+<AreaMenu>: 
+    pos_hint: {'top':1}  #na parte superior da tela
+    background_normal:''
+    background_down: ''
+    background_color: 0,3, 10, 1
+    ActionView:
+
+        ActionPrevious:
+            title: root.dataAtual
+            on_release: root.on_press_menu()
+            app_icon:  root.img_logo
+            app_icon_width: root.width * 0.18
+
+        #ActionButton:
+        #    text: 'Sair'
+        #    on_release: root.confirmacao()
+

infra/view/area_menu.py

@@ -1,25 +1,51 @@
 # coding: utf-8
-from datetime import date
+__author__ = "Lário dos Santos Diniz"
 
 from kivy.app import App
+from kivy.animation import Animation
+from kivy.uix.actionbar import ActionBar
+from kivy.uix.popup import Popup
 from kivy.uix.boxlayout import BoxLayout
+from kivy.uix.button import Button
+from kivy.uix.image import Image
+from kivy.utils import get_color_from_hex
 
-
-class AreaMenu(BoxLayout):
+class AreaMenu(ActionBar):
     """Classe que define a area que mostra o menu."""
 
     def __init__(self, **kwargs):
-        super(AreaMenu, self).__init__(**kwargs)
         self.aplicacao = App.get_running_app()
+        dataSelecionada = self.aplicacao.dataSelecionada
+        self.dataAtual = dataSelecionada.dia_numero_mes+' '+dataSelecionada.mes_nome+ ' '+dataSelecionada.ano
+        self.img_logo = self.aplicacao.pasta_imagens+'icon.png'
+
+        super(AreaMenu, self).__init__(**kwargs)
 
-    def on_press_dekatrian(self):
-        self.aplicacao.mudarTela(self.aplicacao.tela_dekatrian)
+    def on_press_menu(self):
+        self.aplicacao.mudarTela(self.aplicacao.tela_menu)
 
-    def on_press_calendario(self):
-        self.aplicacao.mudarTela(self.aplicacao.tela_inicial)
+    def sair(self, *args):
+        self.aplicacao.stop()
 
-    def on_press_desenvolvimento(self):
-        self.aplicacao.mudarTela(self.aplicacao.tela_desenvolvimento)
+    def confirmacao(self, *args):
+        box = BoxLayout(orientation='vertical', padding=10, spacing=10)
+        botoes = BoxLayout(padding=10, spacing=10)
 
+        pop = Popup(title='Deseja mesmo sair?', content=box, 
+                size_hint=(None, None),
+                size=(150, 150),
+                background= self.aplicacao.pasta_imagens+'background.png',
+                )
 
-__author__ = "Lário dos Santos Diniz"
+        sim = Button(text='Sim', on_release=self.sair)
+        nao = Button(text='Não', on_release=pop.dismiss)
+        botoes.add_widget(sim)
+
+        botoes.add_widget(nao)
+        atencao = Image(source=self.aplicacao.pasta_imagens+'warning.png')
+        box.add_widget(atencao)
+        box.add_widget(botoes)
+
+        anim = Animation(size=(300, 180), duration=0.2, t='out_back')
+        anim.start(pop)
+        pop.open()

infra/view/area_meses.py

@@ -3,12 +3,11 @@
 
 from kivy.app import App
 from kivy.uix.stacklayout import StackLayout
-from kivy.uix.button import Button
 from kivy.utils import get_color_from_hex
 
 from infra.view.mes_calendario import MesCalendario
-from infra.regras.meses import Mes
-from infra.regras.data import Data
+from infra.controller.meses import Mes
+from infra.controller.data import Data
 
 
 class AreaMeses(StackLayout):
@@ -25,7 +24,7 @@ def monta_meses(self):
         for nomeDoMes in Mes.nomes():
             mes = MesCalendario(nomeDoMes)
             if (nomeDoMes == mesAtual):
-                mes.background_color = get_color_from_hex("#ADD8E6")
+                mes.background_color = get_color_from_hex("#DDDDDD")
 
             self.add_widget(mes)
 
@@ -36,7 +35,7 @@ def monta_meses(self):
         proximoAno = self.aplicacao.dataSelecionada.to_date.year+1
         if self._ehBissexto(proximoAno):
             mes = MesCalendario('Sinchronian')
-            mes.background_color = get_color_from_hex("#DCDCDC")
+            mes.background_color = get_color_from_hex("#BBBBBB")
             self.add_widget(mes)
 
     def _ehBissexto(self, ano):

infra/view/kv/areatitulo.kv → infra/view/area_titulo.kv

@@ -1,7 +1,7 @@
 <AreaTitulo>:
     canvas:
         Color:            
-            rgb: C("#80b3ff")
+            rgb: C("#4A93E7")
         Rectangle:
             size: root.size
             pos: root.pos         
@@ -12,7 +12,7 @@
         pos_hint: {"right":1, "top":1}
         text:root.titulo
         color:  C("#FFFFFF")
-        font_height: 20
+        font_height: 100        
         ellipsis_options: {'color':(1,0.5,0.5,1),'underline':True}
 
 

infra/view/kv/diacalendario.kv → infra/view/dia_calendario.kv

@@ -1,5 +1,5 @@
 <DiaCalendario>:
-    color:  C("#001f4d")    
+    color:  C("#FFFFFF")    
     background_normal: ""       
     size_hint: .1428, .2
     on_press: root.on_press()

infra/view/dia_calendario.py

@@ -4,9 +4,9 @@
 from kivy.app import App
 from kivy.uix.button import Button
 from kivy.utils import get_color_from_hex
-from kivy.uix.label import Label
 
-from infra.regras.data import Data
+
+from infra.controller.data import Data
 
 
 class DiaCalendario(Button):