From b21d7889c36b4baed0a013b600f3cac58fefed9f Mon Sep 17 00:00:00 2001 From: kicap Date: Sat, 3 Feb 2024 20:00:11 +0800 Subject: [PATCH] again --- .env | 12 +-- ios/Runner.xcodeproj/project.pbxproj | 11 ++- lib/ui/views/login_user/login_user_view.dart | 6 +- .../detail_makanan/detail_makanan_view.dart | 85 ++++++++++--------- 4 files changed, 63 insertions(+), 51 deletions(-) diff --git a/.env b/.env index 1e1f0fb..e1fdc4e 100644 --- a/.env +++ b/.env @@ -2,12 +2,12 @@ # api_url = 'https://panti-asuhan.s-keytech.com/api/' # # url = 'http://172.29.85.181/panti_asuhan2/' # # api_url = 'http://172.29.85.181/panti_asuhan2/api/' -# url = 'http://20.20.20.25:3001/' -# table_url = 'http://20.20.20.25:3001/table' -# api_url = 'http://20.20.20.25:3001/table' +url = 'http://20.20.20.25:3001/' +table_url = 'http://20.20.20.25:3001/table' +api_url = 'http://20.20.20.25:3001/table' # url = 'http://192.168.20.232:3001/' # table_url = 'http://192.168.20.232:3001/table' # api_url = 'http://192.168.20.232:3001/table' -url = 'https://reza_backend.kicap-karan.com/' -table_url = 'https://reza_backend.kicap-karan.com/table' -api_url = 'https://reza_backend.kicap-karan.com/table' \ No newline at end of file +# url = 'https://reza_backend.kicap-karan.com/' +# table_url = 'https://reza_backend.kicap-karan.com/table' +# api_url = 'https://reza_backend.kicap-karan.com/table' \ No newline at end of file diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj index c96c6d1..4cb543c 100644 --- a/ios/Runner.xcodeproj/project.pbxproj +++ b/ios/Runner.xcodeproj/project.pbxproj @@ -467,6 +467,8 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; + CODE_SIGN_IDENTITY = "Apple Development"; + CODE_SIGN_STYLE = Automatic; CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)"; DEVELOPMENT_TEAM = F4SG2JTPHZ; ENABLE_BITCODE = NO; @@ -477,6 +479,7 @@ ); PRODUCT_BUNDLE_IDENTIFIER = com.example.rezaApp; PRODUCT_NAME = "$(TARGET_NAME)"; + PROVISIONING_PROFILE_SPECIFIER = ""; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; SWIFT_VERSION = 5.0; VERSIONING_SYSTEM = "apple-generic"; @@ -646,8 +649,10 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; + CODE_SIGN_IDENTITY = "Apple Development"; + CODE_SIGN_STYLE = Automatic; CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)"; - DEVELOPMENT_TEAM = F4SG2JTPHZ; + DEVELOPMENT_TEAM = ""; ENABLE_BITCODE = NO; INFOPLIST_FILE = Runner/Info.plist; LD_RUNPATH_SEARCH_PATHS = ( @@ -656,6 +661,7 @@ ); PRODUCT_BUNDLE_IDENTIFIER = com.example.rezaApp; PRODUCT_NAME = "$(TARGET_NAME)"; + PROVISIONING_PROFILE_SPECIFIER = ""; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_VERSION = 5.0; @@ -669,6 +675,8 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; + CODE_SIGN_IDENTITY = "Apple Development"; + CODE_SIGN_STYLE = Automatic; CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)"; DEVELOPMENT_TEAM = F4SG2JTPHZ; ENABLE_BITCODE = NO; @@ -679,6 +687,7 @@ ); PRODUCT_BUNDLE_IDENTIFIER = com.example.rezaApp; PRODUCT_NAME = "$(TARGET_NAME)"; + PROVISIONING_PROFILE_SPECIFIER = ""; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; SWIFT_VERSION = 5.0; VERSIONING_SYSTEM = "apple-generic"; diff --git a/lib/ui/views/login_user/login_user_view.dart b/lib/ui/views/login_user/login_user_view.dart index aa1f16e..2a9f648 100644 --- a/lib/ui/views/login_user/login_user_view.dart +++ b/lib/ui/views/login_user/login_user_view.dart @@ -53,9 +53,9 @@ class LoginUserView extends StatelessWidget { ), const SizedBox(height: 16), MyTextFormField( - maxLength: 13, - hintText: 'No. HP', - keyboardType: TextInputType.phone, + // maxLength: 13, + hintText: 'Username', + // keyboardType: TextInputType.phone, controller: model.noHpController, ), const SizedBox(height: 16), diff --git a/lib/ui/views/user_ui/makanan_list/detail_makanan/detail_makanan_view.dart b/lib/ui/views/user_ui/makanan_list/detail_makanan/detail_makanan_view.dart index 92ab6b9..c97d9d8 100644 --- a/lib/ui/views/user_ui/makanan_list/detail_makanan/detail_makanan_view.dart +++ b/lib/ui/views/user_ui/makanan_list/detail_makanan/detail_makanan_view.dart @@ -174,54 +174,57 @@ class DetailMakananView extends HookWidget { ), ], ), - child: Row( - children: [ - Expanded( - child: Column( - mainAxisAlignment: MainAxisAlignment.start, - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Text( - "Total Harga", - style: regularTextStyle.copyWith( - fontSize: 14, - color: fontGrey, + child: SingleChildScrollView( + scrollDirection: Axis.horizontal, + child: Row( + children: [ + Expanded( + child: Column( + mainAxisAlignment: MainAxisAlignment.start, + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Text( + "Total Harga", + style: regularTextStyle.copyWith( + fontSize: 14, + color: fontGrey, + ), ), - ), - const SizedBox( - height: 5, - ), - Text( - model.isBusy - ? 'Loading...' - : 'Rp. ${int.parse(makananModel.hargaMakanan!) + 10000}', - style: boldTextStyle.copyWith( - fontSize: 16, - color: dangerColor, + const SizedBox( + height: 5, ), - ), - ], - ), - ), - Expanded( - child: Container( - height: 40, - decoration: BoxDecoration( - color: dangerColor, - borderRadius: BorderRadius.circular(10), + Text( + model.isBusy + ? 'Loading...' + : 'Rp. ${int.parse(makananModel.hargaMakanan!) + 10000}', + style: boldTextStyle.copyWith( + fontSize: 16, + color: dangerColor, + ), + ), + ], ), - child: Center( - child: Text( - "Pesan Sekarang", - style: boldTextStyle.copyWith( - fontSize: 16, - color: Colors.white, + ), + Expanded( + child: Container( + height: 40, + decoration: BoxDecoration( + color: dangerColor, + borderRadius: BorderRadius.circular(10), + ), + child: Center( + child: Text( + "Pesan Sekarang", + style: boldTextStyle.copyWith( + fontSize: 16, + color: Colors.white, + ), ), ), ), ), - ), - ], + ], + ), ), ), ),