diff --git a/khelo/android/app/build.gradle b/khelo/android/app/build.gradle
index f25c9f0c..a4e81ee7 100644
--- a/khelo/android/app/build.gradle
+++ b/khelo/android/app/build.gradle
@@ -2,6 +2,7 @@ plugins {
id "com.android.application"
id "kotlin-android"
id "dev.flutter.flutter-gradle-plugin"
+ id "com.google.gms.google-services"
}
def localProperties = new Properties()
@@ -65,4 +66,5 @@ flutter {
source '../..'
}
-dependencies {}
+dependencies {
+}
diff --git a/khelo/android/app/google-services.json b/khelo/android/app/google-services.json
index 42d0ab82..4e34773a 100644
--- a/khelo/android/app/google-services.json
+++ b/khelo/android/app/google-services.json
@@ -1,10 +1,55 @@
{
"project_info": {
"project_number": "92999931839",
+ "firebase_url": "https://khelo-dev-8040e-default-rtdb.firebaseio.com",
"project_id": "khelo-dev-8040e",
"storage_bucket": "khelo-dev-8040e.appspot.com"
},
"client": [
+ {
+ "client_info": {
+ "mobilesdk_app_id": "1:92999931839:android:1ac9d94bec982f25ac330a",
+ "android_client_info": {
+ "package_name": "com.canopas.khelo"
+ }
+ },
+ "oauth_client": [
+ {
+ "client_id": "92999931839-e2tgsvpugv0j2a5dt702kouhkrcrb7jg.apps.googleusercontent.com",
+ "client_type": 1,
+ "android_info": {
+ "package_name": "com.canopas.khelo",
+ "certificate_hash": "4ab81672d5e41673d75f286d141e81e7a638b8d1"
+ }
+ },
+ {
+ "client_id": "92999931839-qg7mgdinslkq27j9hig9fhtgbeud3tka.apps.googleusercontent.com",
+ "client_type": 3
+ }
+ ],
+ "api_key": [
+ {
+ "current_key": "AIzaSyCj8mdOgjpM9J6tI-4D195GThJV26lGm-w"
+ }
+ ],
+ "services": {
+ "appinvite_service": {
+ "other_platform_oauth_client": [
+ {
+ "client_id": "92999931839-qg7mgdinslkq27j9hig9fhtgbeud3tka.apps.googleusercontent.com",
+ "client_type": 3
+ },
+ {
+ "client_id": "92999931839-2qaecchvsj42m5lhe9eob9be4vodj6gi.apps.googleusercontent.com",
+ "client_type": 2,
+ "ios_info": {
+ "bundle_id": "com.canopas.khelo"
+ }
+ }
+ ]
+ }
+ }
+ },
{
"client_info": {
"mobilesdk_app_id": "1:92999931839:android:6bb53b7449b2b928ac330a",
@@ -12,7 +57,20 @@
"package_name": "com.example.khelo"
}
},
- "oauth_client": [],
+ "oauth_client": [
+ {
+ "client_id": "92999931839-8ia6o7l4pahhjjtdgnp1aoenp7583haf.apps.googleusercontent.com",
+ "client_type": 1,
+ "android_info": {
+ "package_name": "com.example.khelo",
+ "certificate_hash": "8da4bde884b6a8b0d97d4a5ea1c0a45ca0168163"
+ }
+ },
+ {
+ "client_id": "92999931839-qg7mgdinslkq27j9hig9fhtgbeud3tka.apps.googleusercontent.com",
+ "client_type": 3
+ }
+ ],
"api_key": [
{
"current_key": "AIzaSyCj8mdOgjpM9J6tI-4D195GThJV26lGm-w"
@@ -20,7 +78,19 @@
],
"services": {
"appinvite_service": {
- "other_platform_oauth_client": []
+ "other_platform_oauth_client": [
+ {
+ "client_id": "92999931839-qg7mgdinslkq27j9hig9fhtgbeud3tka.apps.googleusercontent.com",
+ "client_type": 3
+ },
+ {
+ "client_id": "92999931839-2qaecchvsj42m5lhe9eob9be4vodj6gi.apps.googleusercontent.com",
+ "client_type": 2,
+ "ios_info": {
+ "bundle_id": "com.canopas.khelo"
+ }
+ }
+ ]
}
}
}
diff --git a/khelo/android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/khelo/android/app/src/main/res/mipmap-hdpi/ic_launcher.png
index db77bb4b..cf05139d 100644
Binary files a/khelo/android/app/src/main/res/mipmap-hdpi/ic_launcher.png and b/khelo/android/app/src/main/res/mipmap-hdpi/ic_launcher.png differ
diff --git a/khelo/android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/khelo/android/app/src/main/res/mipmap-mdpi/ic_launcher.png
index 17987b79..b8d96fb3 100644
Binary files a/khelo/android/app/src/main/res/mipmap-mdpi/ic_launcher.png and b/khelo/android/app/src/main/res/mipmap-mdpi/ic_launcher.png differ
diff --git a/khelo/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/khelo/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png
index 09d43914..971a1be1 100644
Binary files a/khelo/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png and b/khelo/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ
diff --git a/khelo/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/khelo/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
index d5f1c8d3..bcb72f86 100644
Binary files a/khelo/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png and b/khelo/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ
diff --git a/khelo/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/khelo/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
index 4d6372ee..034ee2cd 100644
Binary files a/khelo/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png and b/khelo/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ
diff --git a/khelo/android/gradle/wrapper/gradle-wrapper.properties b/khelo/android/gradle/wrapper/gradle-wrapper.properties
index 3c472b99..a9abfd15 100644
--- a/khelo/android/gradle/wrapper/gradle-wrapper.properties
+++ b/khelo/android/gradle/wrapper/gradle-wrapper.properties
@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-all.zip
\ No newline at end of file
diff --git a/khelo/android/settings.gradle b/khelo/android/settings.gradle
index 7cd71285..5d4c2d58 100644
--- a/khelo/android/settings.gradle
+++ b/khelo/android/settings.gradle
@@ -24,6 +24,7 @@ pluginManagement {
plugins {
id "dev.flutter.flutter-plugin-loader" version "1.0.0"
id "com.android.application" version "7.3.0" apply false
+ id("com.google.gms.google-services") version "4.4.1" apply false
}
include ":app"
diff --git a/khelo/ios/Flutter/AppFrameworkInfo.plist b/khelo/ios/Flutter/AppFrameworkInfo.plist
index 7c569640..254a7875 100644
--- a/khelo/ios/Flutter/AppFrameworkInfo.plist
+++ b/khelo/ios/Flutter/AppFrameworkInfo.plist
@@ -22,5 +22,7 @@
1.0
MinimumOSVersion
12.0
+ ITSAppUsesNonExemptEncryption
+
diff --git a/khelo/ios/PrivacyInfo.xcprivacy b/khelo/ios/PrivacyInfo.xcprivacy
new file mode 100644
index 00000000..f1ee383a
--- /dev/null
+++ b/khelo/ios/PrivacyInfo.xcprivacy
@@ -0,0 +1,17 @@
+
+
+
+
+ NSPrivacyAccessedAPITypes
+
+
+ NSPrivacyAccessedAPIType
+ NSPrivacyAccessedAPICategoryFileTimestamp
+ NSPrivacyAccessedAPITypeReasons
+
+ 3B52.1
+
+
+
+
+
diff --git a/khelo/ios/Runner.xcodeproj/project.pbxproj b/khelo/ios/Runner.xcodeproj/project.pbxproj
index c09f2cab..cadbaf1d 100644
--- a/khelo/ios/Runner.xcodeproj/project.pbxproj
+++ b/khelo/ios/Runner.xcodeproj/project.pbxproj
@@ -46,6 +46,7 @@
0F9E046C0876652FDA811F21 /* Pods-RunnerTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.release.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.release.xcconfig"; sourceTree = ""; };
1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GeneratedPluginRegistrant.h; sourceTree = ""; };
1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratedPluginRegistrant.m; sourceTree = ""; };
+ 20E4EAC22BB7FBF4001FD0E5 /* PrivacyInfo.xcprivacy */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = PrivacyInfo.xcprivacy; sourceTree = ""; };
307F31411EC8B34768533762 /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = ""; };
331C807B294A618700263BE5 /* RunnerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RunnerTests.swift; sourceTree = ""; };
331C8081294A63A400263BE5 /* RunnerTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = RunnerTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -111,6 +112,7 @@
97C146E51CF9000F007C117D = {
isa = PBXGroup;
children = (
+ 20E4EAC22BB7FBF4001FD0E5 /* PrivacyInfo.xcprivacy */,
9740EEB11CF90186004384FC /* Flutter */,
97C146F01CF9000F007C117D /* Runner */,
97C146EF1CF9000F007C117D /* Products */,
@@ -471,16 +473,23 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES;
- CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
+ CODE_SIGN_IDENTITY = "Apple Development";
+ CODE_SIGN_STYLE = Automatic;
+ CURRENT_PROJECT_VERSION = 4;
DEVELOPMENT_TEAM = S985H2T7J8;
ENABLE_BITCODE = NO;
INFOPLIST_FILE = Runner/Info.plist;
+ INFOPLIST_KEY_CFBundleDisplayName = Khelo;
+ INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.sports";
+ IPHONEOS_DEPLOYMENT_TARGET = 12.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
);
+ MARKETING_VERSION = 1.0.0;
PRODUCT_BUNDLE_IDENTIFIER = com.canopas.khelo;
PRODUCT_NAME = "$(TARGET_NAME)";
+ PROVISIONING_PROFILE_SPECIFIER = "";
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
SWIFT_VERSION = 5.0;
VERSIONING_SYSTEM = "apple-generic";
@@ -495,6 +504,7 @@
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1;
GENERATE_INFOPLIST_FILE = YES;
+ IPHONEOS_DEPLOYMENT_TARGET = 15.0;
MARKETING_VERSION = 1.0;
PRODUCT_BUNDLE_IDENTIFIER = com.canopas.khelo.RunnerTests;
PRODUCT_NAME = "$(TARGET_NAME)";
@@ -513,6 +523,7 @@
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1;
GENERATE_INFOPLIST_FILE = YES;
+ IPHONEOS_DEPLOYMENT_TARGET = 15.0;
MARKETING_VERSION = 1.0;
PRODUCT_BUNDLE_IDENTIFIER = com.canopas.khelo.RunnerTests;
PRODUCT_NAME = "$(TARGET_NAME)";
@@ -529,6 +540,7 @@
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1;
GENERATE_INFOPLIST_FILE = YES;
+ IPHONEOS_DEPLOYMENT_TARGET = 15.0;
MARKETING_VERSION = 1.0;
PRODUCT_BUNDLE_IDENTIFIER = com.canopas.khelo.RunnerTests;
PRODUCT_NAME = "$(TARGET_NAME)";
@@ -650,16 +662,23 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES;
- CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
+ CODE_SIGN_IDENTITY = "Apple Development";
+ CODE_SIGN_STYLE = Automatic;
+ CURRENT_PROJECT_VERSION = 4;
DEVELOPMENT_TEAM = S985H2T7J8;
ENABLE_BITCODE = NO;
INFOPLIST_FILE = Runner/Info.plist;
+ INFOPLIST_KEY_CFBundleDisplayName = Khelo;
+ INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.sports";
+ IPHONEOS_DEPLOYMENT_TARGET = 12.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
);
+ MARKETING_VERSION = 1.0.0;
PRODUCT_BUNDLE_IDENTIFIER = com.canopas.khelo;
PRODUCT_NAME = "$(TARGET_NAME)";
+ PROVISIONING_PROFILE_SPECIFIER = "";
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_VERSION = 5.0;
@@ -673,18 +692,26 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES;
+ CODE_SIGN_IDENTITY = "Apple Development";
+ "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CODE_SIGN_STYLE = Manual;
- CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
+ CURRENT_PROJECT_VERSION = 4;
DEVELOPMENT_TEAM = "";
+ "DEVELOPMENT_TEAM[sdk=iphoneos*]" = S985H2T7J8;
ENABLE_BITCODE = NO;
INFOPLIST_FILE = Runner/Info.plist;
+ INFOPLIST_KEY_CFBundleDisplayName = Khelo;
+ INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.sports";
+ IPHONEOS_DEPLOYMENT_TARGET = 12.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
);
+ MARKETING_VERSION = 1.0.0;
PRODUCT_BUNDLE_IDENTIFIER = com.canopas.khelo;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
+ "PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "kheloprovisioningprofile28-March-2024";
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
SWIFT_VERSION = 5.0;
VERSIONING_SYSTEM = "apple-generic";
diff --git a/khelo/ios/Runner/Assets.xcassets/AppIcon.appiconset/100.png b/khelo/ios/Runner/Assets.xcassets/AppIcon.appiconset/100.png
new file mode 100644
index 00000000..63ef4298
Binary files /dev/null and b/khelo/ios/Runner/Assets.xcassets/AppIcon.appiconset/100.png differ
diff --git a/khelo/ios/Runner/Assets.xcassets/AppIcon.appiconset/1024.png b/khelo/ios/Runner/Assets.xcassets/AppIcon.appiconset/1024.png
new file mode 100644
index 00000000..1839d07c
Binary files /dev/null and b/khelo/ios/Runner/Assets.xcassets/AppIcon.appiconset/1024.png differ
diff --git a/khelo/ios/Runner/Assets.xcassets/AppIcon.appiconset/114.png b/khelo/ios/Runner/Assets.xcassets/AppIcon.appiconset/114.png
new file mode 100644
index 00000000..9175aaac
Binary files /dev/null and b/khelo/ios/Runner/Assets.xcassets/AppIcon.appiconset/114.png differ
diff --git a/khelo/ios/Runner/Assets.xcassets/AppIcon.appiconset/120.png b/khelo/ios/Runner/Assets.xcassets/AppIcon.appiconset/120.png
new file mode 100644
index 00000000..95985f0d
Binary files /dev/null and b/khelo/ios/Runner/Assets.xcassets/AppIcon.appiconset/120.png differ
diff --git a/khelo/ios/Runner/Assets.xcassets/AppIcon.appiconset/144.png b/khelo/ios/Runner/Assets.xcassets/AppIcon.appiconset/144.png
new file mode 100644
index 00000000..bcb72f86
Binary files /dev/null and b/khelo/ios/Runner/Assets.xcassets/AppIcon.appiconset/144.png differ
diff --git a/khelo/ios/Runner/Assets.xcassets/AppIcon.appiconset/152.png b/khelo/ios/Runner/Assets.xcassets/AppIcon.appiconset/152.png
new file mode 100644
index 00000000..233bc003
Binary files /dev/null and b/khelo/ios/Runner/Assets.xcassets/AppIcon.appiconset/152.png differ
diff --git a/khelo/ios/Runner/Assets.xcassets/AppIcon.appiconset/167.png b/khelo/ios/Runner/Assets.xcassets/AppIcon.appiconset/167.png
new file mode 100644
index 00000000..3cc56aca
Binary files /dev/null and b/khelo/ios/Runner/Assets.xcassets/AppIcon.appiconset/167.png differ
diff --git a/khelo/ios/Runner/Assets.xcassets/AppIcon.appiconset/180.png b/khelo/ios/Runner/Assets.xcassets/AppIcon.appiconset/180.png
new file mode 100644
index 00000000..69fb5e50
Binary files /dev/null and b/khelo/ios/Runner/Assets.xcassets/AppIcon.appiconset/180.png differ
diff --git a/khelo/ios/Runner/Assets.xcassets/AppIcon.appiconset/20.png b/khelo/ios/Runner/Assets.xcassets/AppIcon.appiconset/20.png
new file mode 100644
index 00000000..e266400e
Binary files /dev/null and b/khelo/ios/Runner/Assets.xcassets/AppIcon.appiconset/20.png differ
diff --git a/khelo/ios/Runner/Assets.xcassets/AppIcon.appiconset/29.png b/khelo/ios/Runner/Assets.xcassets/AppIcon.appiconset/29.png
new file mode 100644
index 00000000..29008349
Binary files /dev/null and b/khelo/ios/Runner/Assets.xcassets/AppIcon.appiconset/29.png differ
diff --git a/khelo/ios/Runner/Assets.xcassets/AppIcon.appiconset/40.png b/khelo/ios/Runner/Assets.xcassets/AppIcon.appiconset/40.png
new file mode 100644
index 00000000..cfe08c60
Binary files /dev/null and b/khelo/ios/Runner/Assets.xcassets/AppIcon.appiconset/40.png differ
diff --git a/khelo/ios/Runner/Assets.xcassets/AppIcon.appiconset/50.png b/khelo/ios/Runner/Assets.xcassets/AppIcon.appiconset/50.png
new file mode 100644
index 00000000..5b4c9e11
Binary files /dev/null and b/khelo/ios/Runner/Assets.xcassets/AppIcon.appiconset/50.png differ
diff --git a/khelo/ios/Runner/Assets.xcassets/AppIcon.appiconset/57.png b/khelo/ios/Runner/Assets.xcassets/AppIcon.appiconset/57.png
new file mode 100644
index 00000000..05c47cc9
Binary files /dev/null and b/khelo/ios/Runner/Assets.xcassets/AppIcon.appiconset/57.png differ
diff --git a/khelo/ios/Runner/Assets.xcassets/AppIcon.appiconset/58.png b/khelo/ios/Runner/Assets.xcassets/AppIcon.appiconset/58.png
new file mode 100644
index 00000000..d83934a2
Binary files /dev/null and b/khelo/ios/Runner/Assets.xcassets/AppIcon.appiconset/58.png differ
diff --git a/khelo/ios/Runner/Assets.xcassets/AppIcon.appiconset/60.png b/khelo/ios/Runner/Assets.xcassets/AppIcon.appiconset/60.png
new file mode 100644
index 00000000..d29c58f6
Binary files /dev/null and b/khelo/ios/Runner/Assets.xcassets/AppIcon.appiconset/60.png differ
diff --git a/khelo/ios/Runner/Assets.xcassets/AppIcon.appiconset/72.png b/khelo/ios/Runner/Assets.xcassets/AppIcon.appiconset/72.png
new file mode 100644
index 00000000..cf05139d
Binary files /dev/null and b/khelo/ios/Runner/Assets.xcassets/AppIcon.appiconset/72.png differ
diff --git a/khelo/ios/Runner/Assets.xcassets/AppIcon.appiconset/76.png b/khelo/ios/Runner/Assets.xcassets/AppIcon.appiconset/76.png
new file mode 100644
index 00000000..bb410112
Binary files /dev/null and b/khelo/ios/Runner/Assets.xcassets/AppIcon.appiconset/76.png differ
diff --git a/khelo/ios/Runner/Assets.xcassets/AppIcon.appiconset/80.png b/khelo/ios/Runner/Assets.xcassets/AppIcon.appiconset/80.png
new file mode 100644
index 00000000..a8cd3a90
Binary files /dev/null and b/khelo/ios/Runner/Assets.xcassets/AppIcon.appiconset/80.png differ
diff --git a/khelo/ios/Runner/Assets.xcassets/AppIcon.appiconset/87.png b/khelo/ios/Runner/Assets.xcassets/AppIcon.appiconset/87.png
new file mode 100644
index 00000000..f5ee6bed
Binary files /dev/null and b/khelo/ios/Runner/Assets.xcassets/AppIcon.appiconset/87.png differ
diff --git a/khelo/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json b/khelo/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json
index d36b1fab..65b74d7e 100644
--- a/khelo/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json
+++ b/khelo/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json
@@ -1,122 +1 @@
-{
- "images" : [
- {
- "size" : "20x20",
- "idiom" : "iphone",
- "filename" : "Icon-App-20x20@2x.png",
- "scale" : "2x"
- },
- {
- "size" : "20x20",
- "idiom" : "iphone",
- "filename" : "Icon-App-20x20@3x.png",
- "scale" : "3x"
- },
- {
- "size" : "29x29",
- "idiom" : "iphone",
- "filename" : "Icon-App-29x29@1x.png",
- "scale" : "1x"
- },
- {
- "size" : "29x29",
- "idiom" : "iphone",
- "filename" : "Icon-App-29x29@2x.png",
- "scale" : "2x"
- },
- {
- "size" : "29x29",
- "idiom" : "iphone",
- "filename" : "Icon-App-29x29@3x.png",
- "scale" : "3x"
- },
- {
- "size" : "40x40",
- "idiom" : "iphone",
- "filename" : "Icon-App-40x40@2x.png",
- "scale" : "2x"
- },
- {
- "size" : "40x40",
- "idiom" : "iphone",
- "filename" : "Icon-App-40x40@3x.png",
- "scale" : "3x"
- },
- {
- "size" : "60x60",
- "idiom" : "iphone",
- "filename" : "Icon-App-60x60@2x.png",
- "scale" : "2x"
- },
- {
- "size" : "60x60",
- "idiom" : "iphone",
- "filename" : "Icon-App-60x60@3x.png",
- "scale" : "3x"
- },
- {
- "size" : "20x20",
- "idiom" : "ipad",
- "filename" : "Icon-App-20x20@1x.png",
- "scale" : "1x"
- },
- {
- "size" : "20x20",
- "idiom" : "ipad",
- "filename" : "Icon-App-20x20@2x.png",
- "scale" : "2x"
- },
- {
- "size" : "29x29",
- "idiom" : "ipad",
- "filename" : "Icon-App-29x29@1x.png",
- "scale" : "1x"
- },
- {
- "size" : "29x29",
- "idiom" : "ipad",
- "filename" : "Icon-App-29x29@2x.png",
- "scale" : "2x"
- },
- {
- "size" : "40x40",
- "idiom" : "ipad",
- "filename" : "Icon-App-40x40@1x.png",
- "scale" : "1x"
- },
- {
- "size" : "40x40",
- "idiom" : "ipad",
- "filename" : "Icon-App-40x40@2x.png",
- "scale" : "2x"
- },
- {
- "size" : "76x76",
- "idiom" : "ipad",
- "filename" : "Icon-App-76x76@1x.png",
- "scale" : "1x"
- },
- {
- "size" : "76x76",
- "idiom" : "ipad",
- "filename" : "Icon-App-76x76@2x.png",
- "scale" : "2x"
- },
- {
- "size" : "83.5x83.5",
- "idiom" : "ipad",
- "filename" : "Icon-App-83.5x83.5@2x.png",
- "scale" : "2x"
- },
- {
- "size" : "1024x1024",
- "idiom" : "ios-marketing",
- "filename" : "Icon-App-1024x1024@1x.png",
- "scale" : "1x"
- }
- ],
- "info" : {
- "version" : 1,
- "author" : "xcode"
- }
-}
+{"images":[{"size":"60x60","expected-size":"180","filename":"180.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"3x"},{"size":"40x40","expected-size":"80","filename":"80.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"2x"},{"size":"40x40","expected-size":"120","filename":"120.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"3x"},{"size":"60x60","expected-size":"120","filename":"120.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"2x"},{"size":"57x57","expected-size":"57","filename":"57.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"1x"},{"size":"29x29","expected-size":"58","filename":"58.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"2x"},{"size":"29x29","expected-size":"29","filename":"29.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"1x"},{"size":"29x29","expected-size":"87","filename":"87.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"3x"},{"size":"57x57","expected-size":"114","filename":"114.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"2x"},{"size":"20x20","expected-size":"40","filename":"40.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"2x"},{"size":"20x20","expected-size":"60","filename":"60.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"3x"},{"size":"1024x1024","filename":"1024.png","expected-size":"1024","idiom":"ios-marketing","folder":"Assets.xcassets/AppIcon.appiconset/","scale":"1x"},{"size":"40x40","expected-size":"80","filename":"80.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"ipad","scale":"2x"},{"size":"72x72","expected-size":"72","filename":"72.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"ipad","scale":"1x"},{"size":"76x76","expected-size":"152","filename":"152.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"ipad","scale":"2x"},{"size":"50x50","expected-size":"100","filename":"100.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"ipad","scale":"2x"},{"size":"29x29","expected-size":"58","filename":"58.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"ipad","scale":"2x"},{"size":"76x76","expected-size":"76","filename":"76.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"ipad","scale":"1x"},{"size":"29x29","expected-size":"29","filename":"29.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"ipad","scale":"1x"},{"size":"50x50","expected-size":"50","filename":"50.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"ipad","scale":"1x"},{"size":"72x72","expected-size":"144","filename":"144.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"ipad","scale":"2x"},{"size":"40x40","expected-size":"40","filename":"40.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"ipad","scale":"1x"},{"size":"83.5x83.5","expected-size":"167","filename":"167.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"ipad","scale":"2x"},{"size":"20x20","expected-size":"20","filename":"20.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"ipad","scale":"1x"},{"size":"20x20","expected-size":"40","filename":"40.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"ipad","scale":"2x"}]}
\ No newline at end of file
diff --git a/khelo/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png b/khelo/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png
deleted file mode 100644
index dc9ada47..00000000
Binary files a/khelo/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png and /dev/null differ
diff --git a/khelo/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png b/khelo/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png
deleted file mode 100644
index 7353c41e..00000000
Binary files a/khelo/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png and /dev/null differ
diff --git a/khelo/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png b/khelo/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png
deleted file mode 100644
index 797d452e..00000000
Binary files a/khelo/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png and /dev/null differ
diff --git a/khelo/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png b/khelo/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png
deleted file mode 100644
index 6ed2d933..00000000
Binary files a/khelo/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png and /dev/null differ
diff --git a/khelo/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png b/khelo/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png
deleted file mode 100644
index 4cd7b009..00000000
Binary files a/khelo/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png and /dev/null differ
diff --git a/khelo/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png b/khelo/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png
deleted file mode 100644
index fe730945..00000000
Binary files a/khelo/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png and /dev/null differ
diff --git a/khelo/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png b/khelo/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png
deleted file mode 100644
index 321773cd..00000000
Binary files a/khelo/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png and /dev/null differ
diff --git a/khelo/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png b/khelo/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png
deleted file mode 100644
index 797d452e..00000000
Binary files a/khelo/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png and /dev/null differ
diff --git a/khelo/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png b/khelo/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png
deleted file mode 100644
index 502f463a..00000000
Binary files a/khelo/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png and /dev/null differ
diff --git a/khelo/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png b/khelo/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png
deleted file mode 100644
index 0ec30343..00000000
Binary files a/khelo/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png and /dev/null differ
diff --git a/khelo/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png b/khelo/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png
deleted file mode 100644
index 0ec30343..00000000
Binary files a/khelo/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png and /dev/null differ
diff --git a/khelo/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png b/khelo/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png
deleted file mode 100644
index e9f5fea2..00000000
Binary files a/khelo/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png and /dev/null differ
diff --git a/khelo/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png b/khelo/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png
deleted file mode 100644
index 84ac32ae..00000000
Binary files a/khelo/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png and /dev/null differ
diff --git a/khelo/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png b/khelo/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png
deleted file mode 100644
index 8953cba0..00000000
Binary files a/khelo/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png and /dev/null differ
diff --git a/khelo/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png b/khelo/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png
deleted file mode 100644
index 0467bf12..00000000
Binary files a/khelo/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png and /dev/null differ
diff --git a/khelo/ios/Runner/Assets.xcassets/Contents.json b/khelo/ios/Runner/Assets.xcassets/Contents.json
new file mode 100644
index 00000000..73c00596
--- /dev/null
+++ b/khelo/ios/Runner/Assets.xcassets/Contents.json
@@ -0,0 +1,6 @@
+{
+ "info" : {
+ "author" : "xcode",
+ "version" : 1
+ }
+}
diff --git a/khelo/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json b/khelo/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json
index 0bedcf2f..ce5481ed 100644
--- a/khelo/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json
+++ b/khelo/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json
@@ -1,23 +1,12 @@
{
"images" : [
{
- "idiom" : "universal",
- "filename" : "LaunchImage.png",
- "scale" : "1x"
- },
- {
- "idiom" : "universal",
- "filename" : "LaunchImage@2x.png",
- "scale" : "2x"
- },
- {
- "idiom" : "universal",
- "filename" : "LaunchImage@3x.png",
- "scale" : "3x"
+ "filename" : "appstore.png",
+ "idiom" : "universal"
}
],
"info" : {
- "version" : 1,
- "author" : "xcode"
+ "author" : "xcode",
+ "version" : 1
}
}
diff --git a/khelo/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png b/khelo/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png
deleted file mode 100644
index 9da19eac..00000000
Binary files a/khelo/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png and /dev/null differ
diff --git a/khelo/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png b/khelo/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png
deleted file mode 100644
index 9da19eac..00000000
Binary files a/khelo/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png and /dev/null differ
diff --git a/khelo/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png b/khelo/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png
deleted file mode 100644
index 9da19eac..00000000
Binary files a/khelo/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png and /dev/null differ
diff --git a/khelo/ios/Runner/Assets.xcassets/LaunchImage.imageset/README.md b/khelo/ios/Runner/Assets.xcassets/LaunchImage.imageset/README.md
deleted file mode 100644
index 89c2725b..00000000
--- a/khelo/ios/Runner/Assets.xcassets/LaunchImage.imageset/README.md
+++ /dev/null
@@ -1,5 +0,0 @@
-# Launch Screen Assets
-
-You can customize the launch screen with your own desired assets by replacing the image files in this directory.
-
-You can also do it by opening your Flutter project's Xcode project with `open ios/Runner.xcworkspace`, selecting `Runner/Assets.xcassets` in the Project Navigator and dropping in the desired images.
\ No newline at end of file
diff --git a/khelo/ios/Runner/Assets.xcassets/LaunchImage.imageset/appstore.png b/khelo/ios/Runner/Assets.xcassets/LaunchImage.imageset/appstore.png
new file mode 100644
index 00000000..1839d07c
Binary files /dev/null and b/khelo/ios/Runner/Assets.xcassets/LaunchImage.imageset/appstore.png differ
diff --git a/khelo/ios/Runner/Base.lproj/LaunchScreen.storyboard b/khelo/ios/Runner/Base.lproj/LaunchScreen.storyboard
index f2e259c7..75d5aaf5 100644
--- a/khelo/ios/Runner/Base.lproj/LaunchScreen.storyboard
+++ b/khelo/ios/Runner/Base.lproj/LaunchScreen.storyboard
@@ -1,8 +1,10 @@
-
-
+
+
+
-
+
+
@@ -13,10 +15,15 @@
-
-
+
+
-
+
+
+
+
+
+
@@ -28,10 +35,10 @@
-
+
-
+
diff --git a/khelo/ios/Runner/GoogleService-Info.plist b/khelo/ios/Runner/GoogleService-Info.plist
index 9df7e6be..69d97de0 100644
--- a/khelo/ios/Runner/GoogleService-Info.plist
+++ b/khelo/ios/Runner/GoogleService-Info.plist
@@ -2,6 +2,12 @@
+ CLIENT_ID
+ 92999931839-2qaecchvsj42m5lhe9eob9be4vodj6gi.apps.googleusercontent.com
+ REVERSED_CLIENT_ID
+ com.googleusercontent.apps.92999931839-2qaecchvsj42m5lhe9eob9be4vodj6gi
+ ANDROID_CLIENT_ID
+ 92999931839-8ia6o7l4pahhjjtdgnp1aoenp7583haf.apps.googleusercontent.com
API_KEY
AIzaSyAkdjFi8wkE4vf69Wqa45juwLxPEREIOD0
GCM_SENDER_ID
@@ -9,7 +15,7 @@
PLIST_VERSION
1
BUNDLE_ID
- com.example.khelo
+ com.canopas.khelo
PROJECT_ID
khelo-dev-8040e
STORAGE_BUCKET
@@ -25,6 +31,8 @@
IS_SIGNIN_ENABLED
GOOGLE_APP_ID
- 1:92999931839:ios:06a5606f88805af9ac330a
+ 1:92999931839:ios:f166ae55796f68ceac330a
+ DATABASE_URL
+ https://khelo-dev-8040e-default-rtdb.firebaseio.com
\ No newline at end of file
diff --git a/khelo/ios/Runner/Info.plist b/khelo/ios/Runner/Info.plist
index c3c997bd..7f24c91e 100644
--- a/khelo/ios/Runner/Info.plist
+++ b/khelo/ios/Runner/Info.plist
@@ -29,7 +29,7 @@
Editor
CFBundleURLSchemes
- app-1-92999931839-ios-06a5606f88805af9ac330a
+ app-1-92999931839-ios-f166ae55796f68ceac330a
@@ -60,5 +60,7 @@
Capture a new profile image using your device's camera for a personalized and up-to-date appearance.
NSPhotoLibraryUsageDescription
Select a profile image from your device's gallery to showcase your preferred photo in moments of your choice.
+ ITSAppUsesNonExemptEncryption
+
diff --git a/khelo/ios/Runner/Runner.entitlements b/khelo/ios/Runner/Runner.entitlements
new file mode 100644
index 00000000..74c85d2e
--- /dev/null
+++ b/khelo/ios/Runner/Runner.entitlements
@@ -0,0 +1,8 @@
+
+
+
+
+ aps-environment
+ development
+
+
\ No newline at end of file
diff --git a/khelo/ios/firebase_app_id_file.json b/khelo/ios/firebase_app_id_file.json
index 0eac0d7d..1a8e0f0e 100644
--- a/khelo/ios/firebase_app_id_file.json
+++ b/khelo/ios/firebase_app_id_file.json
@@ -1,7 +1,7 @@
{
"file_generated_by": "FlutterFire CLI",
"purpose": "FirebaseAppID & ProjectID for this Firebase app in this directory",
- "GOOGLE_APP_ID": "1:92999931839:ios:06a5606f88805af9ac330a",
+ "GOOGLE_APP_ID": "1:92999931839:ios:f166ae55796f68ceac330a",
"FIREBASE_PROJECT_ID": "khelo-dev-8040e",
"GCM_SENDER_ID": "92999931839"
}
\ No newline at end of file
diff --git a/khelo/lib/components/app_page.dart b/khelo/lib/components/app_page.dart
index 508720be..3ab5b133 100644
--- a/khelo/lib/components/app_page.dart
+++ b/khelo/lib/components/app_page.dart
@@ -33,8 +33,7 @@ class AppPage extends StatelessWidget {
}
}
- Widget _cupertino(BuildContext context) =>
- CupertinoPageScaffold(
+ Widget _cupertino(BuildContext context) => CupertinoPageScaffold(
navigationBar: (title == null && titleWidget == null) &&
actions == null &&
leading == null
@@ -91,4 +90,4 @@ class AppPage extends StatelessWidget {
overflow: TextOverflow.ellipsis,
style: const TextStyle(fontFamily: AppTextStyle.interFontFamily),
);
-}
\ No newline at end of file
+}
diff --git a/khelo/lib/components/error_snackbar.dart b/khelo/lib/components/error_snackbar.dart
index 90290d92..399d5de6 100644
--- a/khelo/lib/components/error_snackbar.dart
+++ b/khelo/lib/components/error_snackbar.dart
@@ -3,10 +3,10 @@ import 'package:flutter/material.dart';
import 'package:fluttertoast/fluttertoast.dart';
void showSnackBar(
- BuildContext context,
- String text, {
- SnackBarLength length = SnackBarLength.short,
- }) {
+ BuildContext context,
+ String text, {
+ SnackBarLength length = SnackBarLength.short,
+}) {
if (Platform.isIOS) {
Fluttertoast.showToast(
msg: text,
@@ -31,4 +31,4 @@ enum SnackBarLength {
final int seconds;
const SnackBarLength(this.seconds);
-}
\ No newline at end of file
+}
diff --git a/khelo/lib/components/match_status_tag.dart b/khelo/lib/components/match_status_tag.dart
index 1cea7639..a30f607c 100644
--- a/khelo/lib/components/match_status_tag.dart
+++ b/khelo/lib/components/match_status_tag.dart
@@ -6,7 +6,10 @@ import 'package:style/text/app_text_style.dart';
class MatchStatusTag extends StatelessWidget {
final MatchStatus status;
- const MatchStatusTag({super.key, required this.status,});
+ const MatchStatusTag({
+ super.key,
+ required this.status,
+ });
@override
Widget build(BuildContext context) {
@@ -19,7 +22,7 @@ class MatchStatusTag extends StatelessWidget {
child: Text(
status.getString(context),
style:
- AppTextStyle.body2.copyWith(color: context.colorScheme.textPrimary),
+ AppTextStyle.body2.copyWith(color: context.colorScheme.textPrimary),
),
);
}
diff --git a/khelo/lib/domain/extensions/enum_extensions.dart b/khelo/lib/domain/extensions/enum_extensions.dart
index 15a75518..c382b3f0 100644
--- a/khelo/lib/domain/extensions/enum_extensions.dart
+++ b/khelo/lib/domain/extensions/enum_extensions.dart
@@ -210,4 +210,4 @@ extension TeamFilterOptionString on TeamFilterOption {
return context.l10n.team_list_me_as_member_title;
}
}
-}
\ No newline at end of file
+}
diff --git a/khelo/lib/domain/extensions/string_extensions.dart b/khelo/lib/domain/extensions/string_extensions.dart
index 1b4e52e9..3574dfa3 100644
--- a/khelo/lib/domain/extensions/string_extensions.dart
+++ b/khelo/lib/domain/extensions/string_extensions.dart
@@ -5,4 +5,4 @@ extension EmailValidator on String {
r'^(([^<>()[\]\\.,;:\s@\"]+(\.[^<>()[\]\\.,;:\s@\"]+)*)|(\".+\"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$')
.hasMatch(this);
}
-}
\ No newline at end of file
+}
diff --git a/khelo/lib/firebase_options.dart b/khelo/lib/firebase_options.dart
index 6473a58c..20727fea 100644
--- a/khelo/lib/firebase_options.dart
+++ b/khelo/lib/firebase_options.dart
@@ -49,25 +49,28 @@ class DefaultFirebaseOptions {
messagingSenderId: '92999931839',
projectId: 'khelo-dev-8040e',
authDomain: 'khelo-dev-8040e.firebaseapp.com',
+ databaseURL: 'https://khelo-dev-8040e-default-rtdb.firebaseio.com',
storageBucket: 'khelo-dev-8040e.appspot.com',
measurementId: 'G-W9Y0Z1TN2R',
);
static const FirebaseOptions android = FirebaseOptions(
apiKey: 'AIzaSyCj8mdOgjpM9J6tI-4D195GThJV26lGm-w',
- appId: '1:92999931839:android:6bb53b7449b2b928ac330a',
+ appId: '1:92999931839:android:1ac9d94bec982f25ac330a',
messagingSenderId: '92999931839',
projectId: 'khelo-dev-8040e',
+ databaseURL: 'https://khelo-dev-8040e-default-rtdb.firebaseio.com',
storageBucket: 'khelo-dev-8040e.appspot.com',
);
static const FirebaseOptions ios = FirebaseOptions(
apiKey: 'AIzaSyAkdjFi8wkE4vf69Wqa45juwLxPEREIOD0',
- appId: '1:92999931839:ios:06a5606f88805af9ac330a',
+ appId: '1:92999931839:ios:f166ae55796f68ceac330a',
messagingSenderId: '92999931839',
projectId: 'khelo-dev-8040e',
+ databaseURL: 'https://khelo-dev-8040e-default-rtdb.firebaseio.com',
storageBucket: 'khelo-dev-8040e.appspot.com',
- iosBundleId: 'com.example.khelo',
+ iosBundleId: 'com.canopas.khelo',
);
static const FirebaseOptions macos = FirebaseOptions(
@@ -75,6 +78,7 @@ class DefaultFirebaseOptions {
appId: '1:92999931839:ios:984233dbd06405beac330a',
messagingSenderId: '92999931839',
projectId: 'khelo-dev-8040e',
+ databaseURL: 'https://khelo-dev-8040e-default-rtdb.firebaseio.com',
storageBucket: 'khelo-dev-8040e.appspot.com',
iosBundleId: 'com.example.khelo.RunnerTests',
);
diff --git a/khelo/lib/ui/app.dart b/khelo/lib/ui/app.dart
index 6806ae18..31b9559b 100644
--- a/khelo/lib/ui/app.dart
+++ b/khelo/lib/ui/app.dart
@@ -55,6 +55,7 @@ class _AppState extends ConsumerState {
builder: (context) {
if (Platform.isIOS) {
return CupertinoApp.router(
+ debugShowCheckedModeBanner: false,
routerConfig: _router,
localizationsDelegates: AppLocalizations.localizationsDelegates,
supportedLocales: AppLocalizations.supportedLocales,
@@ -69,6 +70,7 @@ class _AppState extends ConsumerState {
);
} else {
return MaterialApp.router(
+ debugShowCheckedModeBanner: false,
routerConfig: _router,
localizationsDelegates: AppLocalizations.localizationsDelegates,
supportedLocales: AppLocalizations.supportedLocales,
diff --git a/khelo/lib/ui/flow/home/home_screen.dart b/khelo/lib/ui/flow/home/home_screen.dart
index 048f4149..4732276f 100644
--- a/khelo/lib/ui/flow/home/home_screen.dart
+++ b/khelo/lib/ui/flow/home/home_screen.dart
@@ -16,7 +16,7 @@ class _HomeScreenState extends State {
child: Text(
"Home",
style:
- AppTextStyle.header4.copyWith(color: context.colorScheme.primary),
+ AppTextStyle.header4.copyWith(color: context.colorScheme.primary),
),
);
}
diff --git a/khelo/lib/ui/flow/matches/match_list_view_model.dart b/khelo/lib/ui/flow/matches/match_list_view_model.dart
index 3563501b..43c93700 100644
--- a/khelo/lib/ui/flow/matches/match_list_view_model.dart
+++ b/khelo/lib/ui/flow/matches/match_list_view_model.dart
@@ -26,7 +26,8 @@ class MatchListViewNotifier extends StateNotifier {
state = state.copyWith(matches: matches, loading: false);
} catch (e, stack) {
state = state.copyWith(loading: false, error: e);
- debugPrint("MatchListViewNotifier: error while load matches -> $e ,\nstack: $stack");
+ debugPrint(
+ "MatchListViewNotifier: error while load matches -> $e ,\nstack: $stack");
}
}
}
diff --git a/khelo/lib/ui/flow/sign_in/sign_in_with_phone/components/sign_in_with_phone_country_picker.dart b/khelo/lib/ui/flow/sign_in/sign_in_with_phone/components/sign_in_with_phone_country_picker.dart
index 87d3ffa6..6446ef1b 100644
--- a/khelo/lib/ui/flow/sign_in/sign_in_with_phone/components/sign_in_with_phone_country_picker.dart
+++ b/khelo/lib/ui/flow/sign_in/sign_in_with_phone/components/sign_in_with_phone_country_picker.dart
@@ -13,7 +13,6 @@ class SignInWithPhoneCountryPicker extends ConsumerWidget {
@override
Widget build(BuildContext context, WidgetRef ref) {
-
final notifier = ref.watch(signInWithPhoneStateProvider.notifier);
final countryCode = ref.watch(
signInWithPhoneStateProvider.select((value) => value.code),
@@ -86,4 +85,4 @@ class SignInWithPhoneCountryPicker extends ConsumerWidget {
],
);
}
-}
\ No newline at end of file
+}
diff --git a/khelo/lib/ui/flow/stats/user_match/match_detail_stat/match_detail_stat_screen.dart b/khelo/lib/ui/flow/stats/user_match/match_detail_stat/match_detail_stat_screen.dart
index 5ae9a6df..784f708c 100644
--- a/khelo/lib/ui/flow/stats/user_match/match_detail_stat/match_detail_stat_screen.dart
+++ b/khelo/lib/ui/flow/stats/user_match/match_detail_stat/match_detail_stat_screen.dart
@@ -385,4 +385,4 @@ class _MatchDetailStatScreenState extends ConsumerState {
0, (sum, element) => (sum ?? 0) + (element.extras_awarded ?? 0)) ??
0;
}
-}
\ No newline at end of file
+}
diff --git a/khelo/lib/ui/flow/team/components/select_filter_option_sheet.dart b/khelo/lib/ui/flow/team/components/select_filter_option_sheet.dart
index 9d7a015e..74166781 100644
--- a/khelo/lib/ui/flow/team/components/select_filter_option_sheet.dart
+++ b/khelo/lib/ui/flow/team/components/select_filter_option_sheet.dart
@@ -61,4 +61,4 @@ class SelectFilterOptionSheet extends ConsumerWidget {
contentPadding: const EdgeInsets.symmetric(horizontal: 16),
);
}
-}
\ No newline at end of file
+}
diff --git a/khelo/pubspec.yaml b/khelo/pubspec.yaml
index 505bb8d5..32459f31 100644
--- a/khelo/pubspec.yaml
+++ b/khelo/pubspec.yaml
@@ -16,7 +16,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
# https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
# In Windows, build-name is used as the major, minor, and patch parts
# of the product and file versions while build-number is used as the build suffix.
-version: 1.0.0+1
+version: 1.0.0+4
environment:
sdk: '>=3.2.3 <4.0.0'