fix: schedule shown twice, overflow on small device

sparcs-kaist · Jul 31, 2023 · d3d99e1 · d3d99e1
1 parent 524fa07
commit d3d99e1
Showing 1 changed file with 79 additions and 34 deletions.
diff --git a/lib/pages/main_page.dart b/lib/pages/main_page.dart
@@ -153,42 +153,87 @@ class _MainPageState extends State<MainPage> {
                   borderRadius:
                       BorderRadius.vertical(top: Radius.circular(16.0)),
                   child: Container(
-                    constraints: const BoxConstraints.expand(),
-                    child: ColoredBox(
-                      color: Colors.white,
-                      child: Padding(
-                        padding: const EdgeInsets.symmetric(
-                          horizontal: 16.0,
-                          vertical: 16.0,
-                        ),
-                        child: Column(
-                          mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                          children: [
-                            Column(
-                              children: <Widget>[
-                                _buildTimetable(infoModel.user, semester, now),
-                                const SizedBox(height: 24.0),
-                                _buildDivider(),
-                                const SizedBox(height: 24.0),
-                                _buildSchedule(now, infoModel.currentSchedule),
-                                _buildSchedule(now, infoModel.currentSchedule),
-                                const SizedBox(height: 24.0),
-                                _buildDivider(),
-                              ],
+                      constraints: const BoxConstraints.expand(),
+                      child: CustomScrollView(
+                        reverse: true,
+                        slivers: [
+                          SliverFillRemaining(
+                            hasScrollBody: false,
+                            child: ColoredBox(
+                              color: Colors.white,
+                              child: Padding(
+                                padding: const EdgeInsets.symmetric(
+                                  horizontal: 16.0,
+                                  vertical: 16.0,
+                                ),
+                                child: Column(
+                                  children: <Widget>[
+                                    Column(
+                                      children: <Widget>[
+                                        _buildTimetable(
+                                            infoModel.user, semester, now),
+                                        const SizedBox(height: 24.0),
+                                        _buildDivider(),
+                                        const SizedBox(height: 24.0),
+                                        _buildSchedule(
+                                            now, infoModel.currentSchedule),
+                                        const SizedBox(height: 24.0),
+                                        _buildDivider(),
+                                      ],
+                                    ),
+                                    Spacer(),
+                                    Column(
+                                      children: <Widget>[
+                                        _buildLogo(),
+                                        const SizedBox(height: 4.0),
+                                        _buildCopyRight(),
+                                        _buildTextButtons(context),
+                                      ],
+                                    )
+                                  ],
+                                ),
+                              ),
                             ),
-                            Column(
-                              children: <Widget>[
-                                _buildLogo(),
-                                const SizedBox(height: 4.0),
-                                _buildCopyRight(),
-                                _buildTextButtons(context),
-                              ],
-                            )
-                          ],
-                        ),
+                          ),
+                        ],
+                      )
+
+                      // SingleChildScrollView(
+                      //   child: ColoredBox(
+                      //     color: Colors.white,
+                      //     child: Padding(
+                      //       padding: const EdgeInsets.symmetric(
+                      //         horizontal: 16.0,
+                      //         vertical: 16.0,
+                      //       ),
+                      //       child: Column(
+                      //         mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                      //         children: [
+                      //           Column(
+                      //             children: <Widget>[
+                      //               _buildTimetable(infoModel.user, semester, now),
+                      //               const SizedBox(height: 24.0),
+                      //               _buildDivider(),
+                      //               const SizedBox(height: 24.0),
+                      //               _buildSchedule(now, infoModel.currentSchedule),
+                      //               const SizedBox(height: 24.0),
+                      //               _buildDivider(),
+                      //             ],
+                      //           ),
+                      //           Column(
+                      //             children: <Widget>[
+                      //               _buildLogo(),
+                      //               const SizedBox(height: 4.0),
+                      //               _buildCopyRight(),
+                      //               _buildTextButtons(context),
+                      //             ],
+                      //           )
+                      //         ],
+                      //       ),
+                      //     ),
+                      //   ),
+                      // ),
                       ),
-                    ),
-                  ),
                 ),
               ),
             ],