Skip to content

Commit

Permalink
chore: bump flutter to 3.22
Browse files Browse the repository at this point in the history
  • Loading branch information
evan361425 committed May 18, 2024
1 parent 03a1eea commit fba6fe0
Show file tree
Hide file tree
Showing 30 changed files with 407 additions and 307 deletions.
14 changes: 6 additions & 8 deletions .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
contact_links:
- name: ❗ 安全性問題
url: https://zh.wikipedia.org/wiki/负责任的披露
about:
不要透過 issue 或公開討論說明任何安全性問題。嘗試透過私密方式和團隊負責人聯絡,例如信箱([email protected])。
我們會一起討論和解決這類問題,感謝!
- name: 👻 其他
url: https://github.com/evan361425/flutter-pos-system/discussions
about: 其他所有問題都可以提出來討論
- name: ❗ 安全性問題
url: https://zh.wikipedia.org/wiki/负责任的披露
about: 不要透過 issue 或公開討論說明任何安全性問題。嘗試透過私密方式和團隊負責人聯絡,例如信箱([email protected])。 我們會一起討論和解決這類問題,感謝!
- name: 👻 其他
url: https://github.com/evan361425/flutter-pos-system/discussions
about: 其他所有問題都可以提出來討論
54 changes: 27 additions & 27 deletions .github/ISSUE_TEMPLATE/feature-request.yml
Original file line number Diff line number Diff line change
@@ -1,32 +1,32 @@
name: 💡 功能提議
description: 對於 POS系統 提供建議或想法
labels:
- "enhancement"
- "enhancement"
body:
- type: textarea
id: expected
attributes:
label: 你預期這功能長什麼樣子?
description: 怎麼操作,怎麼呈現。
validations:
- type: textarea
id: expected
attributes:
label: 你預期這功能長什麼樣子?
description: 怎麼操作,怎麼呈現。
validations:
required: true
- type: textarea
id: problems
attributes:
label: 這個功能是和你遇到的問題有關?
description: 每次想要... 就發現不能...
- type: textarea
id: alternative
attributes:
label: 沒有這功能時,你都怎麼做?
- type: textarea
id: more
attributes:
label: 任何想要補充的。
- type: checkboxes
id: checks
attributes:
label: 開新的 issue 前
options:
- label: 我有檢查其他 [issue](https://github.com/evan361425/flutter-pos-system/issues) 了
required: true
- type: textarea
id: problems
attributes:
label: 這個功能是和你遇到的問題有關?
description: 每次想要... 就發現不能...
- type: textarea
id: alternative
attributes:
label: 沒有這功能時,你都怎麼做?
- type: textarea
id: more
attributes:
label: 任何想要補充的。
- type: checkboxes
id: checks
attributes:
label: 開新的 issue 前
options:
- label: 我有檢查其他 [issue](https://github.com/evan361425/flutter-pos-system/issues) 了
required: true
50 changes: 25 additions & 25 deletions .github/ISSUE_TEMPLATE/user-experience.yml
Original file line number Diff line number Diff line change
@@ -1,30 +1,30 @@
name: 😺 使用者體驗
description: POS系統目前哪裡不好用
labels:
- "ux"
- "ux"
body:
- type: textarea
id: feature
attributes:
label: 哪個功能不好用
description: 哪個頁面的功能,為什麼不好用?
validations:
- type: textarea
id: feature
attributes:
label: 哪個功能不好用
description: 哪個頁面的功能,為什麼不好用?
validations:
required: true
- type: textarea
id: expected
attributes:
label: 你預期這功能長什麼樣子?
description: 怎麼操作,怎麼呈現。
validations:
required: true
- type: textarea
id: more
attributes:
label: 任何想要補充的。
- type: checkboxes
id: checks
attributes:
label: 開新的 issue 前
options:
- label: 我有檢查其他 [issue](https://github.com/evan361425/flutter-pos-system/issues) 了
required: true
- type: textarea
id: expected
attributes:
label: 你預期這功能長什麼樣子?
description: 怎麼操作,怎麼呈現。
validations:
required: true
- type: textarea
id: more
attributes:
label: 任何想要補充的。
- type: checkboxes
id: checks
attributes:
label: 開新的 issue 前
options:
- label: 我有檢查其他 [issue](https://github.com/evan361425/flutter-pos-system/issues) 了
required: true
4 changes: 2 additions & 2 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
## Issue

- enter your issue number here (with the hashtag `#`)
- enter your issue number here (with the hashtag `#`)

## Altered code

- enter how your new code works in this PR.
- enter how your new code works in this PR.
6 changes: 1 addition & 5 deletions .github/no-response.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,4 @@ daysUntilClose: 14
responseRequiredLabel: more-information-needed
# Comment to post when closing an Issue for lack of response. Set to `false` to disable
closeComment: >
This issue has been automatically closed because there has been no response
to our request for more information from the original author. With only the
information that is currently in the issue, we don't have enough information
to take action. Please reach out if you have or find the answers we need so
that we can investigate further.
This issue has been automatically closed because there has been no response to our request for more information from the original author. With only the information that is currently in the issue, we don't have enough information to take action. Please reach out if you have or find the answers we need so that we can investigate further.
22 changes: 11 additions & 11 deletions .github/settings.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,14 @@ repository:
has_downloads: true

labels:
- name: help wanted
oldname: help-wanted
color: 0e8a16
- name: more-information-needed
color: d93f0b
- name: bug
color: b60205
- name: enhancement
color: 1d76db
- name: good first issue
color: 5319e7
- name: help wanted
oldname: help-wanted
color: 0e8a16
- name: more-information-needed
color: d93f0b
- name: bug
color: b60205
- name: enhancement
color: 1d76db
- name: good first issue
color: 5319e7
8 changes: 3 additions & 5 deletions .github/stale.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,17 +8,15 @@ daysUntilClose: 7

# Issues or Pull Requests with these labels will never be considered stale
exemptLabels:
- pinned
- security
- pinned
- security

# Label to use when marking as stale
staleLabel: wontfix

# Comment to post when marking as stale. Set to `false` to disable
markComment: >
This issue has been automatically marked as stale because it has not had
recent activity. It will be closed if no further activity occurs. Thank you
for your contributions.
This issue has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs. Thank you for your contributions.
# Comment to post when closing a stale Issue or Pull Request. Set to `false` to disable
closeComment: false
# Limit to only `issues` or `pulls`
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/deploy-to-playstore.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ jobs:
- name: Set up Flutter
uses: subosito/flutter-action@v2
with:
flutter-version: "3.19.x"
flutter-version: "3.22.x"
cache: true
channel: "stable"

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release-candidate.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ jobs:
- name: Set up Flutter
uses: subosito/flutter-action@v2
with:
flutter-version: "3.19.x"
flutter-version: "3.22.x"
cache: true
channel: "stable"

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:
# Setup the flutter environment.
- uses: subosito/flutter-action@v2
with:
flutter-version: "3.19.x"
flutter-version: "3.22.x"
cache: true
channel: "stable"

Expand Down
2 changes: 1 addition & 1 deletion lib/components/loading_wrapper.dart
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ class LoadingWrapperState extends State<LoadingWrapper> {
if (_isLoading)
Positioned.fill(
child: Container(
color: Theme.of(context).colorScheme.background.withAlpha(30),
color: Theme.of(context).colorScheme.surface.withAlpha(30),
child: Column(
mainAxisAlignment: MainAxisAlignment.center,
children: [
Expand Down
2 changes: 1 addition & 1 deletion lib/components/style/image_holder.dart
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ class ImageHolder extends StatelessWidget {

@override
Widget build(BuildContext context) {
final color = Theme.of(context).colorScheme.background;
final color = Theme.of(context).colorScheme.surface;
final textColor = Theme.of(context).textTheme.bodyMedium!.color;
final colors = [color, color.withAlpha(180), color.withAlpha(10)];

Expand Down
8 changes: 4 additions & 4 deletions lib/l10n/app_en.arb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"@@locale": "en",
"@@last_modified": "2024-05-18T08:05:55.647664Z",
"@@last_modified": "2024-05-18T10:48:03.044199Z",
"@@author": "Lu Shueh Chou",
"settingTab": "Settings",
"settingVersion": "Version: {version}",
Expand Down Expand Up @@ -493,7 +493,7 @@
"transitGSErrorCreateSpreadsheetHelper": "Don't worry, it's usually easy to solve!\nPossible reasons include:\n• Unstable network conditions;\n• POS system not authorized to edit spreadsheets.",
"transitGSErrorSpreadsheetEmpty": "Please Select a Spreadsheet First",
"transitGSErrorSpreadsheetIdEmpty": "Cannot be Empty",
"transitGSErrorSpreadsheetIdInvalid": "Invalid text. It must include:\n/spreadsheets/d/<ID>/\nOr provide the ID directly (combination of letters, numbers, underscores, and hyphens).",
"transitGSErrorSpreadsheetIdInvalid": "Invalid text. It must include:\n/spreadsheets/d/<ID>/\n• Or provide the ID directly (combination of letters, numbers, underscores, and hyphens).",
"transitGSErrorCreateSheet": "Unable to Create Sheet in Spreadsheet",
"transitGSErrorCreateSheetHelper": "Don't worry, it's usually easy to solve!\nPossible reasons include:\n• Unstable network conditions;\n• POS system not authorized to create sheets;\n• Misspelled spreadsheet ID, try copying the entire URL and pasting it;\n• The spreadsheet has been deleted.",
"transitGSErrorSheetRepeat": "Sheet name duplicate",
Expand Down Expand Up @@ -1151,7 +1151,7 @@
"@orderAttributeModeName": {
"description": "name"
},
"orderAttributeModeHelper": "{name, select, statOnly{Normal setting, selecting won't affect the order price.} changePrice{Selecting this setting may affect the order price.\nFor example: Takeout +$30, Eco Cup -$5.\n} changeDiscount{Selecting this setting will affect the total price based on the discount.\nFor example: Dine-in +10% service charge, Friends & Family Discount -10%.\n} other{UNKNOWN}}",
"orderAttributeModeHelper": "{name, select, statOnly{Normal setting, selecting won't affect the order price.} changePrice{Selecting this setting may affect the order price.\nFor example: Takeout +$30, Eco Cup -$5.} changeDiscount{Selecting this setting will affect the total price based on the discount.\nFor example: Dine-in +10% service charge, Friends & Family Discount -10%.} other{UNKNOWN}}",
"@orderAttributeModeHelper": {
"description": "Explanation of customer setting categories",
"placeholders": {
Expand Down Expand Up @@ -1348,7 +1348,7 @@
"menuIngredientSearchErrorEmpty": "Ingredient must be set, please click to set.",
"menuIngredientSearchErrorRepeat": "Product already has the same ingredient, cannot select repeatedly.",
"menuIngredientAmountLabel": "Amount Used",
"menuIngredientAmountHelper": "Default amount used.\nIf customers are able to adjust the amount,\nset different quantities in \"Quantity.\"\n",
"menuIngredientAmountHelper": "Default amount used.\nIf customers are able to adjust the amount,\nset different quantities in \"Quantity.\"",
"menuQuantityTitleCreate": "Add Quantity",
"menuQuantityTitleUpdate": "Edit Quantity",
"menuQuantityMetaAmount": "Amount: {amount}",
Expand Down
8 changes: 4 additions & 4 deletions lib/l10n/app_zh.arb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"@@locale": "zh",
"@@last_modified": "2024-05-18T08:05:55.671229Z",
"@@last_modified": "2024-05-18T10:48:03.067210Z",
"@@author": "Lu Shueh Chou",
"settingTab": "設定",
"settingVersion": "版本:{version}",
Expand Down Expand Up @@ -493,7 +493,7 @@
"transitGSErrorCreateSpreadsheetHelper": "別擔心,通常都可以簡單解決!\n可能的原因有:\n• 網路狀況不穩;\n• 尚未授權 POS 系統進行表單的編輯。",
"transitGSErrorSpreadsheetEmpty": "請先選擇試算表",
"transitGSErrorSpreadsheetIdEmpty": "不能為空",
"transitGSErrorSpreadsheetIdInvalid": "不合法的文字,必須包含:\n/spreadsheets/d/<ID>/\n或者直接給 ID(英文+數字+底線+減號的組合)",
"transitGSErrorSpreadsheetIdInvalid": "不合法的文字,必須包含:\n/spreadsheets/d/<ID>/\n• 或者直接給 ID(英文+數字+底線+減號的組合)",
"transitGSErrorCreateSheet": "無法在試算表中建立表單",
"transitGSErrorCreateSheetHelper": "別擔心,通常都可以簡單解決!\n可能的原因有:\n• 網路狀況不穩;\n• 尚未授權 POS 系統進行表單的建立;\n• 試算表 ID 打錯了,請嘗試複製整個網址後貼上;\n• 該試算表被刪除了。",
"transitGSErrorSheetRepeat": "表單名稱重複",
Expand Down Expand Up @@ -976,7 +976,7 @@
"@dialogDeletionTitle": {
"description": "Title displayed on the DeleteDialog."
},
"dialogDeletionContent": "確定要刪除「{name}」嗎?\n\n{more}此動作將無法復原!\n",
"dialogDeletionContent": "確定要刪除「{name}」嗎?\n\n{more}此動作將無法復原!",
"@dialogDeletionContent": {
"description": "Content displayed on the DeleteDialog.",
"placeholders": {
Expand Down Expand Up @@ -1151,7 +1151,7 @@
"@orderAttributeModeName": {
"description": "name"
},
"orderAttributeModeHelper": "{name, select, statOnly{一般的設定,選取時並不會影響點單價格。} changePrice{選取設定時,可能會影響價格。\n例如:外送 + 30塊錢、環保杯 - 5塊錢。\n} changeDiscount{選取設定時,會根據折扣影響總價。\n例如:內用 + 10% 服務費、親友價 - 10%。\n} other{UNKNOWN}}",
"orderAttributeModeHelper": "{name, select, statOnly{一般的設定,選取時並不會影響點單價格。} changePrice{選取設定時,可能會影響價格。\n例如:外送 + 30塊錢、環保杯 - 5塊錢。} changeDiscount{選取設定時,會根據折扣影響總價。\n例如:內用 + 10% 服務費、親友價 - 10%。} other{UNKNOWN}}",
"@orderAttributeModeHelper": {
"description": "Explanation of customer setting categories",
"placeholders": {
Expand Down
2 changes: 1 addition & 1 deletion lib/ui/analysis/history_page.dart
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ class _HistoryPageState extends State<HistoryPage> {
return Column(children: [
PhysicalModel(
elevation: 5,
color: Theme.of(context).colorScheme.background,
color: Theme.of(context).colorScheme.surface,
shadowColor: Colors.transparent,
child: _buildCalendar(isPortrait: true),
),
Expand Down
8 changes: 4 additions & 4 deletions lib/ui/home/setting_view.dart
Original file line number Diff line number Diff line change
Expand Up @@ -206,10 +206,10 @@ class _HeaderInfoList extends StatelessWidget {
return ElevatedButton(
key: Key('setting_header.$id'),
style: const ButtonStyle(
fixedSize: MaterialStatePropertyAll(Size.square(128)),
padding: MaterialStatePropertyAll(EdgeInsets.zero),
// shadowColor: MaterialStatePropertyAll(Colors.transparent),
shape: MaterialStatePropertyAll(RoundedRectangleBorder(
fixedSize: WidgetStatePropertyAll(Size.square(128)),
padding: WidgetStatePropertyAll(EdgeInsets.zero),
// shadowColor: WidgetStatePropertyAll(Colors.transparent),
shape: WidgetStatePropertyAll(RoundedRectangleBorder(
borderRadius: borderRadius,
side: BorderSide(color: Colors.transparent),
)),
Expand Down
2 changes: 1 addition & 1 deletion lib/ui/order/order_checkout_page.dart
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ class _OrderDetailsPageState extends State<OrderDetailsPage> with SingleTickerPr
TextButton(
key: const Key('order.details.stash'),
style: ButtonStyle(
foregroundColor: MaterialStatePropertyAll(
foregroundColor: WidgetStatePropertyAll(
theme.textTheme.bodyMedium!.color,
),
),
Expand Down
2 changes: 1 addition & 1 deletion lib/ui/order/widgets/draggable_sheet_view.dart
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ class _DraggableSheetViewState extends State<DraggableSheetView> {
crossAxisAlignment: CrossAxisAlignment.stretch,
children: [
ColoredBox(
color: Theme.of(context).colorScheme.background,
color: Theme.of(context).colorScheme.surface,
child: widget.row1,
),
Expanded(
Expand Down
6 changes: 3 additions & 3 deletions lib/ui/order/widgets/orientated_view.dart
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ class OrientatedView extends StatelessWidget {
crossAxisAlignment: CrossAxisAlignment.stretch,
children: [
ColoredBox(
color: Theme.of(context).colorScheme.background,
color: Theme.of(context).colorScheme.surface,
child: row1,
),
Expanded(child: row2),
Expand Down Expand Up @@ -67,7 +67,7 @@ class OrientatedView extends StatelessWidget {
crossAxisAlignment: CrossAxisAlignment.stretch,
children: [
ColoredBox(
color: Theme.of(context).colorScheme.background,
color: Theme.of(context).colorScheme.surface,
child: row1,
),
Expanded(child: row2),
Expand All @@ -83,7 +83,7 @@ class OrientatedView extends StatelessWidget {
shape: const RoundedRectangleBorder(
borderRadius: BorderRadius.all(Radius.circular(6.0)),
),
color: Theme.of(context).colorScheme.background,
color: Theme.of(context).colorScheme.surface,
child: Column(
crossAxisAlignment: CrossAxisAlignment.stretch,
children: [
Expand Down
Loading

0 comments on commit fba6fe0

Please sign in to comment.