From a094a2963601da73dd8265557de93e58c42b8972 Mon Sep 17 00:00:00 2001 From: jjoonleo Date: Wed, 6 May 2026 13:44:21 +0900 Subject: [PATCH] fix: align Android app id with iOS and update sign-in deps --- android/app/build.gradle | 10 ++++++++-- .../devkor/ontime}/MainActivity.kt | 6 +++++- .../devkor/ontime}/NativeAlarmBootReceiver.kt | 2 +- android/settings.gradle | 2 +- macos/Flutter/GeneratedPluginRegistrant.swift | 2 -- pubspec.lock | 8 -------- pubspec.yaml | 1 - 7 files changed, 15 insertions(+), 16 deletions(-) rename android/app/src/main/kotlin/{com/example/on_time_front => club/devkor/ontime}/MainActivity.kt (96%) rename android/app/src/main/kotlin/{com/example/on_time_front => club/devkor/ontime}/NativeAlarmBootReceiver.kt (99%) diff --git a/android/app/build.gradle b/android/app/build.gradle index dca290d0..b1584420 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -9,11 +9,12 @@ plugins { } android { - namespace = "com.example.ontime" + namespace = "club.devkor.ontime" compileSdk = flutter.compileSdkVersion ndkVersion = flutter.ndkVersion compileOptions { + coreLibraryDesugaringEnabled = true sourceCompatibility = JavaVersion.VERSION_1_8 targetCompatibility = JavaVersion.VERSION_1_8 } @@ -24,7 +25,7 @@ android { defaultConfig { // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html). - applicationId = "com.example.on_time_front" + applicationId = "club.devkor.ontime" // You can update the following values to match your application needs. // For more information, see: https://flutter.dev/to/review-gradle-config. minSdk = flutter.minSdkVersion @@ -32,6 +33,7 @@ android { versionCode = flutter.versionCode versionName = flutter.versionName manifestPlaceholders = [ + applicationName: "android.app.Application", appAuthRedirectScheme: applicationId ] } @@ -48,3 +50,7 @@ android { flutter { source = "../.." } + +dependencies { + coreLibraryDesugaring "com.android.tools:desugar_jdk_libs:2.1.4" +} diff --git a/android/app/src/main/kotlin/com/example/on_time_front/MainActivity.kt b/android/app/src/main/kotlin/club/devkor/ontime/MainActivity.kt similarity index 96% rename from android/app/src/main/kotlin/com/example/on_time_front/MainActivity.kt rename to android/app/src/main/kotlin/club/devkor/ontime/MainActivity.kt index b0ae0f4c..85e0d799 100644 --- a/android/app/src/main/kotlin/com/example/on_time_front/MainActivity.kt +++ b/android/app/src/main/kotlin/club/devkor/ontime/MainActivity.kt @@ -1,4 +1,4 @@ -package com.example.on_time_front +package club.devkor.ontime import android.app.AlarmManager import android.app.PendingIntent @@ -86,6 +86,10 @@ class MainActivity : FlutterActivity() { } val pendingIntent = pendingIntentFor(args, PendingIntent.FLAG_UPDATE_CURRENT) + if (pendingIntent == null) { + result.error("scheduleFailed", "Failed to create alarm PendingIntent", null) + return + } val alarmClockInfo = AlarmManager.AlarmClockInfo(triggerAtMillis, pendingIntent) alarmManager.setAlarmClock(alarmClockInfo, pendingIntent) result.success(null) diff --git a/android/app/src/main/kotlin/com/example/on_time_front/NativeAlarmBootReceiver.kt b/android/app/src/main/kotlin/club/devkor/ontime/NativeAlarmBootReceiver.kt similarity index 99% rename from android/app/src/main/kotlin/com/example/on_time_front/NativeAlarmBootReceiver.kt rename to android/app/src/main/kotlin/club/devkor/ontime/NativeAlarmBootReceiver.kt index 73ebff62..46681c1d 100644 --- a/android/app/src/main/kotlin/com/example/on_time_front/NativeAlarmBootReceiver.kt +++ b/android/app/src/main/kotlin/club/devkor/ontime/NativeAlarmBootReceiver.kt @@ -1,4 +1,4 @@ -package com.example.on_time_front +package club.devkor.ontime import android.app.AlarmManager import android.app.PendingIntent diff --git a/android/settings.gradle b/android/settings.gradle index 9759a220..cbde92f5 100644 --- a/android/settings.gradle +++ b/android/settings.gradle @@ -18,7 +18,7 @@ pluginManagement { plugins { id "dev.flutter.flutter-plugin-loader" version "1.0.0" - id "com.android.application" version "8.1.0" apply false + id "com.android.application" version "8.3.0" apply false // START: FlutterFire Configuration id "com.google.gms.google-services" version "4.3.15" apply false // END: FlutterFire Configuration diff --git a/macos/Flutter/GeneratedPluginRegistrant.swift b/macos/Flutter/GeneratedPluginRegistrant.swift index bb3bec86..283d5c95 100644 --- a/macos/Flutter/GeneratedPluginRegistrant.swift +++ b/macos/Flutter/GeneratedPluginRegistrant.swift @@ -10,7 +10,6 @@ import firebase_messaging import flutter_appauth import flutter_local_notifications import flutter_secure_storage_macos -import flutter_web_auth import google_sign_in_ios import path_provider_foundation import shared_preferences_foundation @@ -25,7 +24,6 @@ func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) { FlutterAppauthPlugin.register(with: registry.registrar(forPlugin: "FlutterAppauthPlugin")) FlutterLocalNotificationsPlugin.register(with: registry.registrar(forPlugin: "FlutterLocalNotificationsPlugin")) FlutterSecureStoragePlugin.register(with: registry.registrar(forPlugin: "FlutterSecureStoragePlugin")) - FlutterWebAuthPlugin.register(with: registry.registrar(forPlugin: "FlutterWebAuthPlugin")) FLTGoogleSignInPlugin.register(with: registry.registrar(forPlugin: "FLTGoogleSignInPlugin")) PathProviderPlugin.register(with: registry.registrar(forPlugin: "PathProviderPlugin")) SharedPreferencesPlugin.register(with: registry.registrar(forPlugin: "SharedPreferencesPlugin")) diff --git a/pubspec.lock b/pubspec.lock index f3370445..eeed68b7 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -551,14 +551,6 @@ packages: description: flutter source: sdk version: "0.0.0" - flutter_web_auth: - dependency: "direct main" - description: - name: flutter_web_auth - sha256: "95e4856e24fb6ac1678f5ff334743b63f782d839ab324543d29ccbd295176209" - url: "https://pub.dev" - source: hosted - version: "0.6.0" flutter_web_plugins: dependency: transitive description: flutter diff --git a/pubspec.yaml b/pubspec.yaml index 8378c33b..5ea6a95d 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -58,7 +58,6 @@ dependencies: http: ^1.2.2 url_launcher: ^6.3.1 shared_preferences: ^2.3.3 - flutter_web_auth: ^0.6.0 kakao_flutter_sdk: ^1.9.6 flutter_appauth: ^8.0.1 go_router: ^14.6.2