From 2a39ae9db79cc95157939319150bdf65292a0ff3 Mon Sep 17 00:00:00 2001 From: Musaddiq Date: Sat, 27 Apr 2024 20:04:43 +0500 Subject: [PATCH 1/4] chore: added code to show deprecated tag on 'NoScreenshot' constructor --- lib/no_screenshot.dart | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lib/no_screenshot.dart b/lib/no_screenshot.dart index de3e9e5..356b878 100644 --- a/lib/no_screenshot.dart +++ b/lib/no_screenshot.dart @@ -4,6 +4,9 @@ class NoScreenshot implements NoScreenshotPlatform { final _instancePlatform = NoScreenshotPlatform.instance; NoScreenshot._(); + @Deprecated("Using this may cause issue\nUse instance directly\ne.g: 'NoScreenshot.instance.screenshotOff()'") + NoScreenshot(); + /// Made `NoScreenshot` class a singleton static NoScreenshot get instance => NoScreenshot._(); From 6c312a5892a64500b123f52f68f270b44fb2d9f0 Mon Sep 17 00:00:00 2001 From: Musaddiq Date: Sat, 27 Apr 2024 20:15:02 +0500 Subject: [PATCH 2/4] docs: updated code in example --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 1d3ed0e..0eae471 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,7 @@ If you want to prevent user from taking screenshot or recording of your app. You ```dart class _MyHomePageState extends State with WidgetsBindingObserver { - final _noScreenshot = NoScreenshot(); + final _noScreenshot = NoScreenshot.instance; AppLifecycleState? _notification; @override From 12361ecbb7fbd836195f8183950f7545627c6481 Mon Sep 17 00:00:00 2001 From: Geoffrey Giordano Date: Sat, 6 Jul 2024 16:23:30 -0400 Subject: [PATCH 3/4] Set the android namespace Specify a more current version of ScreenProtectorKit. This resolves iOS17 issues. --- CHANGELOG.md | 7 ++++++- android/build.gradle | 2 ++ example/pubspec.lock | 2 +- ios/no_screenshot.podspec | 2 +- 4 files changed, 10 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2254278..2a37dfd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -29,4 +29,9 @@ Updated readme and added sample usage. ## 0.0.1+6 -- Removed the non implemented override functions in android life-cycle \ No newline at end of file +- Removed the non implemented override functions in android life-cycle + +## 0.0.1+7 + +- Set the namespace for android +- Specify a more current version of ScreenProtectorKit. This resolves iOS17 issues. diff --git a/android/build.gradle b/android/build.gradle index 9a5f93b..6b7525e 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -25,6 +25,8 @@ apply plugin: 'com.android.library' apply plugin: 'kotlin-android' android { + + namespace "com.flutterplaza.no_screenshot" compileSdkVersion 31 compileOptions { diff --git a/example/pubspec.lock b/example/pubspec.lock index 712900e..2fd7540 100644 --- a/example/pubspec.lock +++ b/example/pubspec.lock @@ -101,7 +101,7 @@ packages: path: ".." relative: true source: path - version: "0.0.1+6" + version: "0.0.1+7" path: dependency: transitive description: diff --git a/ios/no_screenshot.podspec b/ios/no_screenshot.podspec index a6b139c..8e8c420 100644 --- a/ios/no_screenshot.podspec +++ b/ios/no_screenshot.podspec @@ -15,7 +15,7 @@ A new Flutter plugin project. s.source = { :path => '.' } s.source_files = 'Classes/**/*' s.dependency 'Flutter' - s.dependency 'ScreenProtectorKit', '~> 1.2.0' + s.dependency 'ScreenProtectorKit', '~> 1.3.*' s.platform = :ios, '10.0' # Flutter.framework does not contain a i386 slice. From 7ff69d0b0a0a494d3f604787b733ef094b86a7aa Mon Sep 17 00:00:00 2001 From: Geoffrey Giordano Date: Sat, 6 Jul 2024 16:42:52 -0400 Subject: [PATCH 4/4] ignore vscode and fvm. Also update package versions --- .gitignore | 7 ++++ example/pubspec.lock | 95 +++++++++++++++++++++++++++++--------------- 2 files changed, 69 insertions(+), 33 deletions(-) diff --git a/.gitignore b/.gitignore index 96486fd..74779bd 100644 --- a/.gitignore +++ b/.gitignore @@ -8,8 +8,12 @@ .buildlog/ .history .svn/ +.vscode/* migrate_working_dir/ +# fvm related +.fvmrc + # IntelliJ related *.iml *.ipr @@ -28,3 +32,6 @@ migrate_working_dir/ .dart_tool/ .packages build/ + +# FVM Version Cache +.fvm/ \ No newline at end of file diff --git a/example/pubspec.lock b/example/pubspec.lock index 2fd7540..b5c4ac3 100644 --- a/example/pubspec.lock +++ b/example/pubspec.lock @@ -5,49 +5,56 @@ packages: dependency: transitive description: name: async - url: "https://pub.dartlang.org" + sha256: bfe67ef28df125b7dddcea62755991f807aa39a2492a23e1550161692950bbe0 + url: "https://pub.dev" source: hosted - version: "2.9.0" + version: "2.10.0" boolean_selector: dependency: transitive description: name: boolean_selector - url: "https://pub.dartlang.org" + sha256: "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66" + url: "https://pub.dev" source: hosted - version: "2.1.0" + version: "2.1.1" characters: dependency: transitive description: name: characters - url: "https://pub.dartlang.org" + sha256: e6a326c8af69605aec75ed6c187d06b349707a27fbff8222ca9cc2cff167975c + url: "https://pub.dev" source: hosted version: "1.2.1" clock: dependency: transitive description: name: clock - url: "https://pub.dartlang.org" + sha256: cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf + url: "https://pub.dev" source: hosted version: "1.1.1" collection: dependency: transitive description: name: collection - url: "https://pub.dartlang.org" + sha256: cfc915e6923fe5ce6e153b0723c753045de46de1b4d63771530504004a45fae0 + url: "https://pub.dev" source: hosted - version: "1.16.0" + version: "1.17.0" cupertino_icons: dependency: "direct main" description: name: cupertino_icons - url: "https://pub.dartlang.org" + sha256: e35129dc44c9118cee2a5603506d823bab99c68393879edb440e0090d07586be + url: "https://pub.dev" source: hosted version: "1.0.5" fake_async: dependency: transitive description: name: fake_async - url: "https://pub.dartlang.org" + sha256: "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78" + url: "https://pub.dev" source: hosted version: "1.3.1" flutter: @@ -59,7 +66,8 @@ packages: dependency: "direct dev" description: name: flutter_lints - url: "https://pub.dartlang.org" + sha256: aeb0b80a8b3709709c9cc496cdc027c5b3216796bc0af0ce1007eaf24464fd4c + url: "https://pub.dev" source: hosted version: "2.0.1" flutter_test: @@ -67,32 +75,44 @@ packages: description: flutter source: sdk version: "0.0.0" + js: + dependency: transitive + description: + name: js + sha256: "5528c2f391ededb7775ec1daa69e65a2d61276f7552de2b5f7b8d34ee9fd4ab7" + url: "https://pub.dev" + source: hosted + version: "0.6.5" lints: dependency: transitive description: name: lints - url: "https://pub.dartlang.org" + sha256: "5e4a9cd06d447758280a8ac2405101e0e2094d2a1dbdd3756aec3fe7775ba593" + url: "https://pub.dev" source: hosted version: "2.0.1" matcher: dependency: transitive description: name: matcher - url: "https://pub.dartlang.org" + sha256: "16db949ceee371e9b99d22f88fa3a73c4e59fd0afed0bd25fc336eb76c198b72" + url: "https://pub.dev" source: hosted - version: "0.12.12" + version: "0.12.13" material_color_utilities: dependency: transitive description: name: material_color_utilities - url: "https://pub.dartlang.org" + sha256: d92141dc6fe1dad30722f9aa826c7fbc896d021d792f80678280601aff8cf724 + url: "https://pub.dev" source: hosted - version: "0.1.5" + version: "0.2.0" meta: dependency: transitive description: name: meta - url: "https://pub.dartlang.org" + sha256: "6c268b42ed578a53088d834796959e4a1814b5e9e164f147f580a386e5decf42" + url: "https://pub.dev" source: hosted version: "1.8.0" no_screenshot: @@ -101,19 +121,21 @@ packages: path: ".." relative: true source: path - version: "0.0.1+7" + version: "0.0.1+6" path: dependency: transitive description: name: path - url: "https://pub.dartlang.org" + sha256: db9d4f58c908a4ba5953fcee2ae317c94889433e5024c27ce74a37f94267945b + url: "https://pub.dev" source: hosted version: "1.8.2" plugin_platform_interface: dependency: transitive description: name: plugin_platform_interface - url: "https://pub.dartlang.org" + sha256: dbf0f707c78beedc9200146ad3cb0ab4d5da13c246336987be6940f026500d3a + url: "https://pub.dev" source: hosted version: "2.1.3" sky_engine: @@ -125,51 +147,58 @@ packages: dependency: transitive description: name: source_span - url: "https://pub.dartlang.org" + sha256: dd904f795d4b4f3b870833847c461801f6750a9fa8e61ea5ac53f9422b31f250 + url: "https://pub.dev" source: hosted - version: "1.9.0" + version: "1.9.1" stack_trace: dependency: transitive description: name: stack_trace - url: "https://pub.dartlang.org" + sha256: c3c7d8edb15bee7f0f74debd4b9c5f3c2ea86766fe4178eb2a18eb30a0bdaed5 + url: "https://pub.dev" source: hosted - version: "1.10.0" + version: "1.11.0" stream_channel: dependency: transitive description: name: stream_channel - url: "https://pub.dartlang.org" + sha256: "83615bee9045c1d322bbbd1ba209b7a749c2cbcdcb3fdd1df8eb488b3279c1c8" + url: "https://pub.dev" source: hosted - version: "2.1.0" + version: "2.1.1" string_scanner: dependency: transitive description: name: string_scanner - url: "https://pub.dartlang.org" + sha256: "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde" + url: "https://pub.dev" source: hosted - version: "1.1.1" + version: "1.2.0" term_glyph: dependency: transitive description: name: term_glyph - url: "https://pub.dartlang.org" + sha256: a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84 + url: "https://pub.dev" source: hosted version: "1.2.1" test_api: dependency: transitive description: name: test_api - url: "https://pub.dartlang.org" + sha256: ad540f65f92caa91bf21dfc8ffb8c589d6e4dc0c2267818b4cc2792857706206 + url: "https://pub.dev" source: hosted - version: "0.4.12" + version: "0.4.16" vector_math: dependency: transitive description: name: vector_math - url: "https://pub.dartlang.org" + sha256: "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803" + url: "https://pub.dev" source: hosted - version: "2.1.2" + version: "2.1.4" sdks: dart: ">=2.18.2 <3.0.0" flutter: ">=2.5.0"