diff --git a/app/config.py b/app/config.py new file mode 100644 index 0000000..7784070 --- /dev/null +++ b/app/config.py @@ -0,0 +1,92 @@ +DEFAULT_SCREEN='profile' + +import random +HORIZONTAL = False #random.choice([True,True,True,False]) +FACTOR=1 +WINDOW_SIZE = (1136*FACTOR,640*FACTOR) if HORIZONTAL else (640*FACTOR,1136*FACTOR) + +WINDOW_SIZE=1111,1111 + +BG_IMG='assets/bg-brown.png' + +grass=(201,203,163) +russiangreen = (109,140,96) +huntergreen = (67,92,61) +kombugreen = (49,67,45) +pinetreegreen = (29,40,27) +junglegreen = (15, 21, 14) + +browncoffee=(77, 42, 34) +rootbeer=(38, 7, 1) +blackbean=(61, 12, 2) +burntumber=(132, 55, 34) +brownsugar=(175, 110, 81) +antiquebrass= (198, 144, 118) +royalbrown=(94, 55, 46) +bole=(113, 65, 55) +liver= (110, 56, 31) +bistre=(58, 33, 14) +skin1=(89, 47, 42) +skin2=(80, 51, 53) +skin3=(40, 24, 26) + +grullo=177, 158, 141 +smokyblack=33, 14, 0 +liverchestnut=148, 120, 96 +ashgray=196, 199, 188 +livchestnut2=156, 106, 73 +beaver=165, 134, 110 +rawumber=120, 95, 74 + +persianred=202,52,51 +vermillion=126,25,27 +indianred=205,92,92 +barnred=124,10,2 +maroon=128,0,0 +bloodred=98, 23, 8 +rust=188, 57, 8 +darksienna=34, 9, 1 +yellowcrayola=246, 170, 28 +darkred=148, 27, 12 +rosewood=94, 11, 21 +redviolet=144, 50, 61 +bone=217, 202, 179 +bronze=188, 128, 52 +shadow=140, 122, 107 + +dutchwhite=229,219,181 +# black=(0,0,0) +black=15, 15, 15 #5, 8, 13 + +eerieblack=23, 22, 20 +bistre=58, 38, 24 +tuscanred=117, 64, 67 +grullo2=154, 136, 115 +blackolive=55, 66, 61 + + +dogreen=103, 116, 35 +sage=187, 193, 145 +alabaster2 = 241, 236, 226 +coyotebrown = 138, 93, 61 +vandykebrown = 90, 62, 41 + +darksienna2=55, 6, 23 +xiketic=3, 7, 30 + +rossacorsa=208, 0, 0 +raisinblack=38, 34, 34 +coffee2=67, 58, 58 + +COLOR_TOOLBAR= huntergreen #bone #smokyblack #5,5,5 #russiangreen #pinetreegreen #kombugreen #(12,5,5) #russiangreen +COLOR_BG = bone # russiangreen #(0,73,54) +COLOR_LOGO = sage # grass#russiangreen #(0,0,0) #(0,0,0) #(151,177,140) #(132,162,118) #(109,140,106) +COLOR_TEXT = black #(255,245,200) #(0,0,0,1) #(241,233,203) #COLOR_ICON #(207,219,204) #(239,235,206) # (194,211,187) # (171,189,163) # (222,224,198) # COLOR_LOGO #(223, 223, 212) +COLOR_CARD = grullo #(67,92,61) #(12,9,10) + + + +COLOR_CARD_BORDER = COLOR_CARD +COLOR_ICON=COLOR_LOGO + + diff --git a/app/examples/kivy_asyncio_example.py b/app/etc/examples/kivy_asyncio_example.py similarity index 100% rename from app/examples/kivy_asyncio_example.py rename to app/etc/examples/kivy_asyncio_example.py diff --git a/app/main.py b/app/main.py index c5c860b..ff9b4df 100644 --- a/app/main.py +++ b/app/main.py @@ -1,62 +1,14 @@ ## CONFIG # change this to your external ip address for your server #(needs to be external to allow tor routing) -DEFAULT_SCREEN='profile' - -import random -HORIZONTAL = False #random.choice([True,True,True,False]) -FACTOR=1 -WINDOW_SIZE = (1136*FACTOR,640*FACTOR) if HORIZONTAL else (640*FACTOR,1136*FACTOR) - -WINDOW_SIZE=1111,1111 - -BG_IMG='assets/bg-brown.png' - -grass=(201,203,163) -russiangreen = (109,140,96) -huntergreen = (67,92,61) -kombugreen = (49,67,45) -pinetreegreen = (29,40,27) -junglegreen = (15, 21, 14) - -browncoffee=(77, 42, 34) -rootbeer=(38, 7, 1) -blackbean=(61, 12, 2) -burntumber=(132, 55, 34) -brownsugar=(175, 110, 81) -antiquebrass= (198, 144, 118) -royalbrown=(94, 55, 46) -bole=(113, 65, 55) -liver= (110, 56, 31) -bistre=(58, 33, 14) -skin1=(89, 47, 42) -skin2=(80, 51, 53) -skin3=(40, 24, 26) - -grullo=177, 158, 141 -smokyblack=33, 14, 0 -liverchestnut=148, 120, 96 -ashgray=196, 199, 188 -livchestnut2=156, 106, 73 -beaver=165, 134, 110 -rawumber=120, 95, 74 - -dutchwhite=229,219,181 - -COLOR_TOOLBAR= smokyblack #5,5,5 #russiangreen #pinetreegreen #kombugreen #(12,5,5) #russiangreen -COLOR_BG = (0,73,54) -# COLOR_ICON = (201,203,163) -COLOR_LOGO = grass#russiangreen #(0,0,0) #(0,0,0) #(151,177,140) #(132,162,118) #(109,140,106) -COLOR_ICON = grass#russiangreen #(0,0,0) #COLOR_LOGO -COLOR_TEXT =dutchwhite #(241,233,203) #COLOR_ICON #(207,219,204) #(239,235,206) # (194,211,187) # (171,189,163) # (222,224,198) # COLOR_LOGO #(223, 223, 212) -COLOR_CARD = smokyblack #skin2 #huntergreen #(30,23,20) #(51,73,45) # (67,92,61) #(12,9,10) -# COLOR_TOOLBAR = (8s9,59,43) -# COLOR_ICON = COLOR_LOGO = COLOR_TEXT -# COLOR_TEXT=tuple([x+50 for x in russiangreen]) #COLOR_TOOLBAR -# COLOR_ICON = COLOR_LOGO = grass -# COLOR_LOGO = junglegreen #(199,22,22) -# COLOR_ICON = COLOR_LOGO -COLOR_CARD_BORDER = rawumber +from config import * + + + + + + + # monkeypatching the things that asyncio needs import subprocess diff --git a/app/root.kv b/app/root.kv index b0408b2..93d0266 100644 --- a/app/root.kv +++ b/app/root.kv @@ -55,16 +55,16 @@ MyLayout: md_bg_color:self.rgb(*COLOR_BG) canvas: - Color: - rgba: 1,1,1,1 #0.925,0.925,0.925,0.19 #get_color_from_hex(colors['Gray']['900']) - # rgba: 0.1,0.1,0.1,1 #get_color_from_hex(colors['Gray']['900']) + # Color: + # rgba: 1,1,1,1 #0.925,0.925,0.925,0.19 #get_color_from_hex(colors['Gray']['900']) + # # rgba: 0.1,0.1,0.1,1 #get_color_from_hex(colors['Gray']['900']) - Rectangle: - pos: self.pos - size: self.size - source: BG_IMG - # texture: app.texture + # Rectangle: + # pos: self.pos + # size: self.size + # source: BG_IMG + # # texture: app.texture MyToolbar: diff --git a/p2p/api.py b/p2p/api.py index 0ba5a4f..20e4af1 100644 --- a/p2p/api.py +++ b/p2p/api.py @@ -97,13 +97,13 @@ class Api(object): i += 1 await asyncio.sleep(1) # pass - except asyncio.CancelledError as e: + except (asyncio.CancelledError,KeyboardInterrupt) as e: self.log('P2P node cancelled', e) await self.flush() finally: # when canceled, print that it finished self.log('P2P node shutting down') - + pass @property async def node(self): if not hasattr(self,'_node'):