🐛 fix login

.github/workflows/Package.yml

@@ -5,11 +5,10 @@ on:
 
 env:
  LLVM_VERSION: '10.0'
- RUST_TOOLCHAIN: nightly-2024-04-15
+ RUST_TOOLCHAIN: nightly-2024-09-04
  NDK_VERSION: 25.2.9519653
- FLUTTER_VERSION: '3.19.3'
+ FLUTTER_VERSION: '3.24.2'
  FLUTTER_CHANNEL: 'stable'
- FRB_VERSION: 'v2.0.0-dev.32'
 
 jobs:
 

.metadata

@@ -4,7 +4,7 @@
 # This file should be version controlled and should not be manually edited.
 
 version:
- revision: "ba393198430278b6595976de84fe170f553cc728"
+ revision: "4cf269e36de2573851eaef3c763994f8f9be494d"
  channel: "stable"
 
 project_type: app
@@ -13,26 +13,26 @@ project_type: app
 migration:
  platforms:
  - platform: root
- create_revision: ba393198430278b6595976de84fe170f553cc728
- base_revision: ba393198430278b6595976de84fe170f553cc728
+ create_revision: 4cf269e36de2573851eaef3c763994f8f9be494d
+ base_revision: 4cf269e36de2573851eaef3c763994f8f9be494d
  - platform: android
- create_revision: ba393198430278b6595976de84fe170f553cc728
- base_revision: ba393198430278b6595976de84fe170f553cc728
+ create_revision: 4cf269e36de2573851eaef3c763994f8f9be494d
+ base_revision: 4cf269e36de2573851eaef3c763994f8f9be494d
  - platform: ios
- create_revision: ba393198430278b6595976de84fe170f553cc728
- base_revision: ba393198430278b6595976de84fe170f553cc728
+ create_revision: 4cf269e36de2573851eaef3c763994f8f9be494d
+ base_revision: 4cf269e36de2573851eaef3c763994f8f9be494d
  - platform: linux
- create_revision: ba393198430278b6595976de84fe170f553cc728
- base_revision: ba393198430278b6595976de84fe170f553cc728
+ create_revision: 4cf269e36de2573851eaef3c763994f8f9be494d
+ base_revision: 4cf269e36de2573851eaef3c763994f8f9be494d
  - platform: macos
- create_revision: ba393198430278b6595976de84fe170f553cc728
- base_revision: ba393198430278b6595976de84fe170f553cc728
+ create_revision: 4cf269e36de2573851eaef3c763994f8f9be494d
+ base_revision: 4cf269e36de2573851eaef3c763994f8f9be494d
  - platform: web
- create_revision: ba393198430278b6595976de84fe170f553cc728
- base_revision: ba393198430278b6595976de84fe170f553cc728
+ create_revision: 4cf269e36de2573851eaef3c763994f8f9be494d
+ base_revision: 4cf269e36de2573851eaef3c763994f8f9be494d
  - platform: windows
- create_revision: ba393198430278b6595976de84fe170f553cc728
- base_revision: ba393198430278b6595976de84fe170f553cc728
+ create_revision: 4cf269e36de2573851eaef3c763994f8f9be494d
+ base_revision: 4cf269e36de2573851eaef3c763994f8f9be494d
 
  # User provided section
 

android/.gitignore

@@ -7,7 +7,7 @@ gradle-wrapper.jar
 GeneratedPluginRegistrant.java
 
 # Remember to never publicly share your keystore.
-# See https://flutter.dev/docs/deployment/android#reference-the-keystore-from-the-app
+# See https://flutter.dev/to/reference-keystore
 key.properties
 **/*.keystore
 **/*.jks

android/app/build.gradle

@@ -1,67 +1,44 @@
 plugins {
  id "com.android.application"
  id "kotlin-android"
+ // The Flutter Gradle Plugin must be applied after the Android and Kotlin Gradle plugins.
  id "dev.flutter.flutter-gradle-plugin"
 }
 
-def localProperties = new Properties()
-def localPropertiesFile = rootProject.file('local.properties')
-if (localPropertiesFile.exists()) {
- localPropertiesFile.withReader('UTF-8') { reader ->
- localProperties.load(reader)
- }
-}
-
-def flutterVersionCode = localProperties.getProperty('flutter.versionCode')
-if (flutterVersionCode == null) {
- flutterVersionCode = '1'
-}
-
-def flutterVersionName = localProperties.getProperty('flutter.versionName')
-if (flutterVersionName == null) {
- flutterVersionName = '1.0'
-}
-
 android {
- namespace "opensource.kobi"
- compileSdk flutter.compileSdkVersion
- ndkVersion flutter.ndkVersion
+ namespace = "opensource.kobi"
+ compileSdk = flutter.compileSdkVersion
+ ndkVersion = flutter.ndkVersion
 
  compileOptions {
- sourceCompatibility JavaVersion.VERSION_1_8
- targetCompatibility JavaVersion.VERSION_1_8
+ sourceCompatibility = JavaVersion.VERSION_1_8
+ targetCompatibility = JavaVersion.VERSION_1_8
  }
 
  kotlinOptions {
- jvmTarget = '1.8'
- }
-
- sourceSets {
- main.java.srcDirs += 'src/main/kotlin'
+ jvmTarget = JavaVersion.VERSION_1_8
  }
 
  defaultConfig {
  // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
- applicationId "opensource.kobi"
+ applicationId = "opensource.kobi"
  // You can update the following values to match your application needs.
- // For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-gradle-build-configuration.
- minSdkVersion flutter.minSdkVersion
- targetSdkVersion flutter.targetSdkVersion
- versionCode flutterVersionCode.toInteger()
- versionName flutterVersionName
+ // For more information, see: https://flutter.dev/to/review-gradle-config.
+ minSdk = flutter.minSdkVersion
+ targetSdk = flutter.targetSdkVersion
+ versionCode = flutter.versionCode
+ versionName = flutter.versionName
  }
 
  buildTypes {
  release {
  // TODO: Add your own signing config for the release build.
  // Signing with the debug keys for now, so `flutter run --release` works.
- signingConfig signingConfigs.debug
+ signingConfig = signingConfigs.debug
  }
  }
 }
 
 flutter {
- source '../..'
+ source = "../.."
 }
