xjw/circle_app
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/1.1.1' into android_1.0.1

Browse Source
This commit is contained in:
yangyuhao 2023-08-25 13:22:57 +07:00
commit cac1567753
2 changed files with 268 additions and 271 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
circle_app/lib/app/invite/share.dart
View File

@ -37,14 +37,12 @@ class _ShareState extends State<Share> {
return Scaffold( return Scaffold(
backgroundColor: Colors.transparent, backgroundColor: Colors.transparent,
body: Container( body: Container(
child: Stack( child: Column(
alignment: Alignment.center,
children: [ children: [
Positioned( Expanded(child: Container()),
top: 84.sp, Container(
child: Container(
width: Get.width - 40.sp, width: Get.width - 40.sp,
height: Get.height - 84.sp - Get.bottomBarHeight - 164.sp - 10.sp, // height: Get.height - Get.bottomBarHeight - 164.sp - 10.sp,
child:SingleChildScrollView( child:SingleChildScrollView(
child: RepaintBoundary( child: RepaintBoundary(
key: _globalKey, key: _globalKey,
@ -60,7 +58,7 @@ class _ShareState extends State<Share> {
Container( Container(
width: Get.width, width: Get.width,
height: 65.sp, height: 65.sp,
margin: EdgeInsets.only(left: 15.sp, top: 20.sp), margin: EdgeInsets.only(left: 15.sp, top: 20.sp,right: 15.sp),
child: Row( child: Row(
children: [ children: [
Center( Center(
@ -106,8 +104,8 @@ class _ShareState extends State<Share> {
), ),
Image.asset( Image.asset(
getBaseImage("ic_launcher"), getBaseImage("ic_launcher"),
width: 80.sp, width: 65.sp,
height: 80.sp, height: 65.sp,
) )
], ],
), ),
@ -121,7 +119,7 @@ class _ShareState extends State<Share> {
child: Column( child: Column(
children: [ children: [
SizedBox( SizedBox(
height: 20.sp, height: 5.sp,
), ),
Container( Container(
padding: EdgeInsets.only(left: 15.sp,right: 15.sp), padding: EdgeInsets.only(left: 15.sp,right: 15.sp),
@ -141,7 +139,7 @@ class _ShareState extends State<Share> {
), ),
), ),
Container( Container(
height: 90.sp, // height: 90.sp,
// color: Color(0xFF334141), // color: Color(0xFF334141),
alignment: Alignment.center, alignment: Alignment.center,
// color: Colors.yellow, // color: Colors.yellow,
@ -166,7 +164,7 @@ class _ShareState extends State<Share> {
'专属邀请码', '专属邀请码',
style: TextStyle( style: TextStyle(
color: Colors.white, color: Colors.white,
fontSize: 16.sp), fontSize: 18.sp),
), ),
SizedBox( SizedBox(
width: 8.sp, width: 8.sp,
@ -209,7 +207,7 @@ class _ShareState extends State<Share> {
'扫码或长按识别下载APP，认识更多小众圈子里的人，给生活带来更多乐趣～', '扫码或长按识别下载APP，认识更多小众圈子里的人，给生活带来更多乐趣～',
style: TextStyle( style: TextStyle(
color: Colors.white, color: Colors.white,
fontSize: 12.sp)), fontSize: 15.sp)),
) )
], ],
), ),
@ -242,10 +240,7 @@ class _ShareState extends State<Share> {
)) ))
), ),
), ),
), SafeArea(
Positioned(
bottom: 0,
child: SafeArea(
top: false, top: false,
child: Container( child: Container(
height: 164.sp, height: 164.sp,
@ -299,7 +294,7 @@ class _ShareState extends State<Share> {
) )
], ],
), ),
))) ))
], ],
), ),
), ),

2
circle_app/lib/app/minefragment/view.dart
View File

@ -52,6 +52,7 @@ class MinefragmentPage extends StatelessWidget {
left: 11.sp, left: 11.sp,
right: 11.sp, right: 11.sp,
), ),
child: SingleChildScrollView(
child: Column( child: Column(
children: [ children: [
_buildAvatarRow(logic), _buildAvatarRow(logic),
@ -77,6 +78,7 @@ class MinefragmentPage extends StatelessWidget {
), ),
), ),
), ),
),
); );
}); });
} }