ember/fluffychat
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fluffychat merge

Browse source
This commit is contained in:
ggurdin 2026-02-02 16:45:18 -05:00
commit 7ad158a1c9
No known key found for this signature in database
GPG key ID: A01CB41737CBB478
12 changed files with 40 additions and 1930 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.github/workflows/integrate.yaml vendored
View file

@ -25,7 +25,7 @@ jobs:
- name: Check license compliance
run: dart run license_checker check-licenses -c licenses.yaml --problematic
- run: flutter analyze
- name: Add Firebase Messaging # Add android and analyze again
- name: Add Firebase Messaging
run: ./scripts/add-firebase-messaging.sh
- run: flutter analyze
- run: flutter test

1849
.gitignore vendored
View file

File diff suppressed because it is too large Load diff

12
.metadata
View file

@ -4,7 +4,7 @@
# This file should be version controlled.
version:
revision: "abb292a07e20d696c4568099f918f6c5f330e6b0"
revision: "fcf2c11572af6f390246c056bc905eca609533a0"
channel: "stable"
project_type: app
@ -13,11 +13,11 @@ project_type: app
migration:
platforms:
- platform: root
create_revision: abb292a07e20d696c4568099f918f6c5f330e6b0
base_revision: abb292a07e20d696c4568099f918f6c5f330e6b0
- platform: linux
create_revision: abb292a07e20d696c4568099f918f6c5f330e6b0
base_revision: abb292a07e20d696c4568099f918f6c5f330e6b0
create_revision: fcf2c11572af6f390246c056bc905eca609533a0
base_revision: fcf2c11572af6f390246c056bc905eca609533a0
- platform: android
create_revision: fcf2c11572af6f390246c056bc905eca609533a0
base_revision: fcf2c11572af6f390246c056bc905eca609533a0
# User provided section

41
android/app/build.gradle.kts
View file

