Archives
/
Comrad
mirror of https://github.com/ComradCollective/Comrad
2
0
Fork 0
Code Issues Releases Wiki Activity

updates

Browse Source
macdev
quadrismegistus 4 years ago
parent 06affdafdf
commit 94592f167d
5 changed files with 89 additions and 29 deletions
Show Stats Download Patch File Download Diff File

65
app/config.py
Unescape Escape View File

@ -26,6 +26,7 @@ royalbrown=(94, 55, 46)
bole=(113, 65, 55)
liver= (110, 56, 31)
bistre=(58, 33, 14)
bistre2=(43, 21, 7)
skin1=(89, 47, 42)
skin2=(80, 51, 53)
skin3=(40, 24, 26)
@ -53,6 +54,7 @@ redviolet=144, 50, 61
bone=217, 202, 179
bronze=188, 128, 52
shadow=140, 122, 107
orangered=194, 3, 3
dutchwhite=229,219,181
# black=(0,0,0)
@ -77,16 +79,55 @@ 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
rufusred=171, 4, 4
darksienna3=56, 22, 13
black2=0, 20, 39
xanadu=112, 141, 129
jasmine=244, 213, 141
ioe=191, 6, 3
dred=141, 8, 1
caputmort1=74, 36, 25
# SCHEME = 'lgreen'
# SCHEME = 'bronze'
SCHEME = 'dark'
# light green theme?
if SCHEME=='lgreen':
COLOR_TOOLBAR= huntergreen #bone #smokyblack #5,5,5 #russiangreen #pinetreegreen #kombugreen #(12,5,5) #russiangreen
COLOR_BG = grass # russiangreen #(0,73,54)
COLOR_LOGO = coyotebrown # 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 = bone #(67,92,61) #(12,9,10)
COLOR_CARD_BORDER = COLOR_CARD
COLOR_ICON=COLOR_LOGO
elif SCHEME=='bronze':
COLOR_TOOLBAR= junglegreen
COLOR_BG = bronze
COLOR_LOGO = rufusred #yellowcrayola #0,0,0
COLOR_TEXT = black
COLOR_CARD = bone
COLOR_CARD_BORDER = COLOR_CARD
COLOR_ICON=COLOR_LOGO
else:
# COLOR_TOOLBAR= black
# COLOR_TOOLBAR=bronze
# COLOR_LOGO = black #bronze #0,0,0
# COLOR_BG = black
COLOR_BG=bistre
COLOR_TOOLBAR=black
COLOR_LOGO=bronze
COLOR_TEXT = black
COLOR_CARD = bone
COLOR_CARD_BORDER = COLOR_CARD
COLOR_ICON=COLOR_LOGO

12
app/main.py
Unescape Escape View File

@ -375,7 +375,17 @@ class MainApp(MDApp):
return await self.api.get_post(post_id)
async def get_posts(self):
return await self.api.get_posts()
data = await self.api.get_posts()
newdata=[]
for d in data:
if not 'val' in d: continue
newdict = dict(d['val'].items())
newdict['timestamp']=float(d['time'])
newdata.append(newdict)
# return index
return newdata
async def get_my_posts(self):
return await self.api.get_posts('/author/'+self.username)

17
app/screens/feed/feed.kv
Unescape Escape View File

@ -54,12 +54,12 @@
# height: self.parent.width/self.image_ratio
# height: self.height
# width: self.height*self.image_ratio
canvas:
Color:
rgb: 0,0,0,1
Line:
width: 12
rectangle: (self.x, self.y, self.width, self.height)
# canvas:
# Color:
# rgb: 0,0,0,1
# Line:
# width: 1
# rectangle: (self.x, self.y, self.width, self.height)
@ -109,8 +109,9 @@
# size_hint_x: 100
text_color:rgb(*COLOR_TEXT)
theme_text_color: 'Custom'
halign: 'left'
halign: 'right'
padding: ('10dp','0dp')
bold: True
<PostTimestampLabel>:
id: post_timestamp_label
@ -155,7 +156,7 @@
id: post
orientation: "vertical"
padding: "20dp"
size_hint: (0.9, None)
size_hint: (0.75, None)
pos_hint: {"center_x": .5, "center_y": .5}
md_bg_color: rgb(*COLOR_CARD)
height: self.minimum_height

17
app/screens/login/login.py
Unescape Escape View File

@ -3,7 +3,7 @@ from kivymd.uix.boxlayout import MDBoxLayout
from kivymd.uix.textfield import MDTextField
from kivymd.uix.button import MDRectangleFlatButton
from kivymd.uix.label import MDLabel
from main import MyLabel,rgb
from main import MyLabel,rgb,COLOR_TEXT
class LoginBoxLayout(MDBoxLayout): pass
class LoginButtonLayout(MDBoxLayout): pass
@ -25,13 +25,20 @@ class LoginScreen(BaseScreen):
#log(self.ids)
#log('hello?')
self.layout = LoginBoxLayout()
self.label_title = MDLabel(text='Enter, Komrade',halign='center',size_hint_x=1)
self.label_title.font_name='assets/font.otf'
self.label_title.font_size='20sp'
self.label_title.bold=True
self.layout.add_widget(self.label_title)
self.label_username = UsernameLabel(text="username:")
self.layout_username = UsernameLayout()
self.label_username = UsernameLabel(text="username:")
self.username_field = UsernameField()
self.username_field.line_color_focus=rgb(201,203,163)
self.username_field.line_color_normal=rgb(201,203,163,0.25)
self.username_field.line_color_focus=rgb(*COLOR_TEXT)
self.username_field.line_color_normal=rgb(*COLOR_TEXT,a=0.25)
self.username_field.font_name='assets/font.otf'
self.layout_username.add_widget(self.label_username)
@ -48,8 +55,8 @@ class LoginScreen(BaseScreen):
self.label_username.font_name='assets/font.otf'
self.password_field = PasswordField()
self.password_field.line_color_focus=rgb(201,203,163)
self.password_field.line_color_normal=rgb(201,203,163,0.25)
self.password_field.line_color_focus=rgb(*COLOR_TEXT)
self.password_field.line_color_normal=rgb(*COLOR_TEXT,a=0.25)
self.password_field.font_name='assets/font.otf'
self.layout_password.add_widget(self.label_password)

7
p2p/api.py
Unescape Escape View File

@ -623,9 +623,10 @@ class Api(object):
if type(index)!=list: index=[index]
self.log('got index?',index)
index = [x for x in index if x is not None]
data = await self.get_json_val(['/post/'+x for x in index])
# return index
return data
## get full json
return await self.get_json(['/post/'+x for x in index])

Write Preview
Loading…
Cancel
Save