Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Fix] Kotlin naming conflicts #300

Merged
merged 2 commits into from
Dec 10, 2024
Merged

[Fix] Kotlin naming conflicts #300

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0861de4
Fix Pigeon migration by specifying Kotlin package and refactoring imp…
gdelataillade Dec 10, 2024
5fbec59
Refactor imports
gdelataillade Dec 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions android/src/main/kotlin/com/gdelataillade/alarm/alarm/AlarmPlugin.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.gdelataillade.alarm.alarm

import AlarmApi
import AlarmTriggerApi
import com.gdelataillade.alarm.generated.AlarmApi
import com.gdelataillade.alarm.generated.AlarmTriggerApi
import android.app.Activity
import android.app.KeyguardManager
import android.content.Context
Expand Down
4 changes: 2 additions & 2 deletions android/src/main/kotlin/com/gdelataillade/alarm/api/AlarmApiImpl.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.gdelataillade.alarm.api

import AlarmApi
import AlarmSettingsWire
import com.gdelataillade.alarm.generated.AlarmApi
import com.gdelataillade.alarm.generated.AlarmSettingsWire
import android.app.AlarmManager
import android.app.PendingIntent
import android.content.Context
Expand Down
5 changes: 4 additions & 1 deletion android/src/main/kotlin/com/gdelataillade/alarm/generated/FlutterBindings.g.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,15 @@
// Autogenerated from Pigeon (v22.6.3), do not edit directly.
// Autogenerated from Pigeon (v22.7.0), do not edit directly.
// See also: https://pub.dev/packages/pigeon
@file:Suppress("UNCHECKED_CAST", "ArrayInDataClass")

package com.gdelataillade.alarm.generated

import android.util.Log
import io.flutter.plugin.common.BasicMessageChannel
import io.flutter.plugin.common.BinaryMessenger
import io.flutter.plugin.common.EventChannel
import io.flutter.plugin.common.MessageCodec
import io.flutter.plugin.common.StandardMethodCodec
import io.flutter.plugin.common.StandardMessageCodec
import java.io.ByteArrayOutputStream
import java.nio.ByteBuffer
Expand Down
4 changes: 2 additions & 2 deletions android/src/main/kotlin/com/gdelataillade/alarm/models/AlarmSettings.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.gdelataillade.alarm.models

import AlarmSettingsWire
import kotlinx.serialization.KSerializer
import com.gdelataillade.alarm.generated.AlarmSettingsWire
import com.google.gson.*
import java.util.Date
import kotlinx.serialization.Serializable
import kotlinx.serialization.descriptors.PrimitiveKind
Expand Down
4 changes: 2 additions & 2 deletions android/src/main/kotlin/com/gdelataillade/alarm/models/NotificationSettings.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.gdelataillade.alarm.models

import NotificationSettingsWire
import kotlinx.serialization.Serializable
import com.gdelataillade.alarm.generated.NotificationSettingsWire
import com.google.gson.Gson

@Serializable
data class NotificationSettings(
Expand Down
4 changes: 1 addition & 3 deletions ios/Classes/generated/FlutterBindings.g.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Autogenerated from Pigeon (v22.6.3), do not edit directly.
// Autogenerated from Pigeon (v22.7.0), do not edit directly.
// See also: https://pub.dev/packages/pigeon

import Foundation
Expand Down Expand Up @@ -97,7 +97,6 @@ struct AlarmSettingsWire {
var androidFullScreenIntent: Bool



// swift-format-ignore: AlwaysUseLowerCamelCase
static func fromList(_ pigeonVar_list: [Any?]) -> AlarmSettingsWire? {
let id = pigeonVar_list[0] as! Int64
Expand Down Expand Up @@ -203,7 +202,6 @@ struct NotificationSettingsWire {
var icon: String? = nil



// swift-format-ignore: AlwaysUseLowerCamelCase
static func fromList(_ pigeonVar_list: [Any?]) -> NotificationSettingsWire? {
let title = pigeonVar_list[0] as! String
Expand Down
2 changes: 1 addition & 1 deletion lib/src/generated/platform_bindings.g.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Autogenerated from Pigeon (v22.6.3), do not edit directly.
// Autogenerated from Pigeon (v22.7.0), do not edit directly.
// See also: https://pub.dev/packages/pigeon
// ignore_for_file: public_member_api_docs, non_constant_identifier_names, avoid_as, unused_import, unnecessary_parenthesis, prefer_null_aware_operators, omit_local_variable_types, unused_shown_name, unnecessary_import, no_leading_underscores_for_local_identifiers

Expand Down
3 changes: 3 additions & 0 deletions pigeons/alarm_api.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@ import 'package:pigeon/pigeon.dart';
swiftOut: 'ios/Classes/generated/FlutterBindings.g.swift',
kotlinOut:
'android/src/main/kotlin/com/gdelataillade/alarm/generated/FlutterBindings.g.kt',
kotlinOptions: KotlinOptions(
package: 'com.gdelataillade.alarm.generated',
),
),
)
class AlarmSettingsWire {
Expand Down