xt / Flutter-ReserveApp · Commits

Go to a project

Commit 3a70d60a79b8c801a3d7c5babe7a2b5e63b2f8cc

Authored by wdn127929
2 parents 2af48744 9e21d936
build: skipped

冲突

Inline Side-by-side
Showing 2 changed files with 30 additions and 30 deletions
... ... @@ -12,14 +12,14 @@ if (flutterRoot == null) {
}
def flutterVersionCode = "354"
def flutterVersionCode = "355"
if (flutterVersionCode == null) {
flutterVersionCode = '354'
flutterVersionCode = '355'
}
def flutterVersionName = "3.5.4"
def flutterVersionName = "3.5.5"
if (flutterVersionName == null) {
flutterVersionName = '3.5.4'
flutterVersionName = '3.5.5'
}
apply plugin: 'com.android.application'
apply plugin: 'kotlin-android'
... ...
... ... @@ -2445,32 +2445,32 @@ class InvicationPageState extends State<InvicationPage>
}
},
)),
Positioned(
top: 0,
right: 0,
child: Container(
// padding: EdgeInsets.symmetric(horizontal: ScreenUtil().setWidth(16),vertical: ScreenUtil().setWidth(4)),
padding:
EdgeInsets.only(bottom: ScreenUtil().setWidth(6)),
alignment: Alignment.center,
width: ScreenUtil().setWidth(62 * 2),
height: ScreenUtil().setWidth(42),
decoration: BoxDecoration(
// color: Colors.red,
image: DecorationImage(
image: ExactAssetImage(
Utils.getImgPath('sms_bg'),
),
fit: BoxFit.cover,
),
),
child: Text(
'免费短信',
style: TextStyle(
color: MyColours.color_fefefe,
fontSize: ScreenUtil().setSp(24)),
)),
)
// Positioned(
// top: 0,
// right: 0,
// child: Container(
// // padding: EdgeInsets.symmetric(horizontal: ScreenUtil().setWidth(16),vertical: ScreenUtil().setWidth(4)),
// padding:
// EdgeInsets.only(bottom: ScreenUtil().setWidth(6)),
// alignment: Alignment.center,
// width: ScreenUtil().setWidth(62 * 2),
// height: ScreenUtil().setWidth(42),
// decoration: BoxDecoration(
// // color: Colors.red,
// image: DecorationImage(
// image: ExactAssetImage(
// Utils.getImgPath('sms_bg'),
// ),
// fit: BoxFit.cover,
// ),
// ),
// child: Text(
// '免费短信',
// style: TextStyle(
// color: MyColours.color_fefefe,
// fontSize: ScreenUtil().setSp(24)),
// )),
// )
])
])),
],
... ...