Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 3 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"java.configuration.updateBuildConfiguration": "interactive"
}
20 changes: 9 additions & 11 deletions android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@ group 'com.sebdeveloper6952.amberflutter.amberflutter'
version '1.0-SNAPSHOT'

buildscript {
ext.kotlin_version = '1.7.10'
ext.kotlin_version = '2.1.0'
repositories {
google()
mavenCentral()
}

dependencies {
classpath 'com.android.tools.build:gradle:7.3.0'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.0-Beta1"
classpath 'com.android.tools.build:gradle:8.7.0'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
}
}

Expand All @@ -26,19 +26,17 @@ apply plugin: 'kotlin-android'
apply plugin: 'org.jetbrains.kotlin.android'

android {
if (project.android.hasProperty("namespace")) {
namespace 'com.sebdeveloper6952.amberflutter.amberflutter'
}
namespace 'com.sebdeveloper6952.amberflutter.amberflutter'

compileSdkVersion 33
compileSdk 36

compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
sourceCompatibility JavaVersion.VERSION_17
targetCompatibility JavaVersion.VERSION_17
}

kotlinOptions {
jvmTarget = '1.8'
jvmTarget = '17'
}

sourceSets {
Expand All @@ -47,7 +45,7 @@ android {
}

defaultConfig {
minSdkVersion 19
minSdk 31
}

dependencies {
Expand Down
2 changes: 1 addition & 1 deletion android/gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
3 changes: 1 addition & 2 deletions android/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.sebdeveloper6952.amberflutter.amberflutter">
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<queries>
<package android:name="com.greenart7c3.nostrsigner"/>
</queries>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,12 @@ class AmberflutterPlugin: FlutterPlugin, MethodCallHandler, ActivityAware, Plugi
}

fun isPackageInstalled(context: Context, target: String): Boolean {
return context.packageManager.getInstalledApplications(0).find { info -> info.packageName == target } != null
return try {
context.packageManager.getPackageInfo(target, 0)
true
} catch (e: Exception) {
false
}
}

override fun onMethodCall(call: MethodCall, result: Result) {
Expand Down Expand Up @@ -68,7 +73,7 @@ class AmberflutterPlugin: FlutterPlugin, MethodCallHandler, ActivityAware, Plugi
_context.contentResolver,
)
if (!data.isNullOrEmpty()) {
Log.d("onMethodCall", "content resolver got data")
Log.d("onMethodCall", "content resolver got $data")
_result.success(data)
return
}
Expand Down Expand Up @@ -102,6 +107,8 @@ class AmberflutterPlugin: FlutterPlugin, MethodCallHandler, ActivityAware, Plugi
var packageName: String? = paramsMap["packageName"] as? String ?: return
val isInstalled: Boolean = isPackageInstalled(_context, packageName!!)
result.success(isInstalled);
} else if (call.method == "getPlatformVersion") {
result.success("Android " + android.os.Build.VERSION.RELEASE)
} else {
result.notImplemented()
}
Expand Down Expand Up @@ -191,7 +198,7 @@ class AmberflutterPlugin: FlutterPlugin, MethodCallHandler, ActivityAware, Plugi
val eventJson = it.getString(indexJson)
dataMap["event"] = eventJson
}

Log.d("getDataFromResolver", "dataMap: $dataMap")
return dataMap
}
}
Expand Down
14 changes: 7 additions & 7 deletions example/android/app/build.gradle
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
plugins {
id "com.android.application"
id "kotlin-android"
id "org.jetbrains.kotlin.android"
id "dev.flutter.flutter-gradle-plugin"
}

Expand All @@ -24,16 +24,16 @@ if (flutterVersionName == null) {

android {
namespace "com.sebdeveloper6952.amberflutter.amberflutter_example"
compileSdkVersion flutter.compileSdkVersion
compileSdk 36
ndkVersion flutter.ndkVersion

compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
sourceCompatibility JavaVersion.VERSION_17
targetCompatibility JavaVersion.VERSION_17
}

kotlinOptions {
jvmTarget = '1.8'
jvmTarget = '17'
}

sourceSets {
Expand All @@ -45,8 +45,8 @@ android {
applicationId "com.sebdeveloper6952.amberflutter.amberflutter_example"
// 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
minSdk 31
targetSdk 36
versionCode flutterVersionCode.toInteger()
versionName flutterVersionName
}
Expand Down
12 changes: 0 additions & 12 deletions example/android/build.gradle
Original file line number Diff line number Diff line change
@@ -1,15 +1,3 @@
buildscript {
ext.kotlin_version = '1.7.10'
repositories {
google()
mavenCentral()
}

dependencies {
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
}
}

allprojects {
repositories {
google()
Expand Down
2 changes: 1 addition & 1 deletion example/android/gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip
3 changes: 2 additions & 1 deletion example/android/settings.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,8 @@ pluginManagement {

plugins {
id "dev.flutter.flutter-plugin-loader" version "1.0.0"
id "com.android.application" version "7.3.0" apply false
id "com.android.application" version "8.7.0" apply false
id "org.jetbrains.kotlin.android" version "2.1.0" apply false
}

include ":app"
Loading