From 283927e439d4688e1e71f2f900879d8966cf33c0 Mon Sep 17 00:00:00 2001 From: "Leomotors (Windows)" <59821765+Leomotors@users.noreply.github.com> Date: Sat, 30 Oct 2021 20:58:57 +0700 Subject: [PATCH] 1.0.116 --- lib/l10n/app_en.arb | 3 +- lib/l10n/app_th.arb | 3 +- lib/styles/styles.dart | 3 ++ lib/views/home.dart | 14 +++-- lib/views/mission/mission.dart | 27 ++++++++++ lib/views/record/leaderboard.dart | 89 ++++++++++++++++++++++++++++--- lib/views/record/record.dart | 5 +- pubspec.yaml | 2 +- 8 files changed, 132 insertions(+), 14 deletions(-) create mode 100644 lib/views/mission/mission.dart diff --git a/lib/l10n/app_en.arb b/lib/l10n/app_en.arb index c5bb42e..bf10d36 100644 --- a/lib/l10n/app_en.arb +++ b/lib/l10n/app_en.arb @@ -78,5 +78,6 @@ "less_calories": "less calories you consumed", "more_carbon": "more carbon footprint than others", "more_methane": "more methane produced by using vehicle", - "more_calories": "more calories you consumed" + "more_calories": "more calories you consumed", + "less_than_avg": "less than average" } \ No newline at end of file diff --git a/lib/l10n/app_th.arb b/lib/l10n/app_th.arb index 546c3f3..7b8bc04 100644 --- a/lib/l10n/app_th.arb +++ b/lib/l10n/app_th.arb @@ -78,5 +78,6 @@ "less_calories": "บริโภคแคลเลอรี่น้อยลง", "more_carbon": "คาร์บอนฟุตปรินท์มากกว่าคนอื่น", "more_methane": "เกิดมีเทนจากการใช้ยานพาหนะมากขึ้น", - "more_calories": "บริโภคแคลเลอรี่มากขึ้น" + "more_calories": "บริโภคแคลเลอรี่มากขึ้น", + "less_than_avg": "น้อยกว่าค่าเฉลี่ย" } \ No newline at end of file diff --git a/lib/styles/styles.dart b/lib/styles/styles.dart index 5b69ea9..52ca83e 100644 --- a/lib/styles/styles.dart +++ b/lib/styles/styles.dart @@ -34,3 +34,6 @@ const green = Color(0xFF5DC7AB); const tan = Color(0xFFF4E4D8); const brown = Color(0xFF533F2C); const rose = Color(0xFFF1D0C5); + +const discordPfp = + "https://external-preview.redd.it/4PE-nlL_PdMD5PrFNLnjurHQ1QKPnCvg368LTDnfM-M.png?auto=webp&s=ff4c3fbc1cce1a1856cff36b5d2a40a6d02cc1c3"; diff --git a/lib/views/home.dart b/lib/views/home.dart index ba1ae45..74d8057 100644 --- a/lib/views/home.dart +++ b/lib/views/home.dart @@ -2,6 +2,7 @@ import "package:flutter/material.dart"; import "package:food_busters/components/background.dart"; import "package:food_busters/main.dart"; import "package:food_busters/styles/styles.dart"; +import "package:food_busters/views/mission/mission.dart"; import "package:food_busters/views/points/points.dart"; import "package:food_busters/views/record/record.dart"; import "package:food_busters/views/scan/scanportal.dart"; @@ -115,9 +116,7 @@ class _HomePageState extends State { shape: BoxShape.circle, image: DecorationImage( fit: BoxFit.fill, - image: NetworkImage( - "https://external-preview.redd.it/4PE-nlL_PdMD5PrFNLnjurHQ1QKPnCvg368LTDnfM-M.png?auto=webp&s=ff4c3fbc1cce1a1856cff36b5d2a40a6d02cc1c3", - ), + image: NetworkImage(discordPfp), ), ), ), @@ -161,7 +160,14 @@ class _HomePageState extends State { content: text.my_record, ), smallBtn( - onPressed: () {}, + onPressed: () { + Navigator.push( + context, + MaterialPageRoute( + builder: (context) => const MyMissionPage(), + ), + ); + }, content: text.mission, ) ], diff --git a/lib/views/mission/mission.dart b/lib/views/mission/mission.dart new file mode 100644 index 0000000..22d4cb6 --- /dev/null +++ b/lib/views/mission/mission.dart @@ -0,0 +1,27 @@ +import "package:flutter/material.dart"; +import "package:flutter_gen/gen_l10n/app_localizations.dart"; +import "package:food_busters/styles/styles.dart"; + +class MyMissionPage extends StatefulWidget { + const MyMissionPage({Key? key}) : super(key: key); + + @override + _MyMissionPageState createState() => _MyMissionPageState(); +} + +class _MyMissionPageState extends State { + @override + Widget build(BuildContext context) { + final text = AppLocalizations.of(context)!; + + return Scaffold( + backgroundColor: tan, + extendBodyBehindAppBar: true, + appBar: AppBar( + title: Text(text.mission), + backgroundColor: Colors.transparent, + elevation: 0, + ), + ); + } +} diff --git a/lib/views/record/leaderboard.dart b/lib/views/record/leaderboard.dart index 0a8f584..655b5e9 100644 --- a/lib/views/record/leaderboard.dart +++ b/lib/views/record/leaderboard.dart @@ -2,7 +2,7 @@ import "package:flutter/material.dart"; import "package:flutter_gen/gen_l10n/app_localizations.dart"; import "package:food_busters/components/background.dart"; import "package:food_busters/data/dummy_busters.dart"; -import 'package:food_busters/models/buster.dart'; +import "package:food_busters/models/buster.dart"; import "package:food_busters/styles/styles.dart"; class LeaderboardPage extends StatefulWidget { @@ -32,17 +32,79 @@ class _LeaderboardPageState extends State { child: Column( mainAxisAlignment: MainAxisAlignment.center, children: [ + Padding( + padding: const EdgeInsets.symmetric( + vertical: 8.0, + horizontal: 28, + ), + child: Container( + decoration: BoxDecoration( + color: lightGreen, + borderRadius: BorderRadius.circular(16.0), + ), + child: Padding( + padding: const EdgeInsets.all(24.0), + child: Column( + crossAxisAlignment: CrossAxisAlignment.center, + children: [ + Container( + height: 100, + width: 100, + decoration: const BoxDecoration( + shape: BoxShape.circle, + image: DecorationImage( + fit: BoxFit.fill, + image: NetworkImage(discordPfp), + ), + ), + ), + Row( + mainAxisAlignment: MainAxisAlignment.center, + children: const [ + Text( + "78", + style: TextStyle( + fontSize: 36, + fontWeight: FontWeight.w500, + ), + ), + Text("th"), + ], + ), + Text("30% ${text.less_than_avg}"), + ], + ), + ), + ), + ), Padding( padding: const EdgeInsets.all(16.0), child: Container( - height: 240, + height: 320, decoration: BoxDecoration( - color: Colors.white, + color: lightGreen, borderRadius: BorderRadius.circular(16.0), ), child: Padding( - padding: const EdgeInsets.all(8.0), - child: topBusters(text), + padding: const EdgeInsets.symmetric( + vertical: 8.0, + horizontal: 4.0, + ), + child: Column( + children: [ + const Text( + "TOP 3 BUSTERS", + style: TextStyle( + fontWeight: FontWeight.w500, + fontSize: 24, + ), + ), + SizedBox( + height: 240, + child: topBusters(text), + ), + ], + ), ), ), ), @@ -66,7 +128,10 @@ class _LeaderboardPageState extends State { itemBuilder: (context, index) { final buster = data[index]; return ListTile( - title: Text(buster.username), + title: Text( + buster.username, + style: const TextStyle(fontSize: 14), + ), leading: Container( height: 50, width: 50, @@ -80,6 +145,18 @@ class _LeaderboardPageState extends State { ), ), ), + trailing: Column( + children: [ + Text( + "${buster.percentileRank}%", + style: const TextStyle(fontSize: 14), + ), + Text( + text.less_than_avg, + style: const TextStyle(fontSize: 8), + ), + ], + ), ); }, ); diff --git a/lib/views/record/record.dart b/lib/views/record/record.dart index ab54b21..8ea7fdd 100644 --- a/lib/views/record/record.dart +++ b/lib/views/record/record.dart @@ -101,7 +101,10 @@ class _MyRecordPageState extends State { backgroundColor: rose, actions: [ TextButton( - child: Text(text.what_is_premium), + child: Text( + text.what_is_premium, + style: const TextStyle(color: green), + ), onPressed: () {}, ), TextButton( diff --git a/pubspec.yaml b/pubspec.yaml index 162a808..53f4ba7 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -15,7 +15,7 @@ publish_to: "none" # Remove this line if you wish to publish to pub.dev # In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion. # Read more about iOS versioning at # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html -version: 1.0.112 +version: 1.0.116 environment: sdk: ">=2.12.0 <3.0.0"