Skip to content

update trolli #195

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Feb 15, 2025
Merged

update trolli #195

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0347d2d
update trolli
OwenMcDonnell Feb 10, 2025
aabd707
clean up
OwenMcDonnell Feb 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 28 additions & 0 deletions python/apps/trolli/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
[project]
name = "new-trolli"
version = "0.1.0"
description = ""
readme = "README.md"
requires-python = ">=3.8"
dependencies = [
"flet==0.26.0"
]


[tool.flet]
# org name in reverse domain name notation, e.g. "com.mycompany".
# Combined with project.name to build bundle ID for iOS and Android apps
org = "com.mycompany"

# project display name that is used as an app title on Android and iOS home screens,
# shown in window titles and about app dialogs on desktop.
product = "new-trolli"

# company name to display in about app dialogs
company = "Flet"

# copyright text to display in about app dialogs
copyright = "Copyright (C) 2024 by Flet"

[tool.flet.app]
path = "src"
144 changes: 65 additions & 79 deletions python/apps/trolli/src/app_layout.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,89 +1,78 @@
from board import Board
from data_store import DataStore
from flet import (
ButtonStyle,
Column,
Container,
Control,
IconButton,
Page,
PopupMenuButton,
PopupMenuItem,
RoundedRectangleBorder,
Row,
Text,
TextButton,
TextField,
border,
border_radius,
colors,
icons,
padding,
)
import flet as ft
from sidebar import Sidebar

class AppLayout(Row):
def __init__(self, app, page: Page, store: DataStore, *args, **kwargs):

class AppLayout(ft.Row):
def __init__(self, app, page: ft.Page, store: DataStore, *args, **kwargs):
super().__init__(*args, **kwargs)
self.app = app
self.page = page
self.page.on_resize = self.page_resize
self.page: ft.Page = page
self.page.on_resized = self.page_resize
self.store: DataStore = store
self.toggle_nav_rail_button = IconButton(
icon=icons.ARROW_CIRCLE_LEFT,
icon_color=colors.BLUE_GREY_400,
self.toggle_nav_rail_button = ft.IconButton(
icon=ft.Icons.ARROW_CIRCLE_LEFT,
icon_color=ft.Colors.BLUE_GREY_400,
selected=False,
selected_icon=icons.ARROW_CIRCLE_RIGHT,
selected_icon=ft.Icons.ARROW_CIRCLE_RIGHT,
on_click=self.toggle_nav_rail,
)
self.sidebar = Sidebar(self, self.store, page)
self.members_view = Text("members view")
self.all_boards_view = Column(
self.sidebar = Sidebar(self, self.store)
self.members_view = ft.Text("members view")
self.all_boards_view = ft.Column(
[
Row(
ft.Row(
[
Container(
Text(value="Your Boards", style="headlineMedium"),
ft.Container(
ft.Text(
value="Your Boards",
theme_style=ft.TextThemeStyle.HEADLINE_MEDIUM,
),
expand=True,
padding=padding.only(top=15),
padding=ft.padding.only(top=15),
),
Container(
TextButton(
ft.Container(
ft.TextButton(
"Add new board",
icon=icons.ADD,
icon=ft.Icons.ADD,
on_click=self.app.add_board,
style=ButtonStyle(
style=ft.ButtonStyle(
bgcolor={
"": colors.BLUE_200,
"hovered": colors.BLUE_400,
ft.ControlState.DEFAULT: ft.Colors.BLUE_200,
ft.ControlState.HOVERED: ft.Colors.BLUE_400,
},
shape={
ft.ControlState.DEFAULT: ft.RoundedRectangleBorder(
radius=3
)
},
shape={"": RoundedRectangleBorder(radius=3)},
),
),
padding=padding.only(right=50, top=15),
padding=ft.padding.only(right=50, top=15),
),
]
),
Row(
ft.Row(
[
TextField(
ft.TextField(
hint_text="Search all boards",
autofocus=False,
content_padding=padding.only(left=10),
content_padding=ft.padding.only(left=10),
width=200,
height=40,
text_size=12,
border_color=colors.BLACK26,
focused_border_color=colors.BLUE_ACCENT,
suffix_icon=icons.SEARCH,
border_color=ft.Colors.BLACK26,
focused_border_color=ft.Colors.BLUE_ACCENT,
suffix_icon=ft.Icons.SEARCH,
)
]
),
Row([Text("No Boards to Display")]),
ft.Row([ft.Text("No Boards to Display")]),
],
expand=True,
)
self._active_view: Control = self.all_boards_view
self._active_view: ft.Control = self.all_boards_view

self.controls = [self.sidebar, self.toggle_nav_rail_button, self.active_view]

Expand All @@ -96,29 +85,26 @@ def active_view(self, view):
self._active_view = view
self.controls[-1] = self._active_view
self.sidebar.sync_board_destinations()
self.update()
self.page.update()

def set_board_view(self, i):
self.active_view = self.store.get_boards()[i]
self.sidebar.bottom_nav_rail.selected_index = i
self.sidebar.top_nav_rail.selected_index = None
self.sidebar.update()
self.page.update()
self.page_resize()
self.page.update()

def set_all_boards_view(self):
self.active_view = self.all_boards_view
self.hydrate_all_boards_view()
self.sidebar.top_nav_rail.selected_index = 0
self.sidebar.bottom_nav_rail.selected_index = None
self.sidebar.update()
self.page.update()

def set_members_view(self):
self.active_view = self.members_view
self.sidebar.top_nav_rail.selected_index = 1
self.sidebar.bottom_nav_rail.selected_index = None
self.sidebar.update()
self.page.update()

def page_resize(self, e=None):
Expand All @@ -129,49 +115,49 @@ def page_resize(self, e=None):
self.page.update()

def hydrate_all_boards_view(self):
self.all_boards_view.controls[-1] = Row(
self.all_boards_view.controls[-1] = ft.Row(
[
Container(
content=Row(
ft.Container(
content=ft.Row(
[
Container(
content=Text(value=b.name),
ft.Container(
content=ft.Text(value=b.name),
data=b,
expand=True,
on_click=self.board_click,
),
Container(
content=PopupMenuButton(
ft.Container(
content=ft.PopupMenuButton(
items=[
PopupMenuItem(
content=Text(
ft.PopupMenuItem(
content=ft.Text(
value="Delete",
style="labelMedium",
text_align="center",
theme_style=ft.TextThemeStyle.LABEL_MEDIUM,
text_align=ft.TextAlign.CENTER,
),
on_click=self.app.delete_board,
data=b,
),
PopupMenuItem(),
PopupMenuItem(
content=Text(
ft.PopupMenuItem(),
ft.PopupMenuItem(
content=ft.Text(
value="Archive",
style="labelMedium",
text_align="center",
theme_style=ft.TextThemeStyle.LABEL_MEDIUM,
text_align=ft.TextAlign.CENTER,
),
),
]
),
padding=padding.only(right=-10),
border_radius=border_radius.all(3),
padding=ft.padding.only(right=-10),
border_radius=ft.border_radius.all(3),
),
],
alignment="spaceBetween",
alignment=ft.MainAxisAlignment.SPACE_BETWEEN,
),
border=border.all(1, colors.BLACK38),
border_radius=border_radius.all(5),
bgcolor=colors.WHITE60,
padding=padding.all(10),
border=ft.border.all(1, ft.Colors.BLACK38),
border_radius=ft.border_radius.all(5),
bgcolor=ft.Colors.WHITE60,
padding=ft.padding.all(10),
width=250,
data=b,
)
Expand Down
Loading