From 2a822c2a0c136e9e92a43dfe682253b23b15f17f Mon Sep 17 00:00:00 2001 From: adityakumar Date: Mon, 4 Nov 2024 23:54:55 +0530 Subject: [PATCH 1/7] namespace issue fixed --- .idea/libraries/Dart_SDK.xml | 32 ++++--- .idea/workspace.xml | 92 ++++++++++++++++--- android/build.gradle | 3 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- babstrap_settings_screen.iml | 10 +- example/android/app/build.gradle | 27 +++--- .../android/app/src/main/AndroidManifest.xml | 1 + example/android/build.gradle | 15 +-- .../gradle/wrapper/gradle-wrapper.properties | 2 +- example/android/settings.gradle | 30 ++++-- example/pubspec.lock | 34 +++---- example/pubspec.yaml | 2 +- pubspec.lock | 32 +++---- pubspec.yaml | 4 +- 14 files changed, 185 insertions(+), 101 deletions(-) diff --git a/.idea/libraries/Dart_SDK.xml b/.idea/libraries/Dart_SDK.xml index 6314373..fcbce96 100644 --- a/.idea/libraries/Dart_SDK.xml +++ b/.idea/libraries/Dart_SDK.xml @@ -1,17 +1,27 @@ - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + diff --git a/.idea/workspace.xml b/.idea/workspace.xml index dbc677d..6f371d5 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -1,5 +1,30 @@ + + + + + + + + + + + + + + + + + + + @@ -22,24 +47,67 @@ - - - - - + + + + + + + - - + - - - - + + + + + + + + 1730743084280 + + + + + + + + - + \ No newline at end of file diff --git a/android/build.gradle b/android/build.gradle index b585fee..63a7c73 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -25,7 +25,8 @@ apply plugin: 'com.android.library' apply plugin: 'kotlin-android' android { - compileSdkVersion 30 + namespace "com.babacar.babstrap_settings_screen" + compileSdkVersion 34 sourceSets { main.java.srcDirs += 'src/main/kotlin' diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties index 3c9d085..8bc9958 100644 --- a/android/gradle/wrapper/gradle-wrapper.properties +++ b/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-6.7-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-all.zip diff --git a/babstrap_settings_screen.iml b/babstrap_settings_screen.iml index 797ab35..55d90fc 100644 --- a/babstrap_settings_screen.iml +++ b/babstrap_settings_screen.iml @@ -2,11 +2,17 @@ - + + + + + + + + - \ No newline at end of file diff --git a/example/android/app/build.gradle b/example/android/app/build.gradle index 477ba21..6830f19 100644 --- a/example/android/app/build.gradle +++ b/example/android/app/build.gradle @@ -1,3 +1,10 @@ +plugins { + id "com.android.application" + id "kotlin-android" + id "dev.flutter.flutter-gradle-plugin" +} + + def localProperties = new Properties() def localPropertiesFile = rootProject.file('local.properties') if (localPropertiesFile.exists()) { @@ -6,11 +13,6 @@ if (localPropertiesFile.exists()) { } } -def flutterRoot = localProperties.getProperty('flutter.sdk') -if (flutterRoot == null) { - throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.") -} - def flutterVersionCode = localProperties.getProperty('flutter.versionCode') if (flutterVersionCode == null) { flutterVersionCode = '1' @@ -21,12 +23,9 @@ if (flutterVersionName == null) { flutterVersionName = '1.0' } -apply plugin: 'com.android.application' -apply plugin: 'kotlin-android' -apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" - android { - compileSdkVersion 30 + compileSdkVersion 34 + namespace "com.babacar.babstrap_settings_screen_example" sourceSets { main.java.srcDirs += 'src/main/kotlin' @@ -35,8 +34,8 @@ android { defaultConfig { // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html). applicationId "com.babacar.babstrap_settings_screen_example" - minSdkVersion 16 - targetSdkVersion 30 + minSdkVersion flutter.minSdkVersion + targetSdkVersion 35 versionCode flutterVersionCode.toInteger() versionName flutterVersionName } @@ -54,6 +53,4 @@ flutter { source '../..' } -dependencies { - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" -} +dependencies {} diff --git a/example/android/app/src/main/AndroidManifest.xml b/example/android/app/src/main/AndroidManifest.xml index 58065e6..082d95d 100644 --- a/example/android/app/src/main/AndroidManifest.xml +++ b/example/android/app/src/main/AndroidManifest.xml @@ -6,6 +6,7 @@ properties.load(reader) } + repositories { + google() + mavenCentral() + gradlePluginPortal() + } +} -def flutterSdkPath = properties.getProperty("flutter.sdk") -assert flutterSdkPath != null, "flutter.sdk not set in local.properties" -apply from: "$flutterSdkPath/packages/flutter_tools/gradle/app_plugin_loader.gradle" +plugins { + id "dev.flutter.flutter-plugin-loader" version "1.0.0" + id "com.android.application" version "8.1.4" apply false + id "org.jetbrains.kotlin.android" version "1.7.10" apply false +} + +include ":app" \ No newline at end of file diff --git a/example/pubspec.lock b/example/pubspec.lock index 224f394..b926359 100644 --- a/example/pubspec.lock +++ b/example/pubspec.lock @@ -15,7 +15,7 @@ packages: path: ".." relative: true source: path - version: "0.1.6" + version: "0.1.8" boolean_selector: dependency: transitive description: @@ -78,26 +78,26 @@ packages: dependency: transitive description: name: leak_tracker - sha256: "78eb209deea09858f5269f5a5b02be4049535f568c07b275096836f01ea323fa" + sha256: "3f87a60e8c63aecc975dda1ceedbc8f24de75f09e4856ea27daf8958f2f0ce05" url: "https://pub.dev" source: hosted - version: "10.0.0" + version: "10.0.5" leak_tracker_flutter_testing: dependency: transitive description: name: leak_tracker_flutter_testing - sha256: b46c5e37c19120a8a01918cfaf293547f47269f7cb4b0058f21531c2465d6ef0 + sha256: "932549fb305594d82d7183ecd9fa93463e9914e1b67cacc34bc40906594a1806" url: "https://pub.dev" source: hosted - version: "2.0.1" + version: "3.0.5" leak_tracker_testing: dependency: transitive description: name: leak_tracker_testing - sha256: a597f72a664dbd293f3bfc51f9ba69816f84dcd403cdac7066cb3f6003f3ab47 + sha256: "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3" url: "https://pub.dev" source: hosted - version: "2.0.1" + version: "3.0.1" matcher: dependency: transitive description: @@ -110,18 +110,18 @@ packages: dependency: transitive description: name: material_color_utilities - sha256: "0e0a020085b65b6083975e499759762399b4475f766c21668c4ecca34ea74e5a" + sha256: f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec url: "https://pub.dev" source: hosted - version: "0.8.0" + version: "0.11.1" meta: dependency: transitive description: name: meta - sha256: d584fa6707a52763a52446f02cc621b077888fb63b93bbcb1143a7be5a0c0c04 + sha256: bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7 url: "https://pub.dev" source: hosted - version: "1.11.0" + version: "1.15.0" path: dependency: transitive description: @@ -179,10 +179,10 @@ packages: dependency: transitive description: name: test_api - sha256: "5c2f730018264d276c20e4f1503fd1308dfbbae39ec8ee63c5236311ac06954b" + sha256: "5b8a98dafc4d5c4c9c72d8b31ab2b23fc13422348d2997120294d3bac86b4ddb" url: "https://pub.dev" source: hosted - version: "0.6.1" + version: "0.7.2" vector_math: dependency: transitive description: @@ -195,10 +195,10 @@ packages: dependency: transitive description: name: vm_service - sha256: b3d56ff4341b8f182b96aceb2fa20e3dcb336b9f867bc0eafc0de10f1048e957 + sha256: "5c5f338a667b4c644744b661f309fb8080bb94b18a7e91ef1dbd343bed00ed6d" url: "https://pub.dev" source: hosted - version: "13.0.0" + version: "14.2.5" sdks: - dart: ">=3.2.0-0 <4.0.0" - flutter: ">=1.20.0" + dart: ">=3.3.0 <4.0.0" + flutter: ">=3.18.0-18.0.pre.54" diff --git a/example/pubspec.yaml b/example/pubspec.yaml index 039f2fc..80b4722 100644 --- a/example/pubspec.yaml +++ b/example/pubspec.yaml @@ -6,7 +6,7 @@ description: Demonstrates how to use the babstrap_settings_screen plugin. publish_to: 'none' # Remove this line if you wish to publish to pub.dev environment: - sdk: ">=2.12.0 <3.0.0" + sdk: ">=2.12.0 <4.0.0" dependencies: flutter: diff --git a/pubspec.lock b/pubspec.lock index 3871171..df9b838 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -63,26 +63,26 @@ packages: dependency: transitive description: name: leak_tracker - sha256: "78eb209deea09858f5269f5a5b02be4049535f568c07b275096836f01ea323fa" + sha256: "3f87a60e8c63aecc975dda1ceedbc8f24de75f09e4856ea27daf8958f2f0ce05" url: "https://pub.dev" source: hosted - version: "10.0.0" + version: "10.0.5" leak_tracker_flutter_testing: dependency: transitive description: name: leak_tracker_flutter_testing - sha256: b46c5e37c19120a8a01918cfaf293547f47269f7cb4b0058f21531c2465d6ef0 + sha256: "932549fb305594d82d7183ecd9fa93463e9914e1b67cacc34bc40906594a1806" url: "https://pub.dev" source: hosted - version: "2.0.1" + version: "3.0.5" leak_tracker_testing: dependency: transitive description: name: leak_tracker_testing - sha256: a597f72a664dbd293f3bfc51f9ba69816f84dcd403cdac7066cb3f6003f3ab47 + sha256: "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3" url: "https://pub.dev" source: hosted - version: "2.0.1" + version: "3.0.1" matcher: dependency: transitive description: @@ -95,18 +95,18 @@ packages: dependency: transitive description: name: material_color_utilities - sha256: "0e0a020085b65b6083975e499759762399b4475f766c21668c4ecca34ea74e5a" + sha256: f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec url: "https://pub.dev" source: hosted - version: "0.8.0" + version: "0.11.1" meta: dependency: transitive description: name: meta - sha256: d584fa6707a52763a52446f02cc621b077888fb63b93bbcb1143a7be5a0c0c04 + sha256: bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7 url: "https://pub.dev" source: hosted - version: "1.11.0" + version: "1.15.0" path: dependency: transitive description: @@ -164,10 +164,10 @@ packages: dependency: transitive description: name: test_api - sha256: "5c2f730018264d276c20e4f1503fd1308dfbbae39ec8ee63c5236311ac06954b" + sha256: "5b8a98dafc4d5c4c9c72d8b31ab2b23fc13422348d2997120294d3bac86b4ddb" url: "https://pub.dev" source: hosted - version: "0.6.1" + version: "0.7.2" vector_math: dependency: transitive description: @@ -180,10 +180,10 @@ packages: dependency: transitive description: name: vm_service - sha256: b3d56ff4341b8f182b96aceb2fa20e3dcb336b9f867bc0eafc0de10f1048e957 + sha256: "5c5f338a667b4c644744b661f309fb8080bb94b18a7e91ef1dbd343bed00ed6d" url: "https://pub.dev" source: hosted - version: "13.0.0" + version: "14.2.5" sdks: - dart: ">=3.2.0-0 <4.0.0" - flutter: ">=1.20.0" + dart: ">=3.3.0 <4.0.0" + flutter: ">=3.18.0-18.0.pre.54" diff --git a/pubspec.yaml b/pubspec.yaml index 170a01b..faec54c 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,10 +1,10 @@ name: babstrap_settings_screen description: This project help developpers to display a beautiful Settings Screen UI using Flutter. -version: 0.1.7 +version: 0.1.8 homepage: https://github.com/babstrap/babstrap_settings_screen.git environment: - sdk: ">=2.12.0 <3.0.0" + sdk: ">=2.12.0 <4.0.0" flutter: ">=1.20.0" dependencies: From b36d0832c4a7f2b5a879c797e1c7e66b1311335a Mon Sep 17 00:00:00 2001 From: adityakumar Date: Mon, 4 Nov 2024 23:54:55 +0530 Subject: [PATCH 2/7] namespace issue fixed --- .idea/libraries/Dart_SDK.xml | 32 ++++--- .idea/workspace.xml | 92 ++++++++++++++++--- CHANGELOG.md | 4 + android/build.gradle | 3 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- babstrap_settings_screen.iml | 10 +- example/android/app/build.gradle | 27 +++--- .../android/app/src/main/AndroidManifest.xml | 1 + example/android/build.gradle | 15 +-- .../gradle/wrapper/gradle-wrapper.properties | 2 +- example/android/settings.gradle | 30 ++++-- example/pubspec.lock | 34 +++---- example/pubspec.yaml | 2 +- pubspec.lock | 32 +++---- pubspec.yaml | 4 +- 15 files changed, 189 insertions(+), 101 deletions(-) diff --git a/.idea/libraries/Dart_SDK.xml b/.idea/libraries/Dart_SDK.xml index 6314373..fcbce96 100644 --- a/.idea/libraries/Dart_SDK.xml +++ b/.idea/libraries/Dart_SDK.xml @@ -1,17 +1,27 @@ - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + diff --git a/.idea/workspace.xml b/.idea/workspace.xml index dbc677d..6f371d5 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -1,5 +1,30 @@ + + + + + + + + + + + + + + + + + + + @@ -22,24 +47,67 @@ - - - - - + + + + + + + - - + - - - - + + + + + + + + 1730743084280 + + + + + + + + - + \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md index f186dc1..a1592e4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +## 0.1.8 + +- namespace not specified issue fixed + ## 0.1.7 - Support custom color on SettingGroup (backgroundColor) diff --git a/android/build.gradle b/android/build.gradle index b585fee..63a7c73 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -25,7 +25,8 @@ apply plugin: 'com.android.library' apply plugin: 'kotlin-android' android { - compileSdkVersion 30 + namespace "com.babacar.babstrap_settings_screen" + compileSdkVersion 34 sourceSets { main.java.srcDirs += 'src/main/kotlin' diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties index 3c9d085..8bc9958 100644 --- a/android/gradle/wrapper/gradle-wrapper.properties +++ b/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-6.7-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-all.zip diff --git a/babstrap_settings_screen.iml b/babstrap_settings_screen.iml index 797ab35..55d90fc 100644 --- a/babstrap_settings_screen.iml +++ b/babstrap_settings_screen.iml @@ -2,11 +2,17 @@ - + + + + + + + + - \ No newline at end of file diff --git a/example/android/app/build.gradle b/example/android/app/build.gradle index 477ba21..6830f19 100644 --- a/example/android/app/build.gradle +++ b/example/android/app/build.gradle @@ -1,3 +1,10 @@ +plugins { + id "com.android.application" + id "kotlin-android" + id "dev.flutter.flutter-gradle-plugin" +} + + def localProperties = new Properties() def localPropertiesFile = rootProject.file('local.properties') if (localPropertiesFile.exists()) { @@ -6,11 +13,6 @@ if (localPropertiesFile.exists()) { } } -def flutterRoot = localProperties.getProperty('flutter.sdk') -if (flutterRoot == null) { - throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.") -} - def flutterVersionCode = localProperties.getProperty('flutter.versionCode') if (flutterVersionCode == null) { flutterVersionCode = '1' @@ -21,12 +23,9 @@ if (flutterVersionName == null) { flutterVersionName = '1.0' } -apply plugin: 'com.android.application' -apply plugin: 'kotlin-android' -apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" - android { - compileSdkVersion 30 + compileSdkVersion 34 + namespace "com.babacar.babstrap_settings_screen_example" sourceSets { main.java.srcDirs += 'src/main/kotlin' @@ -35,8 +34,8 @@ android { defaultConfig { // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html). applicationId "com.babacar.babstrap_settings_screen_example" - minSdkVersion 16 - targetSdkVersion 30 + minSdkVersion flutter.minSdkVersion + targetSdkVersion 35 versionCode flutterVersionCode.toInteger() versionName flutterVersionName } @@ -54,6 +53,4 @@ flutter { source '../..' } -dependencies { - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" -} +dependencies {} diff --git a/example/android/app/src/main/AndroidManifest.xml b/example/android/app/src/main/AndroidManifest.xml index 58065e6..082d95d 100644 --- a/example/android/app/src/main/AndroidManifest.xml +++ b/example/android/app/src/main/AndroidManifest.xml @@ -6,6 +6,7 @@ properties.load(reader) } + repositories { + google() + mavenCentral() + gradlePluginPortal() + } +} -def flutterSdkPath = properties.getProperty("flutter.sdk") -assert flutterSdkPath != null, "flutter.sdk not set in local.properties" -apply from: "$flutterSdkPath/packages/flutter_tools/gradle/app_plugin_loader.gradle" +plugins { + id "dev.flutter.flutter-plugin-loader" version "1.0.0" + id "com.android.application" version "8.1.4" apply false + id "org.jetbrains.kotlin.android" version "1.7.10" apply false +} + +include ":app" \ No newline at end of file diff --git a/example/pubspec.lock b/example/pubspec.lock index 224f394..b926359 100644 --- a/example/pubspec.lock +++ b/example/pubspec.lock @@ -15,7 +15,7 @@ packages: path: ".." relative: true source: path - version: "0.1.6" + version: "0.1.8" boolean_selector: dependency: transitive description: @@ -78,26 +78,26 @@ packages: dependency: transitive description: name: leak_tracker - sha256: "78eb209deea09858f5269f5a5b02be4049535f568c07b275096836f01ea323fa" + sha256: "3f87a60e8c63aecc975dda1ceedbc8f24de75f09e4856ea27daf8958f2f0ce05" url: "https://pub.dev" source: hosted - version: "10.0.0" + version: "10.0.5" leak_tracker_flutter_testing: dependency: transitive description: name: leak_tracker_flutter_testing - sha256: b46c5e37c19120a8a01918cfaf293547f47269f7cb4b0058f21531c2465d6ef0 + sha256: "932549fb305594d82d7183ecd9fa93463e9914e1b67cacc34bc40906594a1806" url: "https://pub.dev" source: hosted - version: "2.0.1" + version: "3.0.5" leak_tracker_testing: dependency: transitive description: name: leak_tracker_testing - sha256: a597f72a664dbd293f3bfc51f9ba69816f84dcd403cdac7066cb3f6003f3ab47 + sha256: "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3" url: "https://pub.dev" source: hosted - version: "2.0.1" + version: "3.0.1" matcher: dependency: transitive description: @@ -110,18 +110,18 @@ packages: dependency: transitive description: name: material_color_utilities - sha256: "0e0a020085b65b6083975e499759762399b4475f766c21668c4ecca34ea74e5a" + sha256: f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec url: "https://pub.dev" source: hosted - version: "0.8.0" + version: "0.11.1" meta: dependency: transitive description: name: meta - sha256: d584fa6707a52763a52446f02cc621b077888fb63b93bbcb1143a7be5a0c0c04 + sha256: bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7 url: "https://pub.dev" source: hosted - version: "1.11.0" + version: "1.15.0" path: dependency: transitive description: @@ -179,10 +179,10 @@ packages: dependency: transitive description: name: test_api - sha256: "5c2f730018264d276c20e4f1503fd1308dfbbae39ec8ee63c5236311ac06954b" + sha256: "5b8a98dafc4d5c4c9c72d8b31ab2b23fc13422348d2997120294d3bac86b4ddb" url: "https://pub.dev" source: hosted - version: "0.6.1" + version: "0.7.2" vector_math: dependency: transitive description: @@ -195,10 +195,10 @@ packages: dependency: transitive description: name: vm_service - sha256: b3d56ff4341b8f182b96aceb2fa20e3dcb336b9f867bc0eafc0de10f1048e957 + sha256: "5c5f338a667b4c644744b661f309fb8080bb94b18a7e91ef1dbd343bed00ed6d" url: "https://pub.dev" source: hosted - version: "13.0.0" + version: "14.2.5" sdks: - dart: ">=3.2.0-0 <4.0.0" - flutter: ">=1.20.0" + dart: ">=3.3.0 <4.0.0" + flutter: ">=3.18.0-18.0.pre.54" diff --git a/example/pubspec.yaml b/example/pubspec.yaml index 039f2fc..80b4722 100644 --- a/example/pubspec.yaml +++ b/example/pubspec.yaml @@ -6,7 +6,7 @@ description: Demonstrates how to use the babstrap_settings_screen plugin. publish_to: 'none' # Remove this line if you wish to publish to pub.dev environment: - sdk: ">=2.12.0 <3.0.0" + sdk: ">=2.12.0 <4.0.0" dependencies: flutter: diff --git a/pubspec.lock b/pubspec.lock index 3871171..df9b838 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -63,26 +63,26 @@ packages: dependency: transitive description: name: leak_tracker - sha256: "78eb209deea09858f5269f5a5b02be4049535f568c07b275096836f01ea323fa" + sha256: "3f87a60e8c63aecc975dda1ceedbc8f24de75f09e4856ea27daf8958f2f0ce05" url: "https://pub.dev" source: hosted - version: "10.0.0" + version: "10.0.5" leak_tracker_flutter_testing: dependency: transitive description: name: leak_tracker_flutter_testing - sha256: b46c5e37c19120a8a01918cfaf293547f47269f7cb4b0058f21531c2465d6ef0 + sha256: "932549fb305594d82d7183ecd9fa93463e9914e1b67cacc34bc40906594a1806" url: "https://pub.dev" source: hosted - version: "2.0.1" + version: "3.0.5" leak_tracker_testing: dependency: transitive description: name: leak_tracker_testing - sha256: a597f72a664dbd293f3bfc51f9ba69816f84dcd403cdac7066cb3f6003f3ab47 + sha256: "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3" url: "https://pub.dev" source: hosted - version: "2.0.1" + version: "3.0.1" matcher: dependency: transitive description: @@ -95,18 +95,18 @@ packages: dependency: transitive description: name: material_color_utilities - sha256: "0e0a020085b65b6083975e499759762399b4475f766c21668c4ecca34ea74e5a" + sha256: f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec url: "https://pub.dev" source: hosted - version: "0.8.0" + version: "0.11.1" meta: dependency: transitive description: name: meta - sha256: d584fa6707a52763a52446f02cc621b077888fb63b93bbcb1143a7be5a0c0c04 + sha256: bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7 url: "https://pub.dev" source: hosted - version: "1.11.0" + version: "1.15.0" path: dependency: transitive description: @@ -164,10 +164,10 @@ packages: dependency: transitive description: name: test_api - sha256: "5c2f730018264d276c20e4f1503fd1308dfbbae39ec8ee63c5236311ac06954b" + sha256: "5b8a98dafc4d5c4c9c72d8b31ab2b23fc13422348d2997120294d3bac86b4ddb" url: "https://pub.dev" source: hosted - version: "0.6.1" + version: "0.7.2" vector_math: dependency: transitive description: @@ -180,10 +180,10 @@ packages: dependency: transitive description: name: vm_service - sha256: b3d56ff4341b8f182b96aceb2fa20e3dcb336b9f867bc0eafc0de10f1048e957 + sha256: "5c5f338a667b4c644744b661f309fb8080bb94b18a7e91ef1dbd343bed00ed6d" url: "https://pub.dev" source: hosted - version: "13.0.0" + version: "14.2.5" sdks: - dart: ">=3.2.0-0 <4.0.0" - flutter: ">=1.20.0" + dart: ">=3.3.0 <4.0.0" + flutter: ">=3.18.0-18.0.pre.54" diff --git a/pubspec.yaml b/pubspec.yaml index 170a01b..faec54c 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,10 +1,10 @@ name: babstrap_settings_screen description: This project help developpers to display a beautiful Settings Screen UI using Flutter. -version: 0.1.7 +version: 0.1.8 homepage: https://github.com/babstrap/babstrap_settings_screen.git environment: - sdk: ">=2.12.0 <3.0.0" + sdk: ">=2.12.0 <4.0.0" flutter: ">=1.20.0" dependencies: From e3111d6861c31b0ba25146d17c2a10e7d74ced9a Mon Sep 17 00:00:00 2001 From: adityakumar Date: Tue, 5 Nov 2024 00:54:28 +0530 Subject: [PATCH 3/7] Merge pull request #1 from presswink/#25 namespace issue fixed --- android/build.gradle | 9 +++++++++ example/android/settings.gradle | 2 +- example/assets/profile_pic.jpg | Bin 0 -> 68638 bytes example/lib/main.dart | 2 +- example/pubspec.yaml | 5 ++--- 5 files changed, 13 insertions(+), 5 deletions(-) create mode 100644 example/assets/profile_pic.jpg diff --git a/android/build.gradle b/android/build.gradle index 63a7c73..5487fa8 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -34,6 +34,15 @@ android { defaultConfig { minSdkVersion 16 } + + compileOptions { + sourceCompatibility JavaVersion.VERSION_17 + targetCompatibility JavaVersion.VERSION_17 + } + + kotlinOptions { + jvmTarget = '17' + } } dependencies { diff --git a/example/android/settings.gradle b/example/android/settings.gradle index bdeb6e5..4ca835a 100644 --- a/example/android/settings.gradle +++ b/example/android/settings.gradle @@ -19,7 +19,7 @@ pluginManagement { plugins { id "dev.flutter.flutter-plugin-loader" version "1.0.0" id "com.android.application" version "8.1.4" apply false - id "org.jetbrains.kotlin.android" version "1.7.10" apply false + id "org.jetbrains.kotlin.android" version "1.8.22" apply false } include ":app" \ No newline at end of file diff --git a/example/assets/profile_pic.jpg b/example/assets/profile_pic.jpg new file mode 100644 index 0000000000000000000000000000000000000000..1412dd5993eb33079201f88da2455467ee09244d GIT binary patch literal 68638 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�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 Im6m`1*=iDI9{>OV literal 0 HcmV?d00001 diff --git a/example/lib/main.dart b/example/lib/main.dart index 8aa9605..1074891 100644 --- a/example/lib/main.dart +++ b/example/lib/main.dart @@ -30,7 +30,7 @@ class MyApp extends StatelessWidget { // user card SimpleUserCard( userName: "Nom de l'utilisateur", - userProfilePic: AssetImage("assets/profilpic.png"), + userProfilePic: AssetImage("assets/profile_pic.jpg"), ), SettingsGroup( backgroundColor: Colors.blue, diff --git a/example/pubspec.yaml b/example/pubspec.yaml index 80b4722..897a723 100644 --- a/example/pubspec.yaml +++ b/example/pubspec.yaml @@ -40,9 +40,8 @@ flutter: uses-material-design: true # To add assets to your application, add an assets section, like this: - # assets: - # - images/a_dot_burr.jpeg - # - images/a_dot_ham.jpeg + assets: + - assets/profile_pic.jpg # An image asset can refer to one or more resolution-specific "variants", see # https://flutter.dev/assets-and-images/#resolution-aware. From 76f3db03f2120f8ecce20d4eaa68e6dad05ef9fa Mon Sep 17 00:00:00 2001 From: adityakumar Date: Thu, 19 Feb 2026 13:26:21 +0530 Subject: [PATCH 4/7] project updated for android --- .idea/caches/deviceStreaming.xml | 1454 +++++++++++++++++ .idea/deviceManager.xml | 13 + .idea/libraries/Flutter_Plugins.xml | 7 + .idea/vcs.xml | 6 + .idea/workspace.xml | 38 +- android/.idea/.gitignore | 3 + android/.idea/.name | 1 + android/.idea/AndroidProjectSystem.xml | 6 + android/.idea/caches/deviceStreaming.xml | 1454 +++++++++++++++++ android/.idea/compiler.xml | 6 + android/.idea/gradle.xml | 17 + android/.idea/migrations.xml | 10 + android/.idea/misc.xml | 9 + android/.idea/runConfigurations.xml | 17 + android/.idea/vcs.xml | 6 + android/build.gradle | 16 +- android/gradle.properties | 10 + android/gradle/gradle-daemon-jvm.properties | 13 + .../gradle/wrapper/gradle-wrapper.properties | 2 +- android/settings.gradle | 3 + example/android/app/build.gradle | 13 +- example/android/build.gradle | 1 - example/android/gradle.properties | 4 +- .../gradle/gradle-daemon-jvm.properties | 13 + .../gradle/wrapper/gradle-wrapper.properties | 4 +- example/android/settings.gradle | 5 +- example/pubspec.lock | 94 +- pubspec.lock | 88 +- pubspec.yaml | 4 +- 29 files changed, 3190 insertions(+), 127 deletions(-) create mode 100644 .idea/caches/deviceStreaming.xml create mode 100644 .idea/deviceManager.xml create mode 100644 .idea/libraries/Flutter_Plugins.xml create mode 100644 .idea/vcs.xml create mode 100644 android/.idea/.gitignore create mode 100644 android/.idea/.name create mode 100644 android/.idea/AndroidProjectSystem.xml create mode 100644 android/.idea/caches/deviceStreaming.xml create mode 100644 android/.idea/compiler.xml create mode 100644 android/.idea/gradle.xml create mode 100644 android/.idea/migrations.xml create mode 100644 android/.idea/misc.xml create mode 100644 android/.idea/runConfigurations.xml create mode 100644 android/.idea/vcs.xml create mode 100644 android/gradle/gradle-daemon-jvm.properties create mode 100644 example/android/gradle/gradle-daemon-jvm.properties diff --git a/.idea/caches/deviceStreaming.xml b/.idea/caches/deviceStreaming.xml new file mode 100644 index 0000000..8d2a5ae --- /dev/null +++ b/.idea/caches/deviceStreaming.xml @@ -0,0 +1,1454 @@ + + + + + + \ No newline at end of file diff --git a/.idea/deviceManager.xml b/.idea/deviceManager.xml new file mode 100644 index 0000000..91f9558 --- /dev/null +++ b/.idea/deviceManager.xml @@ -0,0 +1,13 @@ + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Flutter_Plugins.xml b/.idea/libraries/Flutter_Plugins.xml new file mode 100644 index 0000000..b0f6971 --- /dev/null +++ b/.idea/libraries/Flutter_Plugins.xml @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..35eb1dd --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 6f371d5..42c8536 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -5,15 +5,17 @@ + + + - + - @@ -50,23 +52,22 @@ - { + "lastFilter": { + "state": "OPEN", + "assignee": "Adityapanther" } -}]]> - + { + "selectedUrlAndAccountId": { + "url": "https://github.com/presswink/babstrap_settings_screen.git", + "accountId": "0fdacbd4-1a19-4742-9234-633ebd95f0cc" } -}]]> - +} + { + "associatedIndex": 1 +} - @@ -83,13 +84,18 @@ "keyToString": { "Flutter.example/lib/main.dart.executor": "Debug", "RunOnceActivity.ShowReadmeOnStart": "true", + "RunOnceActivity.TerminalTabsStorage.copyFrom.TerminalArrangementManager.252": "true", "RunOnceActivity.cidr.known.project.marker": "true", + "RunOnceActivity.git.unshallow": "true", "RunOnceActivity.readMode.enableVisualFormatting": "true", "cf.first.check.clang-format": "false", "cidr.known.project.marker": "true", "dart.analysis.tool.window.visible": "false", "git-widget-placeholder": "main", + "io.flutter.project.isFirstOpen": "true", "io.flutter.reload.alreadyRun": "true", + "kotlin-language-version-configured": "true", + "last_opened_file_path": "/Volumes/1TB/StudioProjects/babstrap_settings_screen", "show.migrate.to.gradle.popup": "false" } }]]> diff --git a/android/.idea/.gitignore b/android/.idea/.gitignore new file mode 100644 index 0000000..26d3352 --- /dev/null +++ b/android/.idea/.gitignore @@ -0,0 +1,3 @@ +# Default ignored files +/shelf/ +/workspace.xml diff --git a/android/.idea/.name b/android/.idea/.name new file mode 100644 index 0000000..c1f45b0 --- /dev/null +++ b/android/.idea/.name @@ -0,0 +1 @@ +babstrap_settings_screen \ No newline at end of file diff --git a/android/.idea/AndroidProjectSystem.xml b/android/.idea/AndroidProjectSystem.xml new file mode 100644 index 0000000..4a53bee --- /dev/null +++ b/android/.idea/AndroidProjectSystem.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/android/.idea/caches/deviceStreaming.xml b/android/.idea/caches/deviceStreaming.xml new file mode 100644 index 0000000..8d2a5ae --- /dev/null +++ b/android/.idea/caches/deviceStreaming.xml @@ -0,0 +1,1454 @@ + + + + + + \ No newline at end of file diff --git a/android/.idea/compiler.xml b/android/.idea/compiler.xml new file mode 100644 index 0000000..fcb19bf --- /dev/null +++ b/android/.idea/compiler.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/android/.idea/gradle.xml b/android/.idea/gradle.xml new file mode 100644 index 0000000..eafa08a --- /dev/null +++ b/android/.idea/gradle.xml @@ -0,0 +1,17 @@ + + + + + + + \ No newline at end of file diff --git a/android/.idea/migrations.xml b/android/.idea/migrations.xml new file mode 100644 index 0000000..f8051a6 --- /dev/null +++ b/android/.idea/migrations.xml @@ -0,0 +1,10 @@ + + + + + + \ No newline at end of file diff --git a/android/.idea/misc.xml b/android/.idea/misc.xml new file mode 100644 index 0000000..f5c7f10 --- /dev/null +++ b/android/.idea/misc.xml @@ -0,0 +1,9 @@ + + + + + + + + \ No newline at end of file diff --git a/android/.idea/runConfigurations.xml b/android/.idea/runConfigurations.xml new file mode 100644 index 0000000..16660f1 --- /dev/null +++ b/android/.idea/runConfigurations.xml @@ -0,0 +1,17 @@ + + + + + + \ No newline at end of file diff --git a/android/.idea/vcs.xml b/android/.idea/vcs.xml new file mode 100644 index 0000000..6c0b863 --- /dev/null +++ b/android/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/android/build.gradle b/android/build.gradle index 5487fa8..916ce05 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -2,14 +2,14 @@ group 'com.babacar.babstrap_settings_screen' version '1.0-SNAPSHOT' buildscript { - ext.kotlin_version = '1.8.0' + ext.kotlin_version = '2.2.10' repositories { google() - jcenter() + mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:4.1.0' + classpath 'com.android.tools.build:gradle:8.4.2' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } } @@ -17,7 +17,7 @@ buildscript { rootProject.allprojects { repositories { google() - jcenter() + mavenCentral() } } @@ -26,7 +26,7 @@ apply plugin: 'kotlin-android' android { namespace "com.babacar.babstrap_settings_screen" - compileSdkVersion 34 + compileSdkVersion 36 sourceSets { main.java.srcDirs += 'src/main/kotlin' @@ -36,12 +36,12 @@ android { } compileOptions { - sourceCompatibility JavaVersion.VERSION_17 - targetCompatibility JavaVersion.VERSION_17 + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 } kotlinOptions { - jvmTarget = '17' + jvmTarget = "1.8" } } diff --git a/android/gradle.properties b/android/gradle.properties index 94adc3a..4275ba9 100644 --- a/android/gradle.properties +++ b/android/gradle.properties @@ -1,3 +1,13 @@ org.gradle.jvmargs=-Xmx1536M android.useAndroidX=true android.enableJetifier=true +android.defaults.buildfeatures.resvalues=true +android.sdk.defaultTargetSdkToCompileSdkIfUnset=false +android.enableAppCompileTimeRClass=false +android.usesSdkInManifest.disallowed=false +android.uniquePackageNames=false +android.dependency.useConstraints=true +android.r8.strictFullModeForKeepRules=false +android.r8.optimizedResourceShrinking=false +android.builtInKotlin=false +android.newDsl=false diff --git a/android/gradle/gradle-daemon-jvm.properties b/android/gradle/gradle-daemon-jvm.properties new file mode 100644 index 0000000..500e909 --- /dev/null +++ b/android/gradle/gradle-daemon-jvm.properties @@ -0,0 +1,13 @@ +#This file is generated by updateDaemonJvm +toolchainUrl.FREE_BSD.AARCH64=https\://api.foojay.io/disco/v3.0/ids/29ee363f71d060405f729a8f1b7f7aef/redirect +toolchainUrl.FREE_BSD.X86_64=https\://api.foojay.io/disco/v3.0/ids/ecd23fd7707c683afbcd6052998cb6a9/redirect +toolchainUrl.LINUX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/29ee363f71d060405f729a8f1b7f7aef/redirect +toolchainUrl.LINUX.X86_64=https\://api.foojay.io/disco/v3.0/ids/ecd23fd7707c683afbcd6052998cb6a9/redirect +toolchainUrl.MAC_OS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/10fc3bf1ee0001078a473afe6e43cfdb/redirect +toolchainUrl.MAC_OS.X86_64=https\://api.foojay.io/disco/v3.0/ids/9c55677aff3966382f3d853c0959bfb2/redirect +toolchainUrl.UNIX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/29ee363f71d060405f729a8f1b7f7aef/redirect +toolchainUrl.UNIX.X86_64=https\://api.foojay.io/disco/v3.0/ids/ecd23fd7707c683afbcd6052998cb6a9/redirect +toolchainUrl.WINDOWS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/248ffb1098f61659502d0c09aa348294/redirect +toolchainUrl.WINDOWS.X86_64=https\://api.foojay.io/disco/v3.0/ids/ac151d55def6b6a9a159dc4cb4642851/redirect +toolchainVendor=JETBRAINS +toolchainVersion=21 diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties index 8bc9958..d706aba 100644 --- a/android/gradle/wrapper/gradle-wrapper.properties +++ b/android/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-all.zip diff --git a/android/settings.gradle b/android/settings.gradle index 49c74a7..aafaa7f 100644 --- a/android/settings.gradle +++ b/android/settings.gradle @@ -1 +1,4 @@ +plugins { + id 'org.gradle.toolchains.foojay-resolver-convention' version '1.0.0' +} rootProject.name = 'babstrap_settings_screen' diff --git a/example/android/app/build.gradle b/example/android/app/build.gradle index 6830f19..fd61ac2 100644 --- a/example/android/app/build.gradle +++ b/example/android/app/build.gradle @@ -24,8 +24,8 @@ if (flutterVersionName == null) { } android { - compileSdkVersion 34 namespace "com.babacar.babstrap_settings_screen_example" + compileSdkVersion 36 sourceSets { main.java.srcDirs += 'src/main/kotlin' @@ -35,11 +35,20 @@ android { // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html). applicationId "com.babacar.babstrap_settings_screen_example" minSdkVersion flutter.minSdkVersion - targetSdkVersion 35 + targetSdkVersion 36 versionCode flutterVersionCode.toInteger() versionName flutterVersionName } + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } + + kotlinOptions { + jvmTarget = "1.8" + } + buildTypes { release { // TODO: Add your own signing config for the release build. diff --git a/example/android/build.gradle b/example/android/build.gradle index 18437ee..ac4e8cd 100644 --- a/example/android/build.gradle +++ b/example/android/build.gradle @@ -1,7 +1,6 @@ allprojects { repositories { google() - jcenter() } } diff --git a/example/android/gradle.properties b/example/android/gradle.properties index 94adc3a..f5967e7 100644 --- a/example/android/gradle.properties +++ b/example/android/gradle.properties @@ -1,3 +1,3 @@ -org.gradle.jvmargs=-Xmx1536M +org.gradle.jvmargs=-Xmx4g android.useAndroidX=true -android.enableJetifier=true +android.enableJetifier=false diff --git a/example/android/gradle/gradle-daemon-jvm.properties b/example/android/gradle/gradle-daemon-jvm.properties new file mode 100644 index 0000000..2ef1b89 --- /dev/null +++ b/example/android/gradle/gradle-daemon-jvm.properties @@ -0,0 +1,13 @@ +#This file is generated by updateDaemonJvm +toolchainUrl.FREE_BSD.AARCH64=https\://api.foojay.io/disco/v3.0/ids/29ee363f71d060405f729a8f1b7f7aef/redirect +toolchainUrl.FREE_BSD.X86_64=https\://api.foojay.io/disco/v3.0/ids/ecd23fd7707c683afbcd6052998cb6a9/redirect +toolchainUrl.LINUX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/29ee363f71d060405f729a8f1b7f7aef/redirect +toolchainUrl.LINUX.X86_64=https\://api.foojay.io/disco/v3.0/ids/ecd23fd7707c683afbcd6052998cb6a9/redirect +toolchainUrl.MAC_OS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/10fc3bf1ee0001078a473afe6e43cfdb/redirect +toolchainUrl.MAC_OS.X86_64=https\://api.foojay.io/disco/v3.0/ids/9c55677aff3966382f3d853c0959bfb2/redirect +toolchainUrl.UNIX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/29ee363f71d060405f729a8f1b7f7aef/redirect +toolchainUrl.UNIX.X86_64=https\://api.foojay.io/disco/v3.0/ids/ecd23fd7707c683afbcd6052998cb6a9/redirect +toolchainUrl.WINDOWS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/39846e8427e64a3824c13e399d7d813c/redirect +toolchainUrl.WINDOWS.X86_64=https\://api.foojay.io/disco/v3.0/ids/ac151d55def6b6a9a159dc4cb4642851/redirect +toolchainVendor=JETBRAINS +toolchainVersion=21 diff --git a/example/android/gradle/wrapper/gradle-wrapper.properties b/example/android/gradle/wrapper/gradle-wrapper.properties index 89e56bd..821c696 100644 --- a/example/android/gradle/wrapper/gradle-wrapper.properties +++ b/example/android/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Fri Jun 23 08:50:38 CEST 2017 + distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-all.zip diff --git a/example/android/settings.gradle b/example/android/settings.gradle index 4ca835a..8166075 100644 --- a/example/android/settings.gradle +++ b/example/android/settings.gradle @@ -18,8 +18,9 @@ pluginManagement { plugins { id "dev.flutter.flutter-plugin-loader" version "1.0.0" - id "com.android.application" version "8.1.4" apply false - id "org.jetbrains.kotlin.android" version "1.8.22" apply false + id "com.android.application" version '8.13.2' apply false + id "org.jetbrains.kotlin.android" version "2.3.10" apply false + id 'org.gradle.toolchains.foojay-resolver-convention' version '1.0.0' } include ":app" \ No newline at end of file diff --git a/example/pubspec.lock b/example/pubspec.lock index b926359..ff39659 100644 --- a/example/pubspec.lock +++ b/example/pubspec.lock @@ -5,65 +5,65 @@ packages: dependency: transitive description: name: async - sha256: "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c" + sha256: "758e6d74e971c3e5aceb4110bfd6698efc7f501675bcfe0c775459a8140750eb" url: "https://pub.dev" source: hosted - version: "2.11.0" + version: "2.13.0" babstrap_settings_screen: dependency: "direct main" description: path: ".." relative: true source: path - version: "0.1.8" + version: "0.1.9" boolean_selector: dependency: transitive description: name: boolean_selector - sha256: "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66" + sha256: "8aab1771e1243a5063b8b0ff68042d67334e3feab9e95b9490f9a6ebf73b42ea" url: "https://pub.dev" source: hosted - version: "2.1.1" + version: "2.1.2" characters: dependency: transitive description: name: characters - sha256: "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605" + sha256: faf38497bda5ead2a8c7615f4f7939df04333478bf32e4173fcb06d428b5716b url: "https://pub.dev" source: hosted - version: "1.3.0" + version: "1.4.1" clock: dependency: transitive description: name: clock - sha256: cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf + sha256: fddb70d9b5277016c77a80201021d40a2247104d9f4aa7bab7157b7e3f05b84b url: "https://pub.dev" source: hosted - version: "1.1.1" + version: "1.1.2" collection: dependency: transitive description: name: collection - sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a + sha256: "2f5709ae4d3d59dd8f7cd309b4e023046b57d8a6c82130785d2b0e5868084e76" url: "https://pub.dev" source: hosted - version: "1.18.0" + version: "1.19.1" cupertino_icons: dependency: "direct main" description: name: cupertino_icons - sha256: "486b7bc707424572cdf7bd7e812a0c146de3fd47ecadf070254cc60383f21dd8" + sha256: ba631d1c7f7bef6b729a622b7b752645a2d076dba9976925b8f25725a30e1ee6 url: "https://pub.dev" source: hosted - version: "1.0.3" + version: "1.0.8" fake_async: dependency: transitive description: name: fake_async - sha256: "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78" + sha256: "5368f224a74523e8d2e7399ea1638b37aecfca824a3cc4dfdf77bf1fa905ac44" url: "https://pub.dev" source: hosted - version: "1.3.1" + version: "1.3.3" flutter: dependency: "direct main" description: flutter @@ -78,127 +78,127 @@ packages: dependency: transitive description: name: leak_tracker - sha256: "3f87a60e8c63aecc975dda1ceedbc8f24de75f09e4856ea27daf8958f2f0ce05" + sha256: "33e2e26bdd85a0112ec15400c8cbffea70d0f9c3407491f672a2fad47915e2de" url: "https://pub.dev" source: hosted - version: "10.0.5" + version: "11.0.2" leak_tracker_flutter_testing: dependency: transitive description: name: leak_tracker_flutter_testing - sha256: "932549fb305594d82d7183ecd9fa93463e9914e1b67cacc34bc40906594a1806" + sha256: "1dbc140bb5a23c75ea9c4811222756104fbcd1a27173f0c34ca01e16bea473c1" url: "https://pub.dev" source: hosted - version: "3.0.5" + version: "3.0.10" leak_tracker_testing: dependency: transitive description: name: leak_tracker_testing - sha256: "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3" + sha256: "8d5a2d49f4a66b49744b23b018848400d23e54caf9463f4eb20df3eb8acb2eb1" url: "https://pub.dev" source: hosted - version: "3.0.1" + version: "3.0.2" matcher: dependency: transitive description: name: matcher - sha256: d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb + sha256: "12956d0ad8390bbcc63ca2e1469c0619946ccb52809807067a7020d57e647aa6" url: "https://pub.dev" source: hosted - version: "0.12.16+1" + version: "0.12.18" material_color_utilities: dependency: transitive description: name: material_color_utilities - sha256: f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec + sha256: "9c337007e82b1889149c82ed242ed1cb24a66044e30979c44912381e9be4c48b" url: "https://pub.dev" source: hosted - version: "0.11.1" + version: "0.13.0" meta: dependency: transitive description: name: meta - sha256: bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7 + sha256: "23f08335362185a5ea2ad3a4e597f1375e78bce8a040df5c600c8d3552ef2394" url: "https://pub.dev" source: hosted - version: "1.15.0" + version: "1.17.0" path: dependency: transitive description: name: path - sha256: "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af" + sha256: "75cca69d1490965be98c73ceaea117e8a04dd21217b37b292c9ddbec0d955bc5" url: "https://pub.dev" source: hosted - version: "1.9.0" + version: "1.9.1" sky_engine: dependency: transitive description: flutter source: sdk - version: "0.0.99" + version: "0.0.0" source_span: dependency: transitive description: name: source_span - sha256: "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c" + sha256: "56a02f1f4cd1a2d96303c0144c93bd6d909eea6bee6bf5a0e0b685edbd4c47ab" url: "https://pub.dev" source: hosted - version: "1.10.0" + version: "1.10.2" stack_trace: dependency: transitive description: name: stack_trace - sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b" + sha256: "8b27215b45d22309b5cddda1aa2b19bdfec9df0e765f2de506401c071d38d1b1" url: "https://pub.dev" source: hosted - version: "1.11.1" + version: "1.12.1" stream_channel: dependency: transitive description: name: stream_channel - sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7 + sha256: "969e04c80b8bcdf826f8f16579c7b14d780458bd97f56d107d3950fdbeef059d" url: "https://pub.dev" source: hosted - version: "2.1.2" + version: "2.1.4" string_scanner: dependency: transitive description: name: string_scanner - sha256: "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde" + sha256: "921cd31725b72fe181906c6a94d987c78e3b98c2e205b397ea399d4054872b43" url: "https://pub.dev" source: hosted - version: "1.2.0" + version: "1.4.1" term_glyph: dependency: transitive description: name: term_glyph - sha256: a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84 + sha256: "7f554798625ea768a7518313e58f83891c7f5024f88e46e7182a4558850a4b8e" url: "https://pub.dev" source: hosted - version: "1.2.1" + version: "1.2.2" test_api: dependency: transitive description: name: test_api - sha256: "5b8a98dafc4d5c4c9c72d8b31ab2b23fc13422348d2997120294d3bac86b4ddb" + sha256: "93167629bfc610f71560ab9312acdda4959de4df6fac7492c89ff0d3886f6636" url: "https://pub.dev" source: hosted - version: "0.7.2" + version: "0.7.9" vector_math: dependency: transitive description: name: vector_math - sha256: "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803" + sha256: d530bd74fea330e6e364cda7a85019c434070188383e1cd8d9777ee586914c5b url: "https://pub.dev" source: hosted - version: "2.1.4" + version: "2.2.0" vm_service: dependency: transitive description: name: vm_service - sha256: "5c5f338a667b4c644744b661f309fb8080bb94b18a7e91ef1dbd343bed00ed6d" + sha256: "45caa6c5917fa127b5dbcfbd1fa60b14e583afdc08bfc96dda38886ca252eb60" url: "https://pub.dev" source: hosted - version: "14.2.5" + version: "15.0.2" sdks: - dart: ">=3.3.0 <4.0.0" + dart: ">=3.9.0-0 <4.0.0" flutter: ">=3.18.0-18.0.pre.54" diff --git a/pubspec.lock b/pubspec.lock index df9b838..a28b3d7 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -5,50 +5,50 @@ packages: dependency: transitive description: name: async - sha256: "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c" + sha256: "758e6d74e971c3e5aceb4110bfd6698efc7f501675bcfe0c775459a8140750eb" url: "https://pub.dev" source: hosted - version: "2.11.0" + version: "2.13.0" boolean_selector: dependency: transitive description: name: boolean_selector - sha256: "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66" + sha256: "8aab1771e1243a5063b8b0ff68042d67334e3feab9e95b9490f9a6ebf73b42ea" url: "https://pub.dev" source: hosted - version: "2.1.1" + version: "2.1.2" characters: dependency: transitive description: name: characters - sha256: "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605" + sha256: faf38497bda5ead2a8c7615f4f7939df04333478bf32e4173fcb06d428b5716b url: "https://pub.dev" source: hosted - version: "1.3.0" + version: "1.4.1" clock: dependency: transitive description: name: clock - sha256: cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf + sha256: fddb70d9b5277016c77a80201021d40a2247104d9f4aa7bab7157b7e3f05b84b url: "https://pub.dev" source: hosted - version: "1.1.1" + version: "1.1.2" collection: dependency: transitive description: name: collection - sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a + sha256: "2f5709ae4d3d59dd8f7cd309b4e023046b57d8a6c82130785d2b0e5868084e76" url: "https://pub.dev" source: hosted - version: "1.18.0" + version: "1.19.1" fake_async: dependency: transitive description: name: fake_async - sha256: "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78" + sha256: "5368f224a74523e8d2e7399ea1638b37aecfca824a3cc4dfdf77bf1fa905ac44" url: "https://pub.dev" source: hosted - version: "1.3.1" + version: "1.3.3" flutter: dependency: "direct main" description: flutter @@ -63,127 +63,127 @@ packages: dependency: transitive description: name: leak_tracker - sha256: "3f87a60e8c63aecc975dda1ceedbc8f24de75f09e4856ea27daf8958f2f0ce05" + sha256: "33e2e26bdd85a0112ec15400c8cbffea70d0f9c3407491f672a2fad47915e2de" url: "https://pub.dev" source: hosted - version: "10.0.5" + version: "11.0.2" leak_tracker_flutter_testing: dependency: transitive description: name: leak_tracker_flutter_testing - sha256: "932549fb305594d82d7183ecd9fa93463e9914e1b67cacc34bc40906594a1806" + sha256: "1dbc140bb5a23c75ea9c4811222756104fbcd1a27173f0c34ca01e16bea473c1" url: "https://pub.dev" source: hosted - version: "3.0.5" + version: "3.0.10" leak_tracker_testing: dependency: transitive description: name: leak_tracker_testing - sha256: "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3" + sha256: "8d5a2d49f4a66b49744b23b018848400d23e54caf9463f4eb20df3eb8acb2eb1" url: "https://pub.dev" source: hosted - version: "3.0.1" + version: "3.0.2" matcher: dependency: transitive description: name: matcher - sha256: d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb + sha256: "12956d0ad8390bbcc63ca2e1469c0619946ccb52809807067a7020d57e647aa6" url: "https://pub.dev" source: hosted - version: "0.12.16+1" + version: "0.12.18" material_color_utilities: dependency: transitive description: name: material_color_utilities - sha256: f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec + sha256: "9c337007e82b1889149c82ed242ed1cb24a66044e30979c44912381e9be4c48b" url: "https://pub.dev" source: hosted - version: "0.11.1" + version: "0.13.0" meta: dependency: transitive description: name: meta - sha256: bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7 + sha256: "23f08335362185a5ea2ad3a4e597f1375e78bce8a040df5c600c8d3552ef2394" url: "https://pub.dev" source: hosted - version: "1.15.0" + version: "1.17.0" path: dependency: transitive description: name: path - sha256: "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af" + sha256: "75cca69d1490965be98c73ceaea117e8a04dd21217b37b292c9ddbec0d955bc5" url: "https://pub.dev" source: hosted - version: "1.9.0" + version: "1.9.1" sky_engine: dependency: transitive description: flutter source: sdk - version: "0.0.99" + version: "0.0.0" source_span: dependency: transitive description: name: source_span - sha256: "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c" + sha256: "56a02f1f4cd1a2d96303c0144c93bd6d909eea6bee6bf5a0e0b685edbd4c47ab" url: "https://pub.dev" source: hosted - version: "1.10.0" + version: "1.10.2" stack_trace: dependency: transitive description: name: stack_trace - sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b" + sha256: "8b27215b45d22309b5cddda1aa2b19bdfec9df0e765f2de506401c071d38d1b1" url: "https://pub.dev" source: hosted - version: "1.11.1" + version: "1.12.1" stream_channel: dependency: transitive description: name: stream_channel - sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7 + sha256: "969e04c80b8bcdf826f8f16579c7b14d780458bd97f56d107d3950fdbeef059d" url: "https://pub.dev" source: hosted - version: "2.1.2" + version: "2.1.4" string_scanner: dependency: transitive description: name: string_scanner - sha256: "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde" + sha256: "921cd31725b72fe181906c6a94d987c78e3b98c2e205b397ea399d4054872b43" url: "https://pub.dev" source: hosted - version: "1.2.0" + version: "1.4.1" term_glyph: dependency: transitive description: name: term_glyph - sha256: a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84 + sha256: "7f554798625ea768a7518313e58f83891c7f5024f88e46e7182a4558850a4b8e" url: "https://pub.dev" source: hosted - version: "1.2.1" + version: "1.2.2" test_api: dependency: transitive description: name: test_api - sha256: "5b8a98dafc4d5c4c9c72d8b31ab2b23fc13422348d2997120294d3bac86b4ddb" + sha256: "93167629bfc610f71560ab9312acdda4959de4df6fac7492c89ff0d3886f6636" url: "https://pub.dev" source: hosted - version: "0.7.2" + version: "0.7.9" vector_math: dependency: transitive description: name: vector_math - sha256: "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803" + sha256: d530bd74fea330e6e364cda7a85019c434070188383e1cd8d9777ee586914c5b url: "https://pub.dev" source: hosted - version: "2.1.4" + version: "2.2.0" vm_service: dependency: transitive description: name: vm_service - sha256: "5c5f338a667b4c644744b661f309fb8080bb94b18a7e91ef1dbd343bed00ed6d" + sha256: "45caa6c5917fa127b5dbcfbd1fa60b14e583afdc08bfc96dda38886ca252eb60" url: "https://pub.dev" source: hosted - version: "14.2.5" + version: "15.0.2" sdks: - dart: ">=3.3.0 <4.0.0" + dart: ">=3.9.0-0 <4.0.0" flutter: ">=3.18.0-18.0.pre.54" diff --git a/pubspec.yaml b/pubspec.yaml index faec54c..7ce28c9 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,6 +1,6 @@ name: babstrap_settings_screen -description: This project help developpers to display a beautiful Settings Screen UI using Flutter. -version: 0.1.8 +description: This project help developers to display a beautiful Settings Screen UI using Flutter. +version: 0.1.9 homepage: https://github.com/babstrap/babstrap_settings_screen.git environment: From 8ef1236c5c91a53e0e3a8fb24827234fff758e72 Mon Sep 17 00:00:00 2001 From: adityakumar Date: Tue, 7 Jul 2026 22:13:24 +0530 Subject: [PATCH 5/7] upgraded to buildInKotlin --- .idea/caches/deviceStreaming.xml | 1042 ++++++++++++++--- .idea/libraries/Flutter_Plugins.xml | 4 +- .idea/workspace.xml | 71 +- android/.idea/appInsightsSettings.xml | 23 + android/.idea/caches/deviceStreaming.xml | 1042 ++++++++++++++--- android/.idea/compiler.xml | 2 +- android/.idea/deviceManager.xml | 13 + android/.idea/misc.xml | 3 +- android/build.gradle | 15 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- example/android/app/build.gradle | 18 +- example/android/gradle.properties | 4 + example/ios/Flutter/AppFrameworkInfo.plist | 2 - example/ios/Podfile | 2 +- example/ios/Podfile.lock | 8 +- example/ios/Runner.xcodeproj/project.pbxproj | 6 +- .../xcshareddata/xcschemes/Runner.xcscheme | 3 + example/ios/Runner/AppDelegate.swift | 11 +- example/ios/Runner/Info.plist | 29 +- example/pubspec.lock | 16 +- pubspec.lock | 14 +- pubspec.yaml | 2 +- 22 files changed, 1984 insertions(+), 348 deletions(-) create mode 100644 android/.idea/appInsightsSettings.xml create mode 100644 android/.idea/deviceManager.xml diff --git a/.idea/caches/deviceStreaming.xml b/.idea/caches/deviceStreaming.xml index 8d2a5ae..8981305 100644 --- a/.idea/caches/deviceStreaming.xml +++ b/.idea/caches/deviceStreaming.xml @@ -10,7 +10,7 @@ diff --git a/.idea/libraries/Flutter_Plugins.xml b/.idea/libraries/Flutter_Plugins.xml index b0f6971..53449da 100644 --- a/.idea/libraries/Flutter_Plugins.xml +++ b/.idea/libraries/Flutter_Plugins.xml @@ -1,6 +1,8 @@ - + + + diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 42c8536..b3678d4 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -4,20 +4,28 @@ - + + + + + + + + - - - - - + + + + + + + - - { + "keyToString": { + "Flutter.example/lib/main.dart.executor": "Debug", + "RunOnceActivity.ShowReadmeOnStart": "true", + "RunOnceActivity.TerminalTabsStorage.copyFrom.TerminalArrangementManager.252": "true", + "RunOnceActivity.cidr.known.project.marker": "true", + "RunOnceActivity.git.unshallow": "true", + "RunOnceActivity.readMode.enableVisualFormatting": "true", + "cf.first.check.clang-format": "false", + "cidr.known.project.marker": "true", + "dart.analysis.tool.window.visible": "false", + "git-widget-placeholder": "main", + "io.flutter.project.isFirstOpen": "true", + "io.flutter.reload.alreadyRun": "true", + "kotlin-language-version-configured": "true", + "last_opened_file_path": "/Volumes/1TB/StudioProjects/babstrap_settings_screen", + "show.migrate.to.gradle.popup": "false" } -}]]> +} @@ -108,6 +116,15 @@ + + + @@ -116,4 +133,8 @@ + + + \ No newline at end of file diff --git a/android/.idea/appInsightsSettings.xml b/android/.idea/appInsightsSettings.xml new file mode 100644 index 0000000..1acb014 --- /dev/null +++ b/android/.idea/appInsightsSettings.xml @@ -0,0 +1,23 @@ + + + + + + \ No newline at end of file diff --git a/android/.idea/caches/deviceStreaming.xml b/android/.idea/caches/deviceStreaming.xml index 8d2a5ae..8981305 100644 --- a/android/.idea/caches/deviceStreaming.xml +++ b/android/.idea/caches/deviceStreaming.xml @@ -10,7 +10,7 @@ diff --git a/android/.idea/compiler.xml b/android/.idea/compiler.xml index fcb19bf..b86273d 100644 --- a/android/.idea/compiler.xml +++ b/android/.idea/compiler.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/android/.idea/deviceManager.xml b/android/.idea/deviceManager.xml new file mode 100644 index 0000000..91f9558 --- /dev/null +++ b/android/.idea/deviceManager.xml @@ -0,0 +1,13 @@ + + + + + + \ No newline at end of file diff --git a/android/.idea/misc.xml b/android/.idea/misc.xml index f5c7f10..74dd639 100644 --- a/android/.idea/misc.xml +++ b/android/.idea/misc.xml @@ -1,6 +1,7 @@ + - + diff --git a/android/build.gradle b/android/build.gradle index 916ce05..49061ff 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -9,7 +9,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:8.4.2' + classpath 'com.android.tools.build:gradle:9.2.1' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } } @@ -22,11 +22,10 @@ rootProject.allprojects { } apply plugin: 'com.android.library' -apply plugin: 'kotlin-android' android { namespace "com.babacar.babstrap_settings_screen" - compileSdkVersion 36 + compileSdkVersion 37 sourceSets { main.java.srcDirs += 'src/main/kotlin' @@ -36,12 +35,14 @@ android { } compileOptions { - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 + sourceCompatibility JavaVersion.VERSION_17 + targetCompatibility JavaVersion.VERSION_17 } +} - kotlinOptions { - jvmTarget = "1.8" +kotlin { + compilerOptions { + jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17 } } diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties index d706aba..52ad5e7 100644 --- a/android/gradle/wrapper/gradle-wrapper.properties +++ b/android/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.6.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/example/android/app/build.gradle b/example/android/app/build.gradle index fd61ac2..dd2fba3 100644 --- a/example/android/app/build.gradle +++ b/example/android/app/build.gradle @@ -1,6 +1,5 @@ plugins { id "com.android.application" - id "kotlin-android" id "dev.flutter.flutter-gradle-plugin" } @@ -25,7 +24,7 @@ if (flutterVersionName == null) { android { namespace "com.babacar.babstrap_settings_screen_example" - compileSdkVersion 36 + compileSdkVersion 37 sourceSets { main.java.srcDirs += 'src/main/kotlin' @@ -41,12 +40,8 @@ android { } compileOptions { - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 - } - - kotlinOptions { - jvmTarget = "1.8" + sourceCompatibility JavaVersion.VERSION_17 + targetCompatibility JavaVersion.VERSION_17 } buildTypes { @@ -58,6 +53,13 @@ android { } } +kotlin { + compilerOptions { + jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17 + } +} + + flutter { source '../..' } diff --git a/example/android/gradle.properties b/example/android/gradle.properties index f5967e7..6e996b7 100644 --- a/example/android/gradle.properties +++ b/example/android/gradle.properties @@ -1,3 +1,7 @@ org.gradle.jvmargs=-Xmx4g android.useAndroidX=true android.enableJetifier=false +# This builtInKotlin flag was added automatically by Flutter migrator +android.builtInKotlin=false +# This newDsl flag was added automatically by Flutter migrator +android.newDsl=false diff --git a/example/ios/Flutter/AppFrameworkInfo.plist b/example/ios/Flutter/AppFrameworkInfo.plist index 7c56964..391a902 100644 --- a/example/ios/Flutter/AppFrameworkInfo.plist +++ b/example/ios/Flutter/AppFrameworkInfo.plist @@ -20,7 +20,5 @@ ???? CFBundleVersion 1.0 - MinimumOSVersion - 12.0 diff --git a/example/ios/Podfile b/example/ios/Podfile index 279576f..e72e0b4 100644 --- a/example/ios/Podfile +++ b/example/ios/Podfile @@ -1,5 +1,5 @@ # Uncomment this line to define a global platform for your project -# platform :ios, '12.0' +# platform :ios, '13.0' # CocoaPods analytics sends network stats synchronously affecting flutter build latency. ENV['COCOAPODS_DISABLE_STATS'] = 'true' diff --git a/example/ios/Podfile.lock b/example/ios/Podfile.lock index 99219e5..1a1504c 100644 --- a/example/ios/Podfile.lock +++ b/example/ios/Podfile.lock @@ -14,9 +14,9 @@ EXTERNAL SOURCES: :path: Flutter SPEC CHECKSUMS: - babstrap_settings_screen: 535097da0fa521a47fef6f6678ff2b464ee15937 - Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7 + babstrap_settings_screen: 51c832e89db990fc6e64500db0f0e68bcb84fbca + Flutter: cabc95a1d2626b1b06e7179b784ebcf0c0cde467 -PODFILE CHECKSUM: c4c93c5f6502fe2754f48404d3594bf779584011 +PODFILE CHECKSUM: 0dbd5a87e0ace00c9610d2037ac22083a01f861d -COCOAPODS: 1.15.2 +COCOAPODS: 1.16.2 diff --git a/example/ios/Runner.xcodeproj/project.pbxproj b/example/ios/Runner.xcodeproj/project.pbxproj index 52a38a9..5508ec6 100644 --- a/example/ios/Runner.xcodeproj/project.pbxproj +++ b/example/ios/Runner.xcodeproj/project.pbxproj @@ -343,7 +343,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 12.0; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; SUPPORTED_PLATFORMS = iphoneos; @@ -417,7 +417,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 12.0; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; @@ -466,7 +466,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 12.0; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; SUPPORTED_PLATFORMS = iphoneos; diff --git a/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme index e67b280..fc5ae03 100644 --- a/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme +++ b/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme @@ -26,6 +26,7 @@ buildConfiguration = "Debug" selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" + customLLDBInitFile = "$(SRCROOT)/Flutter/ephemeral/flutter_lldbinit" shouldUseLaunchSchemeArgsEnv = "YES"> @@ -45,11 +46,13 @@ buildConfiguration = "Debug" selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" + customLLDBInitFile = "$(SRCROOT)/Flutter/ephemeral/flutter_lldbinit" launchStyle = "0" useCustomWorkingDirectory = "NO" ignoresPersistentStateOnLaunch = "NO" debugDocumentVersioning = "YES" debugServiceExtension = "internal" + enableGPUValidationMode = "1" allowLocationSimulation = "YES"> diff --git a/example/ios/Runner/AppDelegate.swift b/example/ios/Runner/AppDelegate.swift index 70693e4..c30b367 100644 --- a/example/ios/Runner/AppDelegate.swift +++ b/example/ios/Runner/AppDelegate.swift @@ -1,13 +1,16 @@ -import UIKit import Flutter +import UIKit -@UIApplicationMain -@objc class AppDelegate: FlutterAppDelegate { +@main +@objc class AppDelegate: FlutterAppDelegate, FlutterImplicitEngineDelegate { override func application( _ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]? ) -> Bool { - GeneratedPluginRegistrant.register(with: self) return super.application(application, didFinishLaunchingWithOptions: launchOptions) } + + func didInitializeImplicitFlutterEngine(_ engineBridge: FlutterImplicitEngineBridge) { + GeneratedPluginRegistrant.register(with: engineBridge.pluginRegistry) + } } diff --git a/example/ios/Runner/Info.plist b/example/ios/Runner/Info.plist index 23ace3b..33764a9 100644 --- a/example/ios/Runner/Info.plist +++ b/example/ios/Runner/Info.plist @@ -2,6 +2,8 @@ + CADisableMinimumFrameDurationOnPhone + CFBundleDevelopmentRegion $(DEVELOPMENT_LANGUAGE) CFBundleExecutable @@ -22,6 +24,29 @@ $(FLUTTER_BUILD_NUMBER) LSRequiresIPhoneOS + UIApplicationSceneManifest + + UIApplicationSupportsMultipleScenes + + UISceneConfigurations + + UIWindowSceneSessionRoleApplication + + + UISceneClassName + UIWindowScene + UISceneConfigurationName + flutter + UISceneDelegateClassName + FlutterSceneDelegate + UISceneStoryboardFile + Main + + + + + UIApplicationSupportsIndirectInputEvents + UILaunchStoryboardName LaunchScreen UIMainStoryboardFile @@ -41,9 +66,5 @@ UIViewControllerBasedStatusBarAppearance - CADisableMinimumFrameDurationOnPhone - - UIApplicationSupportsIndirectInputEvents - diff --git a/example/pubspec.lock b/example/pubspec.lock index ff39659..71c8f6b 100644 --- a/example/pubspec.lock +++ b/example/pubspec.lock @@ -15,7 +15,7 @@ packages: path: ".." relative: true source: path - version: "0.1.9" + version: "0.1.10" boolean_selector: dependency: transitive description: @@ -102,10 +102,10 @@ packages: dependency: transitive description: name: matcher - sha256: "12956d0ad8390bbcc63ca2e1469c0619946ccb52809807067a7020d57e647aa6" + sha256: dc0b7dc7651697ea4ff3e69ef44b0407ea32c487a39fff6a4004fa585e901861 url: "https://pub.dev" source: hosted - version: "0.12.18" + version: "0.12.19" material_color_utilities: dependency: transitive description: @@ -118,10 +118,10 @@ packages: dependency: transitive description: name: meta - sha256: "23f08335362185a5ea2ad3a4e597f1375e78bce8a040df5c600c8d3552ef2394" + sha256: "1741988757a65eb6b36abe716829688cf01910bbf91c34354ff7ec1c3de2b349" url: "https://pub.dev" source: hosted - version: "1.17.0" + version: "1.18.0" path: dependency: transitive description: @@ -179,10 +179,10 @@ packages: dependency: transitive description: name: test_api - sha256: "93167629bfc610f71560ab9312acdda4959de4df6fac7492c89ff0d3886f6636" + sha256: "949a932224383300f01be9221c39180316445ecb8e7547f70a41a35bf421fb9e" url: "https://pub.dev" source: hosted - version: "0.7.9" + version: "0.7.11" vector_math: dependency: transitive description: @@ -200,5 +200,5 @@ packages: source: hosted version: "15.0.2" sdks: - dart: ">=3.9.0-0 <4.0.0" + dart: ">=3.10.0-0 <4.0.0" flutter: ">=3.18.0-18.0.pre.54" diff --git a/pubspec.lock b/pubspec.lock index a28b3d7..fbee993 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -87,10 +87,10 @@ packages: dependency: transitive description: name: matcher - sha256: "12956d0ad8390bbcc63ca2e1469c0619946ccb52809807067a7020d57e647aa6" + sha256: dc0b7dc7651697ea4ff3e69ef44b0407ea32c487a39fff6a4004fa585e901861 url: "https://pub.dev" source: hosted - version: "0.12.18" + version: "0.12.19" material_color_utilities: dependency: transitive description: @@ -103,10 +103,10 @@ packages: dependency: transitive description: name: meta - sha256: "23f08335362185a5ea2ad3a4e597f1375e78bce8a040df5c600c8d3552ef2394" + sha256: "1741988757a65eb6b36abe716829688cf01910bbf91c34354ff7ec1c3de2b349" url: "https://pub.dev" source: hosted - version: "1.17.0" + version: "1.18.0" path: dependency: transitive description: @@ -164,10 +164,10 @@ packages: dependency: transitive description: name: test_api - sha256: "93167629bfc610f71560ab9312acdda4959de4df6fac7492c89ff0d3886f6636" + sha256: "949a932224383300f01be9221c39180316445ecb8e7547f70a41a35bf421fb9e" url: "https://pub.dev" source: hosted - version: "0.7.9" + version: "0.7.11" vector_math: dependency: transitive description: @@ -185,5 +185,5 @@ packages: source: hosted version: "15.0.2" sdks: - dart: ">=3.9.0-0 <4.0.0" + dart: ">=3.10.0-0 <4.0.0" flutter: ">=3.18.0-18.0.pre.54" diff --git a/pubspec.yaml b/pubspec.yaml index 7ce28c9..820f048 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,6 +1,6 @@ name: babstrap_settings_screen description: This project help developers to display a beautiful Settings Screen UI using Flutter. -version: 0.1.9 +version: 0.1.10 homepage: https://github.com/babstrap/babstrap_settings_screen.git environment: From ede1cb98801a2c8e74d001ba48cf697e48bd4ff3 Mon Sep 17 00:00:00 2001 From: adityakumar Date: Wed, 8 Jul 2026 07:54:25 +0530 Subject: [PATCH 6/7] compile sdk change to 36 --- .idea/workspace.xml | 37 ++++++++++++------------------------- android/build.gradle | 2 +- 2 files changed, 13 insertions(+), 26 deletions(-) diff --git a/.idea/workspace.xml b/.idea/workspace.xml index b3678d4..4346535 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -4,29 +4,7 @@ - - - - - - - - - - - - - - - - - - - - - - - + @@ -135,6 +121,7 @@ - \ No newline at end of file diff --git a/android/build.gradle b/android/build.gradle index 49061ff..2558151 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -25,7 +25,7 @@ apply plugin: 'com.android.library' android { namespace "com.babacar.babstrap_settings_screen" - compileSdkVersion 37 + compileSdkVersion 36 sourceSets { main.java.srcDirs += 'src/main/kotlin' From ae5b12d105330c9c4b9e6b6319a66d3cac3d2ab0 Mon Sep 17 00:00:00 2001 From: adityakumar Date: Wed, 15 Jul 2026 16:12:12 +0530 Subject: [PATCH 7/7] converted from plugins to packages --- .idea/caches/deviceStreaming.xml | 124 +- .idea/libraries/Dart_Packages.xml | 228 ++ .idea/libraries/Flutter_Plugins.xml | 4 +- .idea/workspace.xml | 121 +- android/.gitignore | 8 - android/.idea/.gitignore | 3 - android/.idea/.name | 1 - android/.idea/AndroidProjectSystem.xml | 6 - android/.idea/appInsightsSettings.xml | 23 - android/.idea/caches/deviceStreaming.xml | 2226 ----------------- android/.idea/compiler.xml | 6 - android/.idea/deviceManager.xml | 13 - android/.idea/gradle.xml | 17 - android/.idea/migrations.xml | 10 - android/.idea/misc.xml | 10 - android/.idea/runConfigurations.xml | 17 - android/.idea/vcs.xml | 6 - android/build.gradle | 51 - android/gradle.properties | 13 - android/gradle/gradle-daemon-jvm.properties | 13 - .../gradle/wrapper/gradle-wrapper.properties | 5 - android/settings.gradle | 4 - android/src/main/AndroidManifest.xml | 3 - .../BabstrapSettingsScreenPlugin.kt | 35 - babstrap_settings_screen.iml | 1 + example/.gitignore | 9 +- example/.metadata | 39 +- example/README.md | 13 +- example/analysis_options.yaml | 28 + example/android/.gitignore | 5 +- example/android/app/build.gradle | 67 - example/android/app/build.gradle.kts | 45 + .../android/app/src/debug/AndroidManifest.xml | 6 +- .../android/app/src/main/AndroidManifest.xml | 31 +- .../MainActivity.kt | 6 - .../com/example/example/MainActivity.kt | 5 + .../app/src/main/res/values-night/styles.xml | 4 +- .../app/src/main/res/values/styles.xml | 4 +- .../app/src/profile/AndroidManifest.xml | 6 +- example/android/build.gradle | 15 - example/android/build.gradle.kts | 24 + example/android/gradle.properties | 9 +- .../gradle/gradle-daemon-jvm.properties | 13 - .../gradle/wrapper/gradle-wrapper.properties | 3 +- example/android/settings.gradle | 26 - example/android/settings.gradle.kts | 26 + example/ios/.gitignore | 1 + example/ios/Flutter/Debug.xcconfig | 1 - example/ios/Flutter/Release.xcconfig | 1 - example/ios/Podfile | 41 - example/ios/Podfile.lock | 22 - example/ios/Runner.xcodeproj/project.pbxproj | 238 +- .../xcshareddata/xcschemes/Runner.xcscheme | 37 +- .../contents.xcworkspacedata | 3 - .../AppIcon.appiconset/Icon-App-20x20@1x.png | Bin 564 -> 295 bytes .../AppIcon.appiconset/Icon-App-20x20@2x.png | Bin 1283 -> 406 bytes .../AppIcon.appiconset/Icon-App-20x20@3x.png | Bin 1588 -> 450 bytes .../AppIcon.appiconset/Icon-App-29x29@1x.png | Bin 1025 -> 282 bytes .../AppIcon.appiconset/Icon-App-29x29@2x.png | Bin 1716 -> 462 bytes .../AppIcon.appiconset/Icon-App-29x29@3x.png | Bin 1920 -> 704 bytes .../AppIcon.appiconset/Icon-App-40x40@1x.png | Bin 1283 -> 406 bytes .../AppIcon.appiconset/Icon-App-40x40@2x.png | Bin 1895 -> 586 bytes .../AppIcon.appiconset/Icon-App-40x40@3x.png | Bin 2665 -> 862 bytes .../AppIcon.appiconset/Icon-App-60x60@2x.png | Bin 2665 -> 862 bytes .../AppIcon.appiconset/Icon-App-60x60@3x.png | Bin 3831 -> 1674 bytes .../AppIcon.appiconset/Icon-App-76x76@1x.png | Bin 1888 -> 762 bytes .../AppIcon.appiconset/Icon-App-76x76@2x.png | Bin 3294 -> 1226 bytes .../Icon-App-83.5x83.5@2x.png | Bin 3612 -> 1418 bytes example/ios/Runner/Info.plist | 8 +- example/ios/Runner/SceneDelegate.swift | 6 + example/ios/RunnerTests/RunnerTests.swift | 12 + example/linux/.gitignore | 1 + example/linux/CMakeLists.txt | 128 + example/linux/flutter/CMakeLists.txt | 88 + .../flutter/generated_plugin_registrant.cc | 11 + .../flutter/generated_plugin_registrant.h | 15 + example/linux/flutter/generated_plugins.cmake | 23 + example/linux/runner/CMakeLists.txt | 26 + example/linux/runner/main.cc | 6 + example/linux/runner/my_application.cc | 148 ++ example/linux/runner/my_application.h | 21 + example/macos/.gitignore | 7 + example/macos/Flutter/Flutter-Debug.xcconfig | 1 + .../macos/Flutter/Flutter-Release.xcconfig | 1 + .../Flutter/GeneratedPluginRegistrant.swift | 10 + .../macos/Runner.xcodeproj/project.pbxproj | 729 ++++++ .../xcshareddata/IDEWorkspaceChecks.plist | 8 + .../xcshareddata/xcschemes/Runner.xcscheme | 117 + .../contents.xcworkspacedata | 7 + .../xcshareddata/IDEWorkspaceChecks.plist | 8 + example/macos/Runner/AppDelegate.swift | 13 + .../AppIcon.appiconset/Contents.json | 68 + .../AppIcon.appiconset/app_icon_1024.png | Bin 0 -> 102994 bytes .../AppIcon.appiconset/app_icon_128.png | Bin 0 -> 5680 bytes .../AppIcon.appiconset/app_icon_16.png | Bin 0 -> 520 bytes .../AppIcon.appiconset/app_icon_256.png | Bin 0 -> 14142 bytes .../AppIcon.appiconset/app_icon_32.png | Bin 0 -> 1066 bytes .../AppIcon.appiconset/app_icon_512.png | Bin 0 -> 36406 bytes .../AppIcon.appiconset/app_icon_64.png | Bin 0 -> 2218 bytes example/macos/Runner/Base.lproj/MainMenu.xib | 343 +++ example/macos/Runner/Configs/AppInfo.xcconfig | 14 + example/macos/Runner/Configs/Debug.xcconfig | 2 + example/macos/Runner/Configs/Release.xcconfig | 2 + .../macos/Runner/Configs/Warnings.xcconfig | 13 + .../macos/Runner/DebugProfile.entitlements | 12 + example/macos/Runner/Info.plist | 32 + example/macos/Runner/MainFlutterWindow.swift | 15 + example/macos/Runner/Release.entitlements | 8 + example/macos/RunnerTests/RunnerTests.swift | 12 + example/pubspec.lock | 32 +- example/pubspec.yaml | 57 +- example/test/widget_test.dart | 27 +- example/web/favicon.png | Bin 0 -> 917 bytes example/web/icons/Icon-192.png | Bin 0 -> 5292 bytes example/web/icons/Icon-512.png | Bin 0 -> 8252 bytes example/web/icons/Icon-maskable-192.png | Bin 0 -> 5594 bytes example/web/icons/Icon-maskable-512.png | Bin 0 -> 20998 bytes example/web/index.html | 46 + example/web/manifest.json | 35 + example/windows/.gitignore | 17 + example/windows/CMakeLists.txt | 108 + example/windows/flutter/CMakeLists.txt | 109 + .../flutter/generated_plugin_registrant.cc | 11 + .../flutter/generated_plugin_registrant.h | 15 + .../windows/flutter/generated_plugins.cmake | 23 + example/windows/runner/CMakeLists.txt | 40 + example/windows/runner/Runner.rc | 121 + example/windows/runner/flutter_window.cpp | 71 + example/windows/runner/flutter_window.h | 33 + example/windows/runner/main.cpp | 43 + example/windows/runner/resource.h | 16 + example/windows/runner/resources/app_icon.ico | Bin 0 -> 33772 bytes example/windows/runner/runner.exe.manifest | 14 + example/windows/runner/utils.cpp | 69 + example/windows/runner/utils.h | 19 + example/windows/runner/win32_window.cpp | 288 +++ example/windows/runner/win32_window.h | 102 + ios/.gitignore | 38 - ios/Assets/.gitkeep | 0 ios/Classes/BabstrapSettingsScreenPlugin.h | 4 - ios/Classes/BabstrapSettingsScreenPlugin.m | 15 - .../SwiftBabstrapSettingsScreenPlugin.swift | 14 - ios/babstrap_settings_screen.podspec | 23 - pubspec.yaml | 9 +- 144 files changed, 3980 insertions(+), 3010 deletions(-) create mode 100644 .idea/libraries/Dart_Packages.xml delete mode 100644 android/.gitignore delete mode 100644 android/.idea/.gitignore delete mode 100644 android/.idea/.name delete mode 100644 android/.idea/AndroidProjectSystem.xml delete mode 100644 android/.idea/appInsightsSettings.xml delete mode 100644 android/.idea/caches/deviceStreaming.xml delete mode 100644 android/.idea/compiler.xml delete mode 100644 android/.idea/deviceManager.xml delete mode 100644 android/.idea/gradle.xml delete mode 100644 android/.idea/migrations.xml delete mode 100644 android/.idea/misc.xml delete mode 100644 android/.idea/runConfigurations.xml delete mode 100644 android/.idea/vcs.xml delete mode 100644 android/build.gradle delete mode 100644 android/gradle.properties delete mode 100644 android/gradle/gradle-daemon-jvm.properties delete mode 100644 android/gradle/wrapper/gradle-wrapper.properties delete mode 100644 android/settings.gradle delete mode 100644 android/src/main/AndroidManifest.xml delete mode 100644 android/src/main/kotlin/com/babacar/babstrap_settings_screen/BabstrapSettingsScreenPlugin.kt create mode 100644 example/analysis_options.yaml delete mode 100644 example/android/app/build.gradle create mode 100644 example/android/app/build.gradle.kts delete mode 100644 example/android/app/src/main/kotlin/com/babacar/babstrap_settings_screen_example/MainActivity.kt create mode 100644 example/android/app/src/main/kotlin/com/example/example/MainActivity.kt delete mode 100644 example/android/build.gradle create mode 100644 example/android/build.gradle.kts delete mode 100644 example/android/gradle/gradle-daemon-jvm.properties delete mode 100644 example/android/settings.gradle create mode 100644 example/android/settings.gradle.kts delete mode 100644 example/ios/Podfile delete mode 100644 example/ios/Podfile.lock create mode 100644 example/ios/Runner/SceneDelegate.swift create mode 100644 example/ios/RunnerTests/RunnerTests.swift create mode 100644 example/linux/.gitignore create mode 100644 example/linux/CMakeLists.txt create mode 100644 example/linux/flutter/CMakeLists.txt create mode 100644 example/linux/flutter/generated_plugin_registrant.cc create mode 100644 example/linux/flutter/generated_plugin_registrant.h create mode 100644 example/linux/flutter/generated_plugins.cmake create mode 100644 example/linux/runner/CMakeLists.txt create mode 100644 example/linux/runner/main.cc create mode 100644 example/linux/runner/my_application.cc create mode 100644 example/linux/runner/my_application.h create mode 100644 example/macos/.gitignore create mode 100644 example/macos/Flutter/Flutter-Debug.xcconfig create mode 100644 example/macos/Flutter/Flutter-Release.xcconfig create mode 100644 example/macos/Flutter/GeneratedPluginRegistrant.swift create mode 100644 example/macos/Runner.xcodeproj/project.pbxproj create mode 100644 example/macos/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist create mode 100644 example/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme create mode 100644 example/macos/Runner.xcworkspace/contents.xcworkspacedata create mode 100644 example/macos/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist create mode 100644 example/macos/Runner/AppDelegate.swift create mode 100644 example/macos/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json create mode 100644 example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png create mode 100644 example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.png create mode 100644 example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.png create mode 100644 example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_256.png create mode 100644 example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_32.png create mode 100644 example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_512.png create mode 100644 example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.png create mode 100644 example/macos/Runner/Base.lproj/MainMenu.xib create mode 100644 example/macos/Runner/Configs/AppInfo.xcconfig create mode 100644 example/macos/Runner/Configs/Debug.xcconfig create mode 100644 example/macos/Runner/Configs/Release.xcconfig create mode 100644 example/macos/Runner/Configs/Warnings.xcconfig create mode 100644 example/macos/Runner/DebugProfile.entitlements create mode 100644 example/macos/Runner/Info.plist create mode 100644 example/macos/Runner/MainFlutterWindow.swift create mode 100644 example/macos/Runner/Release.entitlements create mode 100644 example/macos/RunnerTests/RunnerTests.swift create mode 100644 example/web/favicon.png create mode 100644 example/web/icons/Icon-192.png create mode 100644 example/web/icons/Icon-512.png create mode 100644 example/web/icons/Icon-maskable-192.png create mode 100644 example/web/icons/Icon-maskable-512.png create mode 100644 example/web/index.html create mode 100644 example/web/manifest.json create mode 100644 example/windows/.gitignore create mode 100644 example/windows/CMakeLists.txt create mode 100644 example/windows/flutter/CMakeLists.txt create mode 100644 example/windows/flutter/generated_plugin_registrant.cc create mode 100644 example/windows/flutter/generated_plugin_registrant.h create mode 100644 example/windows/flutter/generated_plugins.cmake create mode 100644 example/windows/runner/CMakeLists.txt create mode 100644 example/windows/runner/Runner.rc create mode 100644 example/windows/runner/flutter_window.cpp create mode 100644 example/windows/runner/flutter_window.h create mode 100644 example/windows/runner/main.cpp create mode 100644 example/windows/runner/resource.h create mode 100644 example/windows/runner/resources/app_icon.ico create mode 100644 example/windows/runner/runner.exe.manifest create mode 100644 example/windows/runner/utils.cpp create mode 100644 example/windows/runner/utils.h create mode 100644 example/windows/runner/win32_window.cpp create mode 100644 example/windows/runner/win32_window.h delete mode 100644 ios/.gitignore delete mode 100644 ios/Assets/.gitkeep delete mode 100644 ios/Classes/BabstrapSettingsScreenPlugin.h delete mode 100644 ios/Classes/BabstrapSettingsScreenPlugin.m delete mode 100644 ios/Classes/SwiftBabstrapSettingsScreenPlugin.swift delete mode 100644 ios/babstrap_settings_screen.podspec diff --git a/.idea/caches/deviceStreaming.xml b/.idea/caches/deviceStreaming.xml index 8981305..9f24cce 100644 --- a/.idea/caches/deviceStreaming.xml +++ b/.idea/caches/deviceStreaming.xml @@ -267,6 +267,18 @@