diff --git a/.github/workflows/flutter.yml b/.github/workflows/flutter.yml index d6c70ea..e2072bf 100644 --- a/.github/workflows/flutter.yml +++ b/.github/workflows/flutter.yml @@ -11,7 +11,7 @@ jobs: - uses: actions/checkout@v3 - uses: subosito/flutter-action@v2.3.0 with: - flutter-version: '3.7.7' + flutter-version: '3.16.9' - name: Install dependencies and analyze project source run: | for d in */ ; do diff --git a/qiita_app/lib/pages/setting_page.dart b/qiita_app/lib/pages/setting_page.dart index 737688e..17b5152 100644 --- a/qiita_app/lib/pages/setting_page.dart +++ b/qiita_app/lib/pages/setting_page.dart @@ -49,7 +49,6 @@ class _SettingsPageState extends State { title: "Settings", showSearchBar: false, showBottomDivider: true, - // dividerHeight: 4.2, ), body: ListView( children: [ @@ -107,48 +106,3 @@ class _SettingsPageState extends State { ); } } -// class _SettingPageState extends State { -// @override -// Widget build(BuildContext context) { -// return Scaffold( -// body: Center( -// child: Column( -// mainAxisAlignment: MainAxisAlignment.center, -// children: [ -// RoundedEdgeButton( -// text: "プライバシーポリシー", -// backgroundColor: AppColors.primary, -// onPressed: () { -// showAppBottomModalSheet( -// context, -// title: "プライバシーポリシー", -// content: const Text( -// Texts.privacyPolicyText, -// style: AppTextStyles.h2BasicBlack, -// ), -// ); -// }, -// ), -// const SizedBox( -// height: 42, -// ), -// RoundedEdgeButton( -// text: "利用規約", -// backgroundColor: AppColors.primary, -// onPressed: () { -// showAppBottomModalSheet( -// context, -// title: "利用規約", -// content: const Text( -// Texts.termsService, -// style: AppTextStyles.h3BasicBlack, -// ), -// ); -// }, -// ), -// ], -// ), -// ), -// ); -// } -// } diff --git a/qiita_app/lib/widgets/app_title.dart b/qiita_app/lib/widgets/app_title.dart index c684308..c93baf0 100644 --- a/qiita_app/lib/widgets/app_title.dart +++ b/qiita_app/lib/widgets/app_title.dart @@ -15,7 +15,7 @@ class AppTitle extends StatelessWidget implements PreferredSizeWidget { Key? key, required this.title, this.style, - this.backgroundColor = AppColors.background, + this.backgroundColor = AppColors.white, this.dividerHeight = 1.0, this.showBottomDivider = true, this.showSearchBar = false, diff --git a/qiita_app/lib/widgets/bottom_navigation.dart b/qiita_app/lib/widgets/bottom_navigation.dart index acc2a1e..f598828 100644 --- a/qiita_app/lib/widgets/bottom_navigation.dart +++ b/qiita_app/lib/widgets/bottom_navigation.dart @@ -1,5 +1,5 @@ -import 'package:flutter/material.dart'; import 'package:flutter/cupertino.dart'; +import 'package:flutter/material.dart'; import 'package:qiita_app/constants/app_colors.dart'; import 'package:qiita_app/pages/feed_page.dart'; import 'package:qiita_app/pages/setting_page.dart'; @@ -35,6 +35,7 @@ class _BottomNavigationState extends State { return Scaffold( body: Center(child: _widgetOptions.elementAt(_selectedIndex)), bottomNavigationBar: BottomNavigationBar( + backgroundColor: AppColors.white, items: const [ BottomNavigationBarItem( icon: Icon(Icons.list), diff --git a/qiita_app/pubspec.yaml b/qiita_app/pubspec.yaml index 57252d8..8079a34 100644 --- a/qiita_app/pubspec.yaml +++ b/qiita_app/pubspec.yaml @@ -17,14 +17,15 @@ dependencies: cupertino_icons: ^1.0.6 + package_info_plus: ^4.2.0 + http: ^1.1.0 intl: ^0.17.0 modal_bottom_sheet: ^2.1.2 - + dev_dependencies: flutter_test: sdk: flutter - flutter_lints: ^2.0.0