-
-dependencies {}

android/app/src/main/AndroidManifest.xml

@@ -22,6 +22,7 @@
  android:name=".MainActivity"
  android:exported="true"
  android:launchMode="singleTop"
+ android:taskAffinity=""
  android:theme="@style/LaunchTheme"
  android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
  android:hardwareAccelerated="true"
@@ -46,7 +47,7 @@
  android:value="2" />
  </application>
  <!-- Required to query activities that can process text, see:
- https://developer.android.com/training/package-visibility?hl=en and
+ https://developer.android.com/training/package-visibility and
  https://developer.android.com/reference/android/content/Intent#ACTION_PROCESS_TEXT.
 
  In particular, this is used by the Flutter engine in io.flutter.plugin.text.ProcessTextPlugin. -->

android/build.gradle

@@ -5,12 +5,12 @@ allprojects {
  }
 }
 
-rootProject.buildDir = '../build'
+rootProject.buildDir = "../build"
 subprojects {
  project.buildDir = "${rootProject.buildDir}/${project.name}"
 }
 subprojects {
- project.evaluationDependsOn(':app')
+ project.evaluationDependsOn(":app")
 }
 
 tasks.register("clean", Delete) {

android/gradle.properties

@@ -1,3 +1,3 @@
-org.gradle.jvmargs=-Xmx4G
+org.gradle.jvmargs=-Xmx4G -XX:MaxMetaspaceSize=2G -XX:+HeapDumpOnOutOfMemoryError
 android.useAndroidX=true
 android.enableJetifier=true

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.6.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-all.zip

android/settings.gradle

@@ -5,10 +5,9 @@ pluginManagement {
  def flutterSdkPath = properties.getProperty("flutter.sdk")
  assert flutterSdkPath != null, "flutter.sdk not set in local.properties"
  return flutterSdkPath
- }
- settings.ext.flutterSdkPath = flutterSdkPath()
+ }()
 
- includeBuild("${settings.ext.flutterSdkPath}/packages/flutter_tools/gradle")
+ includeBuild("$flutterSdkPath/packages/flutter_tools/gradle")
 
  repositories {
  google()
@@ -19,8 +18,8 @@ pluginManagement {
 
 plugins {
  id "dev.flutter.flutter-plugin-loader" version "1.0.0"
- id "com.android.application" version "7.3.0" apply false
- id "org.jetbrains.kotlin.android" version "1.7.10" apply false
+ id "com.android.application" version "8.1.0" apply false
+ id "org.jetbrains.kotlin.android" version "1.8.22" apply false
 }
 
 include ":app"

ci/version.code.txt

@@ -1 +1 @@
-v0.0.11
+v0.0.12

ci/version.info.txt

@@ -1,6 +1,9 @@
 ## 如果图片显示不出来需要删除原来的APP重新安装
 ## PC端需要手动找到文件夹删除
 
+v0.0.12
+- [x] 尝试修复登录问题
+
 v0.0.11
 v0.0.10
 - [x] 尝试修复网络问题

flutter_rust_bridge.yaml

@@ -1,2 +1,3 @@
-rust_input: rust/src/api/**/*.rs
+rust_input: crate::api
+rust_root: rust/
 dart_output: lib/src/rust

integration_test/simple_test.dart

@@ -1,7 +1,7 @@
 import 'package:flutter_test/flutter_test.dart';
 import 'package:kobi/main.dart';
-import 'package:integration_test/integration_test.dart';
 import 'package:kobi/src/rust/frb_generated.dart';
+import 'package:integration_test/integration_test.dart';
 
 void main() {
  IntegrationTestWidgetsFlutterBinding.ensureInitialized();

ios/Podfile.lock

@@ -35,7 +35,7 @@ EXTERNAL SOURCES:
 
 SPEC CHECKSUMS:
  Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7
- integration_test: 13825b8a9334a850581300559b8839134b124670
+ integration_test: 252f60fa39af5e17c3aa9899d35d908a0721b573
  permission_handler_apple: e76247795d700c14ea09e3a2d8855d41ee80a2e6
  rust_lib_kobi: 8e3996650aa1337cbf75bd75ff81442438eef008
  uni_links: d97da20c7701486ba192624d99bffaaffcfc298a