Scale right column to window size

openandroidinstaller-dev · Dec 26, 2023 · 0290d4c · 0290d4c
1 parent 6859a5e
commit 0290d4c
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 20 deletions.
diff --git a/openandroidinstaller/openandroidinstaller.py b/openandroidinstaller/openandroidinstaller.py
@@ -72,7 +72,7 @@ def __init__(self, state: AppState):
         super().__init__()
         self.state = state
         # create the main columns
-        self.view = Column(expand=True, width=1200)
+        self.view = Column(expand=True)  # , width=1200)
 
         # create default starter views
         welcome_view = WelcomeView(
@@ -216,7 +216,7 @@ def log_version_infos(bin_path):
     ]
     try:
         logger.info(f"Heimdall version: {hdversion[1].strip()}")
-    except:
+    except IndexError:
         logger.info(f"Issue with heimdall: {hdversion}")
 
 

diff --git a/openandroidinstaller/views/base.py b/openandroidinstaller/views/base.py
@@ -15,13 +15,7 @@
 
 from app_state import AppState
 
-from flet import (
-    Column,
-    Image,
-    Row,
-    UserControl,
-    VerticalDivider,
-)
+from flet import Column, Container, Image, Row, UserControl, VerticalDivider, margin
 
 
 class BaseView(UserControl):
@@ -30,27 +24,35 @@ def __init__(self, state: AppState, image: str = "placeholder.png"):
         self.state = state
 
         # configs
-        self.column_width = 600
+        # self.column_width = 600
         # right part of the display, add content here.
-        self.right_view_header = Column(width=self.column_width, height=120, spacing=30)
+        self.right_view_header = Column(
+            spacing=30
+        )  # , width=self.column_width, height=120)
         self.right_view = Column(
-            alignment="center", width=self.column_width, height=650, scroll="adaptive"
+            alignment="center",
+            scroll="adaptive",  # , width=self.column_width, height=650
         )
         # left part of the display: used for displaying the images
         self.left_view = Column(
-            width=self.column_width,
+            # width=self.column_width,
             controls=[Image(src=f"/imgs/{image}", height=600)],
             expand=True,
             horizontal_alignment="center",
         )
         # main view row
-        self.view = Row(
-            [
-                self.left_view,
-                VerticalDivider(),
-                Column(expand=True, controls=[self.right_view_header, self.right_view]),
-            ],
-            alignment="spaceEvenly",
+        self.view = Container(
+            content=Row(
+                [
+                    self.left_view,
+                    VerticalDivider(),
+                    Column(
+                        expand=True, controls=[self.right_view_header, self.right_view]
+                    ),
+                ],
+                alignment="spaceEvenly",
+            ),
+            margin=margin.only(left=10, top=0, right=50, bottom=5),
         )
 
     def clear(