Skip to content

Commit

Permalink
🔀 :: Future/#54-Commit to main
Browse files Browse the repository at this point in the history
  • Loading branch information
Yoochanhong authored Jul 31, 2023
2 parents 88bc0ff + 9ba1eac commit c4703d9
Show file tree
Hide file tree
Showing 17 changed files with 314 additions and 187 deletions.
18 changes: 16 additions & 2 deletions lib/main.dart
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,15 @@ import 'package:flutter/services.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart';
import 'package:mukgen_flutter_v1/screen/starting_page.dart';

void main() => runApp(const MyApp());
void main() {
WidgetsFlutterBinding.ensureInitialized();
SystemChrome.setPreferredOrientations([
DeviceOrientation.portraitUp,
DeviceOrientation.portraitDown,
]).then((_) {
runApp(MyApp());
});
}

class MyApp extends StatelessWidget {
const MyApp({Key? key}) : super(key: key);
Expand All @@ -13,6 +21,12 @@ class MyApp extends StatelessWidget {
return ScreenUtilInit(
designSize: Size(393, 852),
builder: (context, child) => MaterialApp(
builder: (context, child) {
return MediaQuery(
data: MediaQuery.of(context).copyWith(textScaleFactor: 1.0),
child: child!,
);
},
home: SplashPage(),
debugShowCheckedModeBanner: false,
),
Expand All @@ -29,7 +43,7 @@ class _SplashPageState extends State<SplashPage> {
@override
void initState() {
super.initState();
Future.delayed(Duration(milliseconds: 3000), () {
Future.delayed(Duration(milliseconds: 1100), () {
Navigator.push(
context,
PageRouteBuilder(
Expand Down
18 changes: 18 additions & 0 deletions lib/model/auth/refreshtoken_response.dart
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
class RefreshTokenResponse {
String? accessToken;
String? refreshToken;

RefreshTokenResponse({this.accessToken, this.refreshToken});

RefreshTokenResponse.fromJson(Map<String, dynamic> json) {
accessToken = json['accessToken'];
refreshToken = json['refreshToken'];
}

Map<String, dynamic> toJson() {
final Map<String, dynamic> data = <String, dynamic>{};
data['accessToken'] = accessToken;
data['refreshToken'] = refreshToken;
return data;
}
}
18 changes: 10 additions & 8 deletions lib/screen/auth/login_page.dart
Original file line number Diff line number Diff line change
Expand Up @@ -55,15 +55,17 @@ class _LoginPageState extends State<LoginPage> {
appBar: AppBar(
backgroundColor: Colors.white,
elevation: 0,
leading: IconButton(
leading: Padding(
padding: EdgeInsets.only(left: 20.0.w),
onPressed: () {
Navigator.of(context).pop();
},
icon: Icon(
Icons.arrow_back,
color: MukGenColor.primaryLight1,
size: 24.0.sp,
child: GestureDetector(
onTap: () {
Navigator.of(context).pop();
},
child: Icon(
Icons.arrow_back,
color: MukGenColor.primaryLight1,
size: 24.0.sp,
),
),
),
),
Expand Down
16 changes: 10 additions & 6 deletions lib/screen/auth/sign_up_id_pw_page.dart
Original file line number Diff line number Diff line change
Expand Up @@ -55,13 +55,17 @@ class _SignUpIdPwPageState extends State<SignUpIdPwPage> {
appBar: AppBar(
backgroundColor: MukGenColor.white,
elevation: 0,
leading: IconButton(
leading: Padding(
padding: EdgeInsets.only(left: 20.0.w),
onPressed: () => Navigator.of(context).pop(),
icon: Icon(
Icons.arrow_back,
color: MukGenColor.primaryLight1,
size: 24.0.sp,
child: GestureDetector(
onTap: () {
Navigator.of(context).pop();
},
child: Icon(
Icons.arrow_back,
color: MukGenColor.primaryLight1,
size: 24.0.sp,
),
),
),
),
Expand Down
16 changes: 10 additions & 6 deletions lib/screen/auth/sign_up_main_page.dart
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,17 @@ class _SignupStartPageState extends State<SignupStartPage> {
appBar: AppBar(
backgroundColor: MukGenColor.white,
elevation: 0,
leading: IconButton(
leading: Padding(
padding: EdgeInsets.only(left: 20.0.w),
onPressed: () => Navigator.of(context).pop(),
icon: Icon(
Icons.arrow_back,
color: MukGenColor.primaryLight1,
size: 24.0.sp,
child: GestureDetector(
onTap: () {
Navigator.of(context).pop();
},
child: Icon(
Icons.arrow_back,
color: MukGenColor.primaryLight1,
size: 24.0.sp,
),
),
),
),
Expand Down
16 changes: 10 additions & 6 deletions lib/screen/auth/sign_up_name_page.dart
Original file line number Diff line number Diff line change
Expand Up @@ -43,13 +43,17 @@ class _SignupNamePageState extends State<SignUpNamePage> {
appBar: AppBar(
backgroundColor: MukGenColor.white,
elevation: 0,
leading: IconButton(
leading: Padding(
padding: EdgeInsets.only(left: 20.0.w),
onPressed: () => Navigator.of(context).pop(),
icon: Icon(
Icons.arrow_back,
color: MukGenColor.primaryLight1,
size: 24.0.sp,
child: GestureDetector(
onTap: () {
Navigator.of(context).pop();
},
child: Icon(
Icons.arrow_back,
color: MukGenColor.primaryLight1,
size: 24.0.sp,
),
),
),
),
Expand Down
18 changes: 10 additions & 8 deletions lib/screen/auth/sign_up_number_page.dart
Original file line number Diff line number Diff line change
Expand Up @@ -65,15 +65,17 @@ class _SignUpNumberPageState extends State<SignUpNumberPage> {
appBar: AppBar(
backgroundColor: MukGenColor.white,
elevation: 0,
leading: IconButton(
leading: Padding(
padding: EdgeInsets.only(left: 20.0.w),
onPressed: () {
Navigator.of(context).pop();
},
icon: Icon(
Icons.arrow_back,
color: MukGenColor.primaryLight1,
size: 24.0.sp,
child: GestureDetector(
onTap: () {
Navigator.of(context).pop();
},
child: Icon(
Icons.arrow_back,
color: MukGenColor.primaryLight1,
size: 24.0.sp,
),
),
),
),
Expand Down
7 changes: 6 additions & 1 deletion lib/screen/board/main_board_detail_page.dart
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,10 @@ import 'package:flutter_screenutil/flutter_screenutil.dart';
import 'package:intl/intl.dart';
import 'package:mukgen_flutter_v1/common/common.dart';
import 'package:mukgen_flutter_v1/model/board/detail_board.dart';
import 'package:mukgen_flutter_v1/model/board/hot_board.dart';
import 'package:mukgen_flutter_v1/model/board/total_board.dart';
import 'package:mukgen_flutter_v1/service/get/board/get_detail_board_info.dart';
import 'package:mukgen_flutter_v1/service/get/board/get_hot_board_info.dart';
import 'package:mukgen_flutter_v1/service/get/board/get_total_board_info.dart';
import 'package:mukgen_flutter_v1/service/post/board/post_board_comment_info.dart';
import 'package:mukgen_flutter_v1/service/post/board/post_like_board_info.dart';
Expand All @@ -29,6 +31,8 @@ class _MainBoardDetailPageState extends State<MainBoardDetailPage> {

Future<DetailBoard>? detailBoard;
Future<BoardResponse>? totalBoard;
Future<HotBoard>? hotBoard;

final PageController pageController =
PageController(initialPage: 0, viewportFraction: 0.9);

Expand Down Expand Up @@ -72,8 +76,9 @@ class _MainBoardDetailPageState extends State<MainBoardDetailPage> {
child: GestureDetector(
onTap: () {
setState(() {
totalBoard = getTotalBoardInfo();
Navigator.of(context).pop();
totalBoard = getTotalBoardInfo();
hotBoard = getHotBoardInfo();
});
},
child: Icon(
Expand Down
Loading

0 comments on commit c4703d9

Please sign in to comment.