@ -8,49 +8,27 @@ plugins {
id("dev.flutter.flutter-gradle-plugin")
}
// conditionally apply google-services (keeps your original intent)
if (file("google-services.json").exists()) {
apply(plugin = "com.google.gms.google-services")
}
dependencies {
coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:2.1.4") // For flutter_local_notifications // Workaround for: https://github.com/MaikuB/flutter_local_notifications/issues/2286
implementation(platform("com.google.firebase:firebase-bom:32.8.0"))
implementation("com.google.firebase:firebase-analytics")
implementation("com.google.firebase:firebase-database")
implementation("androidx.multidex:multidex:2.0.1")
}
// Workaround for https://pub.dev/packages/unifiedpush#the-build-fails-because-of-duplicate-classes
configurations.all {
// Use the latest version published: https://central.sonatype.com/artifact/com.google.crypto.tink/tink-android
val tink = "com.google.crypto.tink:tink-android:1.17.0"
// You can also use the library declaration catalog
// val tink = libs.google.tink
resolutionStrategy {
force(tink)
dependencySubstitution {
substitute(module("com.google.crypto.tink:tink")).using(module(tink))
}
}
}
android {
namespace = "com.talktolearn.chat"
compileSdk = 35
// compileSdk = flutter.compileSdkVersion
// ndkVersion = "27.0.12077973"
compileSdk = flutter.compileSdkVersion
ndkVersion = "27.0.12077973"
compileOptions {
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
sourceCompatibility = JavaVersion.VERSION_11
targetCompatibility = JavaVersion.VERSION_11
isCoreLibraryDesugaringEnabled = true
}
kotlinOptions {
jvmTarget = JavaVersion.VERSION_17.toString()
jvmTarget = JavaVersion.VERSION_11.toString()
}
signingConfigs {
@ -83,16 +61,7 @@ android {
}
buildTypes {
debug {
signingConfig = signingConfigs.getByName("debug")
versionNameSuffix = "-debug"
isMinifyEnabled = false
isShrinkResources = false
}
release {
isMinifyEnabled = false
isShrinkResources = false
// use the release signing config we created above (will be used only if key properties exist)
signingConfig = signingConfigs.getByName("release")
proguardFiles(getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro")
}

2
android/app/src/main/kotlin/chat/fluffy/fluffychat/MainActivity.kt
View file

@ -4,13 +4,11 @@ import io.flutter.embedding.android.FlutterActivity
import io.flutter.embedding.engine.FlutterEngine
import android.content.Context
import androidx.multidex.MultiDex
class MainActivity : FlutterActivity() {
override fun attachBaseContext(base: Context) {
super.attachBaseContext(base)
MultiDex.install(this)
}

10
android/build.gradle.kts
View file

@ -19,13 +19,3 @@ subprojects {
tasks.register<Delete>("clean") {
delete(rootProject.layout.buildDirectory)
}
buildscript {
repositories {
google()
mavenCentral()
}
dependencies {
classpath("com.google.gms:google-services:4.4.1")
}
}

18
android/settings.gradle.kts
View file

@ -16,25 +16,13 @@ pluginManagement {
}
}
buildscript {
repositories {
mavenCentral()
maven {
url = uri("https://storage.googleapis.com/r8-releases/raw")
}
}
dependencies {
classpath("com.android.tools:r8:8.2.24")
}
}
plugins {
id("dev.flutter.flutter-plugin-loader") version "1.0.0"
id("com.android.application") version "8.7.3" apply false
id("org.jetbrains.kotlin.android") version "2.1.10" apply false
id("org.jetbrains.kotlin.android") version "2.1.0" apply false
if (file("app/google-services.json").exists()) {
id("com.google.gms.google-services") version "4.3.8" apply false
}
}
}
include(":app")
include(":app")

5
lib/utils/background_push.dart
View file

@ -272,13 +272,12 @@ class BackgroundPush {
}) async {
// #Pangea
// if (PlatformInfos.isIOS) {
// await firebase.requestPermission();
// //<GOOGLE_SERVICES>await firebase.requestPermission();
// }
// if (PlatformInfos.isAndroid) {
// _flutterLocalNotificationsPlugin
// .resolvePlatformSpecificImplementation<
// AndroidFlutterLocalNotificationsPlugin
// >()
// AndroidFlutterLocalNotificationsPlugin>()
// ?.requestNotificationsPermission();
// }
// Pangea#

24
pubspec.lock
View file

@ -830,26 +830,34 @@ packages:
dependency: "direct main"
description:
name: flutter_local_notifications
sha256: "674173fd3c9eda9d4c8528da2ce0ea69f161577495a9cc835a2a4ecd7eadeb35"
sha256: edae0c34573233ab03f5ba1f07465e55c384743893042cb19e010b4ee8541c12
url: "https://pub.dev"
source: hosted
version: "17.2.4"
version: "19.3.0"
flutter_local_notifications_linux:
dependency: transitive
description:
name: flutter_local_notifications_linux
sha256: c49bd06165cad9beeb79090b18cd1eb0296f4bf4b23b84426e37dd7c027fc3af
sha256: e3c277b2daab8e36ac5a6820536668d07e83851aeeb79c446e525a70710770a5
url: "https://pub.dev"
source: hosted
version: "4.0.1"
version: "6.0.0"
flutter_local_notifications_platform_interface:
dependency: transitive
description:
name: flutter_local_notifications_platform_interface
sha256: "85f8d07fe708c1bdcf45037f2c0109753b26ae077e9d9e899d55971711a4ea66"
sha256: "277d25d960c15674ce78ca97f57d0bae2ee401c844b6ac80fcd972a9c99d09fe"
url: "https://pub.dev"
source: hosted
version: "7.2.0"
version: "9.1.0"
flutter_local_notifications_windows:
dependency: transitive
description:
name: flutter_local_notifications_windows
sha256: f8fc0652a601f83419d623c85723a3e82ad81f92b33eaa9bcc21ea1b94773e6e
url: "https://pub.dev"
source: hosted
version: "1.0.0"
flutter_localizations:
dependency: "direct main"
description: flutter
@ -2504,10 +2512,10 @@ packages:
dependency: transitive
description:
name: timezone
sha256: "2236ec079a174ce07434e89fcd3fcda430025eb7692244139a9cf54fdcf1fc7d"
sha256: dd14a3b83cfd7cb19e7888f1cbc20f258b8d71b54c06f79ac585f14093a287d1
url: "https://pub.dev"
source: hosted
version: "0.9.4"
version: "0.10.1"
tint:
dependency: transitive
description:

2
pubspec.yaml
View file

@ -40,7 +40,7 @@ dependencies:
flutter_foreground_task: ^6.1.3
flutter_highlighter: ^0.1.1
flutter_linkify: ^6.0.0
flutter_local_notifications: ^17.2.3
flutter_local_notifications: ^19.2.1
flutter_localizations:
sdk: flutter
flutter_map: ^6.1.0

4
scripts/release-ios-testflight.sh
View file

@ -1,6 +1,6 @@
#!/bin/sh -ve
flutter pub add fcm_shared_isolate:0.1.0
sed -i '' 's,//<GOOGLE_SERVICES>,,g' lib/utils/background_push.dart
./scripts/add-firebase-messaging.sh
yq eval '.dependencies.fcm_shared_isolate = "0.1.0"' -i pubspec.yaml # Workaround: 0.2.0 does not work on iOS
flutter clean
flutter pub get
cd ios

1
windows/flutter/generated_plugins.cmake
View file

@ -25,6 +25,7 @@ list(APPEND FLUTTER_PLUGIN_LIST
)
list(APPEND FLUTTER_FFI_PLUGIN_LIST
flutter_local_notifications_windows
flutter_vodozemac
)