diff --git a/.github/workflows/push-tag.yml b/.github/workflows/push-tag.yml index da2e5575..86cafdcc 100644 --- a/.github/workflows/push-tag.yml +++ b/.github/workflows/push-tag.yml @@ -14,11 +14,4 @@ jobs: server_host: ${{ vars.SERVER_HOST }} server_port: ${{ vars.SERVER_PORT }} secrets: - SERVER_SIGN_KEY: ${{ secrets.SERVER_SIGN_KEY }} - push-image: - uses: ./.github/workflows/common-push-image.yml - with: - tag: ${{ github.ref_name }} - secrets: - DOCKER_HUB_USERNAME: ${{ secrets.DOCKER_HUB_USERNAME }} - DOCKER_HUB_ACCESS_TOKEN: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }} \ No newline at end of file + SERVER_SIGN_KEY: ${{ secrets.SERVER_SIGN_KEY }} \ No newline at end of file diff --git a/docker-compose.yaml b/docker-compose.yaml index 91a2e00e..e768a992 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -1,7 +1,6 @@ version: "3.3" services: build_apk: - image: xiaozirun/leap-ledger-app:v1.0.0 build: context: . dockerfile: docker/Dockerfile diff --git a/docker/Dockerfile b/docker/Dockerfile index b21a028d..5447206c 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -8,6 +8,4 @@ WORKDIR /app COPY . /app -RUN flutter doctor -v - -RUN gradle build --no-daemon \ No newline at end of file +RUN flutter doctor -v \ No newline at end of file diff --git a/lib/view/transaction/import/transaction_import.dart b/lib/view/transaction/import/transaction_import.dart index 5df43bf0..4d3364ea 100644 --- a/lib/view/transaction/import/transaction_import.dart +++ b/lib/view/transaction/import/transaction_import.dart @@ -1,5 +1,6 @@ import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; +import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:intl/intl.dart'; import 'package:leap_ledger_app/common/global.dart'; import 'package:leap_ledger_app/model/account/model.dart'; diff --git a/lib/view/transaction/import/widget/hand_fail_dialog.dart b/lib/view/transaction/import/widget/hand_fail_dialog.dart index fed6dd7d..c840a404 100644 --- a/lib/view/transaction/import/widget/hand_fail_dialog.dart +++ b/lib/view/transaction/import/widget/hand_fail_dialog.dart @@ -23,18 +23,21 @@ class _HandFailDialogState extends State { child: BlocProvider.value( value: _cubit, child: AlertDialog( - content: Column( - mainAxisSize: MainAxisSize.min, - children: [ - BlocListener( - listener: (context, state) { - if (state is ProgressingFailTransChanged) - setState(() {}); - else if (state is FailTransProgressFinished) Navigator.pop(context); - }, - child: _buildContent(), - ), - ], + content: SizedBox( + width: 300.w, + child: Column( + mainAxisSize: MainAxisSize.min, + children: [ + BlocListener( + listener: (context, state) { + if (state is ProgressingFailTransChanged) + setState(() {}); + else if (state is FailTransProgressFinished) Navigator.pop(context); + }, + child: _buildContent(), + ), + ], + ), ), actions: [ TextButton( @@ -110,7 +113,20 @@ class _HandFailDialogState extends State { return Row( mainAxisSize: MainAxisSize.max, mainAxisAlignment: MainAxisAlignment.spaceBetween, - children: [Text(labal), Text(content)], + children: [ + Padding( + padding: EdgeInsets.all(Constant.margin), + child: Text(labal), + ), + Padding( + padding: EdgeInsets.all(Constant.margin), + child: Text( + content, + maxLines: 3, + softWrap: true, + overflow: TextOverflow.ellipsis, + )) + ], ); } }