Skip to content

Commit

Permalink
changes
Browse files Browse the repository at this point in the history
  • Loading branch information
小滋润 committed Oct 27, 2024
1 parent 7259454 commit cdc0bc4
Show file tree
Hide file tree
Showing 5 changed files with 32 additions and 25 deletions.
9 changes: 1 addition & 8 deletions .github/workflows/push-tag.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
SERVER_SIGN_KEY: ${{ secrets.SERVER_SIGN_KEY }}
1 change: 0 additions & 1 deletion docker-compose.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
version: "3.3"
services:
build_apk:
image: xiaozirun/leap-ledger-app:v1.0.0
build:
context: .
dockerfile: docker/Dockerfile
Expand Down
4 changes: 1 addition & 3 deletions docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,4 @@ WORKDIR /app

COPY . /app

RUN flutter doctor -v

RUN gradle build --no-daemon
RUN flutter doctor -v
1 change: 1 addition & 0 deletions lib/view/transaction/import/transaction_import.dart
Original file line number Diff line number Diff line change
@@ -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';
Expand Down
42 changes: 29 additions & 13 deletions lib/view/transaction/import/widget/hand_fail_dialog.dart
Original file line number Diff line number Diff line change
Expand Up @@ -23,18 +23,21 @@ class _HandFailDialogState extends State<HandFailDialog> {
child: BlocProvider.value(
value: _cubit,
child: AlertDialog(
content: Column(
mainAxisSize: MainAxisSize.min,
children: [
BlocListener<ImportCubit, ImportState>(
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<ImportCubit, ImportState>(
listener: (context, state) {
if (state is ProgressingFailTransChanged)
setState(() {});
else if (state is FailTransProgressFinished) Navigator.pop(context);
},
child: _buildContent(),
),
],
),
),
actions: [
TextButton(
Expand Down Expand Up @@ -110,7 +113,20 @@ class _HandFailDialogState extends State<HandFailDialog> {
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,
))
],
);
}
}

0 comments on commit cdc0bc4

Please sign in to comment.