Merge branch 'mirza_home_page' into development_new_design_2.0

merge-update-with-lab-changes
Mirza.Shafique 5 years ago
commit c23478b838

@ -9,7 +9,9 @@ import 'package:diplomaticquarterapp/uitl/utils.dart';
import 'package:diplomaticquarterapp/uitl/utils_new.dart'; import 'package:diplomaticquarterapp/uitl/utils_new.dart';
import 'package:diplomaticquarterapp/widgets/buttons/defaultButton.dart'; import 'package:diplomaticquarterapp/widgets/buttons/defaultButton.dart';
import 'package:diplomaticquarterapp/widgets/buttons/secondary_button.dart'; import 'package:diplomaticquarterapp/widgets/buttons/secondary_button.dart';
import 'package:diplomaticquarterapp/widgets/dragable_sheet.dart';
import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart'; import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart';
import 'package:diplomaticquarterapp/widgets/photo_view_page.dart';
import 'package:flutter/cupertino.dart'; import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
@ -32,6 +34,7 @@ class NewCMCStepOnePage extends StatefulWidget {
class _NewCMCStepOnePageState extends State<NewCMCStepOnePage> { class _NewCMCStepOnePageState extends State<NewCMCStepOnePage> {
int selectedItem = 0; int selectedItem = 0;
@override @override
void initState() { void initState() {
super.initState(); super.initState();
@ -105,10 +108,34 @@ class _NewCMCStepOnePageState extends State<NewCMCStepOnePage> {
return mDivider(Colors.grey); return mDivider(Colors.grey);
}, },
itemCount: widget.model.cmcAllServicesList.length), itemCount: widget.model.cmcAllServicesList.length),
Stack(
children: [
Image.asset( Image.asset(
projectViewModel.isArabic ? "assets/images/cc_ar.png" : "assets/images/cc_en.png", projectViewModel.isArabic ? "assets/images/cc_ar.png" : "assets/images/cc_en.png",
width: double.infinity, width: double.infinity,
), ),
Align(
alignment: Alignment.topRight,
child: Container(
decoration: containerColorRadiusBorder(
Colors.black.withOpacity(0.2),
1000,
Colors.white,
),
margin: EdgeInsets.all(12),
child: IconButton(
icon: Icon(
Icons.view_carousel_rounded,
color: Colors.white,
),
onPressed: () {
showDraggableDialog(context, PhotoViewPage(projectViewModel.isArabic ? "assets/images/cc_ar.png" : "assets/images/cc_en.png"));
},
),
),
),
],
),
// Card( // Card(
// shape: cardRadius(12), // shape: cardRadius(12),
// elevation: 4, // elevation: 4,

@ -0,0 +1,51 @@
import 'package:diplomaticquarterapp/uitl/utils_new.dart';
import 'package:flutter/material.dart';
import 'package:photo_view/photo_view.dart';
class PhotoViewPage extends StatelessWidget {
String image;
PhotoViewPage(this.image);
@override
Widget build(BuildContext context) {
return Scaffold(
body: Container(
width: double.infinity,
height: double.infinity,
child: Stack(
children: [
Align(
alignment: Alignment.center,
child: PhotoView(
imageProvider: AssetImage(image),
),
),
Align(
alignment: Alignment.topRight,
child: SafeArea(
child: Container(
decoration: containerColorRadiusBorder(
Colors.black.withOpacity(0.2),
1000,
Colors.white,
),
margin: EdgeInsets.all(12),
child: IconButton(
icon: Icon(
Icons.close,
color: Colors.white,
),
onPressed: () {
Navigator.pop(context);
},
),
),
),
),
],
),
),
);
}
}

@ -71,6 +71,7 @@ dependencies:
#GIF image #GIF image
flutter_gifimage: ^1.0.1 flutter_gifimage: ^1.0.1
photo_view: any
# flutter_webrtc: any # flutter_webrtc: any
# UI Reqs # UI Reqs

Loading…
Cancel
Save