Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Sync up for release #791

Merged
merged 4 commits into from
May 14, 2024
Merged

Sync up for release #791

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a47e12e
Disabled checkbox from update expenses for paid bill
Hari-egov May 8, 2024
fe05fc1
Disabled checkbox from update expenses for paid bill ( #789 )
anilsingha-eGov May 9, 2024
fa641fa
WhatsApp Share Logo Alignment Issue Fixed
Hari-egov May 10, 2024
df740c1
Household Register WhatsApp Share Allignment Issue FIx (#790 )
anilsingha-eGov May 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions frontend/mgramseva/lib/screeens/add_expense/expense_details.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -489,15 +489,18 @@ class _ExpenseDetailsState extends State<ExpenseDetails> {
height: 20,
child: Checkbox(
value: expensesDetailsProvider.expenditureDetails.isBillCancelled,
onChanged: expensesDetailsProvider
.onChangeOfCheckBox),
onChanged:
expensesDetailsProvider.expenditureDetails.allowEdit == true ?
expensesDetailsProvider
.onChangeOfCheckBox : null ) ,
),
Text(
ApplicationLocalizations.of(context)
.translate(i18.expense
.MARK_BILL_HAS_CANCELLED),
style: TextStyle(
fontSize: 19,
color: expensesDetailsProvider.expenditureDetails.allowEdit == true ? Colors.black: Colors.grey,
fontWeight: FontWeight.normal))
],
),
Expand Down
36 changes: 27 additions & 9 deletions frontend/mgramseva/lib/screeens/household_register/household_register.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:flutter/widgets.dart';
import 'package:flutter_focus_watcher/flutter_focus_watcher.dart';
import 'package:mgramseva/components/household_register/household_card.dart';
import 'package:mgramseva/providers/household_register_provider.dart';
Expand Down Expand Up @@ -44,6 +46,7 @@ class _HouseholdRegister extends State<HouseholdRegister>

@override
Widget build(BuildContext context) {
Size size = MediaQuery.of(context).size;
var householdRegisterProvider =
Provider.of<HouseholdRegisterProvider>(context, listen: false);

Expand Down Expand Up @@ -76,14 +79,25 @@ class _HouseholdRegister extends State<HouseholdRegister>
child: CustomScrollView(slivers: [
SliverList(
delegate: SliverChildListDelegate([
Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
HomeBack(),
Row(
mainAxisAlignment: MainAxisAlignment.end,
children: [_buildDownload, _buildShare])
],
SizedBox(
width: size.width,
child: Row(
children: [
HomeBack(),
Expanded(
child: Row(
mainAxisAlignment: MainAxisAlignment.end,
children: [
Expanded(
child: Align(
alignment: Alignment.centerRight,
child: _buildDownload)),
_buildShare
],
),
)
],
),
),
Container(key: key, child: HouseholdCard()),
])),
Expand Down Expand Up @@ -130,7 +144,11 @@ class _HouseholdRegister extends State<HouseholdRegister>
onPressed: () => showDownloadList(Constants.DOWNLOAD_OPTIONS, context),
icon: Icon(Icons.download_sharp),
label: Text(
ApplicationLocalizations.of(context).translate(i18.common.DOWNLOAD)));
ApplicationLocalizations.of(context).translate(i18.common.DOWNLOAD),
maxLines: 1,
softWrap: false,
overflow: TextOverflow.ellipsis,
));
}

showDownloadList(List<String> result, BuildContext context) {
Expand Down
Loading