Skip to content

Commit d416731

Browse files
vickz84259vickz84259
authored
Merge pull request #19 from talkjs/feat/flutter_inappwebview
Migration towards flutter_inappwebview
2 parents 1e5def0 + 765a2e9 commit d416731

File tree

14 files changed

+738
-411
lines changed

14 files changed

+738
-411
lines changed

‎example/push_notifications/android/app/src/main/AndroidManifest.xml‎

Lines changed: 25 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
22
package="com.talkjs.flutter_push_example">
33
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
4+
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
45
<uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
56
<uses-permission android:name="android.permission.RECORD_AUDIO" />
6-
<application
7+
<application
78
android:usesCleartextTraffic="true"
89
android:label="push_notifications"
910
android:name="${applicationName}"
@@ -17,22 +18,35 @@
1718
android:hardwareAccelerated="true"
1819
android:windowSoftInputMode="adjustResize">
1920
<!-- Specifies an Android theme to apply to this Activity as soon as
20-
the Android process has started. This theme is visible to the user
21-
while the Flutter UI initializes. After that, this theme continues
22-
to determine the Window background behind the Flutter UI. -->
21+
the
22+
Android process has started. This theme is visible to the user
23+
while
24+
the Flutter UI initializes. After that, this theme continues
25+
to
26+
determine the Window background behind the Flutter UI. -->
2327
<meta-data
24-
android:name="io.flutter.embedding.android.NormalTheme"
25-
android:resource="@style/NormalTheme"
26-
/>
28+
android:name="io.flutter.embedding.android.NormalTheme"
29+
android:resource="@style/NormalTheme"
30+
/>
2731
<intent-filter>
28-
<action android:name="android.intent.action.MAIN"/>
29-
<category android:name="android.intent.category.LAUNCHER"/>
32+
<action android:name="android.intent.action.MAIN" />
33+
<category android:name="android.intent.category.LAUNCHER" />
3034
</intent-filter>
3135
</activity>
3236
<!-- Don't delete the meta-data below.
33-
This is used by the Flutter tool to generate GeneratedPluginRegistrant.java -->
37+
This is used by the Flutter tool to
38+
generate GeneratedPluginRegistrant.java -->
3439
<meta-data
3540
android:name="flutterEmbedding"
3641
android:value="2" />
42+
<provider
43+
android:name="com.pichillilorenzo.flutter_inappwebview.InAppWebViewFileProvider"
44+
android:authorities="${applicationId}.flutter_inappwebview.fileprovider"
45+
android:exported="false"
46+
android:grantUriPermissions="true">
47+
<meta-data
48+
android:name="android.support.FILE_PROVIDER_PATHS"
49+
android:resource="@xml/provider_paths" />
50+
</provider>
3751
</application>
38-
</manifest>
52+
</manifest>

‎example/push_notifications/android/build.gradle‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
buildscript {
2-
ext.kotlin_version = '1.6.21'
2+
ext.kotlin_version = '1.7.21'
33
repositories {
44
google()
55
mavenCentral()
66
}
77

88
dependencies {
9-
classpath 'com.android.tools.build:gradle:7.2.0'
9+
classpath 'com.android.tools.build:gradle:7.4.0'
1010
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
11-
classpath 'com.google.gms:google-services:4.3.10'
11+
classpath 'com.google.gms:google-services:4.3.15'
1212
}
1313
}
1414

‎example/push_notifications/android/gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-all.zip

‎example/push_notifications/ios/Flutter/AppFrameworkInfo.plist‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,6 @@
2121
<key>CFBundleVersion</key>
2222
<string>1.0</string>
2323
<key>MinimumOSVersion</key>
24-
<string>9.0</string>
24+
<string>11.0</string>
2525
</dict>
2626
</plist>

‎example/push_notifications/ios/Podfile‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,5 +37,14 @@ end
3737
post_install do |installer|
3838
installer.pods_project.targets.each do |target|
3939
flutter_additional_ios_build_settings(target)
40+
41+
target.build_configurations.each do |config|
42+
config.build_settings['GCC_PREPROCESSOR_DEFINITIONS'] ||= [
43+
'$(inherited)',
44+
45+
## dart: PermissionGroup.microphone
46+
'PERMISSION_MICROPHONE=1',
47+
]
48+
end
4049
end
4150
end

‎example/push_notifications/ios/Podfile.lock‎

Lines changed: 55 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,28 @@
11
PODS:
2-
- Firebase/CoreOnly (10.2.0):
3-
- FirebaseCore (= 10.2.0)
4-
- Firebase/Messaging (10.2.0):
2+
- Firebase/CoreOnly (10.3.0):
3+
- FirebaseCore (= 10.3.0)
4+
- Firebase/Messaging (10.3.0):
55
- Firebase/CoreOnly
6-
- FirebaseMessaging (~> 10.2.0)
7-
- firebase_core (2.3.0):
8-
- Firebase/CoreOnly (= 10.2.0)
6+
- FirebaseMessaging (~> 10.3.0)
7+
- firebase_core (2.4.1):
8+
- Firebase/CoreOnly (= 10.3.0)
99
- Flutter
10-
- firebase_messaging (14.1.1):
11-
- Firebase/Messaging (= 10.2.0)
10+
- firebase_messaging (14.2.1):
11+
- Firebase/Messaging (= 10.3.0)
1212
- firebase_core
1313
- Flutter
14-
- FirebaseCore (10.2.0):
14+
- FirebaseCore (10.3.0):
1515
- FirebaseCoreInternal (~> 10.0)
1616
- GoogleUtilities/Environment (~> 7.8)
1717
- GoogleUtilities/Logger (~> 7.8)
18-
- FirebaseCoreInternal (10.2.0):
18+
- FirebaseCoreInternal (10.4.0):
1919
- "GoogleUtilities/NSData+zlib (~> 7.8)"
20-
- FirebaseInstallations (10.2.0):
20+
- FirebaseInstallations (10.4.0):
2121
- FirebaseCore (~> 10.0)
2222
- GoogleUtilities/Environment (~> 7.8)
2323
- GoogleUtilities/UserDefaults (~> 7.8)
2424
- PromisesObjC (~> 2.1)
25-
- FirebaseMessaging (10.2.0):
25+
- FirebaseMessaging (10.3.0):
2626
- FirebaseCore (~> 10.0)
2727
- FirebaseInstallations (~> 10.0)
2828
- GoogleDataTransport (~> 9.2)
@@ -36,34 +36,44 @@ PODS:
3636
- Flutter
3737
- flutter_local_notifications (0.0.1):
3838
- Flutter
39-
- GoogleDataTransport (9.2.0):
39+
- GoogleDataTransport (9.2.1):
4040
- GoogleUtilities/Environment (~> 7.7)
4141
- nanopb (< 2.30910.0, >= 2.30908.0)
4242
- PromisesObjC (< 3.0, >= 1.2)
43-
- GoogleUtilities/AppDelegateSwizzler (7.10.0):
43+
- GoogleUtilities/AppDelegateSwizzler (7.11.0):
4444
- GoogleUtilities/Environment
4545
- GoogleUtilities/Logger
4646
- GoogleUtilities/Network
47-
- GoogleUtilities/Environment (7.10.0):
47+
- GoogleUtilities/Environment (7.11.0):
4848
- PromisesObjC (< 3.0, >= 1.2)
49-
- GoogleUtilities/Logger (7.10.0):
49+
- GoogleUtilities/Logger (7.11.0):
5050
- GoogleUtilities/Environment
51-
- GoogleUtilities/Network (7.10.0):
51+
- GoogleUtilities/Network (7.11.0):
5252
- GoogleUtilities/Logger
5353
- "GoogleUtilities/NSData+zlib"
5454
- GoogleUtilities/Reachability
55-
- "GoogleUtilities/NSData+zlib (7.10.0)"
56-
- GoogleUtilities/Reachability (7.10.0):
55+
- "GoogleUtilities/NSData+zlib (7.11.0)"
56+
- GoogleUtilities/Reachability (7.11.0):
5757
- GoogleUtilities/Logger
58-
- GoogleUtilities/UserDefaults (7.10.0):
58+
- GoogleUtilities/UserDefaults (7.11.0):
5959
- GoogleUtilities/Logger
6060
- nanopb (2.30909.0):
6161
- nanopb/decode (= 2.30909.0)
6262
- nanopb/encode (= 2.30909.0)
6363
- nanopb/decode (2.30909.0)
6464
- nanopb/encode (2.30909.0)
65+
- OrderedSet (5.0.0)
66+
- permission_handler_apple (9.0.4):
67+
- Flutter
6568
- PromisesObjC (2.1.1)
66-
- talkjs_webview_flutter_wkwebview (0.0.4):
69+
- talkjs_flutter_inappwebview (0.0.1):
70+
- Flutter
71+
- OrderedSet (~> 5.0)
72+
- talkjs_flutter_inappwebview/Core (= 0.0.1)
73+
- talkjs_flutter_inappwebview/Core (0.0.1):
74+
- Flutter
75+
- OrderedSet (~> 5.0)
76+
- url_launcher_ios (0.0.1):
6777
- Flutter
6878

6979
DEPENDENCIES:
@@ -72,7 +82,9 @@ DEPENDENCIES:
7282
- Flutter (from `Flutter`)
7383
- flutter_apns_only (from `.symlinks/plugins/flutter_apns_only/ios`)
7484
- flutter_local_notifications (from `.symlinks/plugins/flutter_local_notifications/ios`)
75-
- talkjs_webview_flutter_wkwebview (from `.symlinks/plugins/talkjs_webview_flutter_wkwebview/ios`)
85+
- permission_handler_apple (from `.symlinks/plugins/permission_handler_apple/ios`)
86+
- talkjs_flutter_inappwebview (from `.symlinks/plugins/talkjs_flutter_inappwebview/ios`)
87+
- url_launcher_ios (from `.symlinks/plugins/url_launcher_ios/ios`)
7688

7789
SPEC REPOS:
7890
trunk:
@@ -84,6 +96,7 @@ SPEC REPOS:
8496
- GoogleDataTransport
8597
- GoogleUtilities
8698
- nanopb
99+
- OrderedSet
87100
- PromisesObjC
88101

89102
EXTERNAL SOURCES:
@@ -97,26 +110,33 @@ EXTERNAL SOURCES:
97110
:path: ".symlinks/plugins/flutter_apns_only/ios"
98111
flutter_local_notifications:
99112
:path: ".symlinks/plugins/flutter_local_notifications/ios"
100-
talkjs_webview_flutter_wkwebview:
101-
:path: ".symlinks/plugins/talkjs_webview_flutter_wkwebview/ios"
113+
permission_handler_apple:
114+
:path: ".symlinks/plugins/permission_handler_apple/ios"
115+
talkjs_flutter_inappwebview:
116+
:path: ".symlinks/plugins/talkjs_flutter_inappwebview/ios"
117+
url_launcher_ios:
118+
:path: ".symlinks/plugins/url_launcher_ios/ios"
102119

103120
SPEC CHECKSUMS:
104-
Firebase: a3ea7eba4382afd83808376edb99acdaff078dcf
105-
firebase_core: db1432de826785171029b7c1a26e5b22ce1dd477
106-
firebase_messaging: 5babce6fa9ce1e0c63a854dabba227f23dc68b1b
107-
FirebaseCore: 813838072b797b64f529f3c2ee35e696e5641dd1
108-
FirebaseCoreInternal: 091bde13e47bb1c5e9fe397634f3593dc390430f
109-
FirebaseInstallations: 004915af170935e3a583faefd5f8bc851afc220f
110-
FirebaseMessaging: cc9f40f5b7494680f3844d08e517e92aa4e8d9f7
121+
Firebase: f92fc551ead69c94168d36c2b26188263860acd9
122+
firebase_core: bf59c32d2e53814f558efa20840c1902fa2fe461
123+
firebase_messaging: ee597229fc260f8fa491fa8f2d4a32dfbfa406fa
124+
FirebaseCore: 988754646ab3bd4bdcb740f1bfe26b9f6c0d5f2a
125+
FirebaseCoreInternal: e301297f4c15a17489e48ed722d733b1578e0c02
126+
FirebaseInstallations: 36b38c733fd37e50857e5e8d74138648f466f18c
127+
FirebaseMessaging: e345b219fd15d325f0cf2fef28cb8ce00d851b3f
111128
Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854
112129
flutter_apns_only: 3d91c0ca9dbef4439874858590909a19f8ed06a4
113130
flutter_local_notifications: 0c0b1ae97e741e1521e4c1629a459d04b9aec743
114-
GoogleDataTransport: 1c8145da7117bd68bbbed00cf304edb6a24de00f
115-
GoogleUtilities: bad72cb363809015b1f7f19beb1f1cd23c589f95
131+
GoogleDataTransport: ea169759df570f4e37bdee1623ec32a7e64e67c4
132+
GoogleUtilities: c2bdc4cf2ce786c4d2e6b3bcfd599a25ca78f06f
116133
nanopb: b552cce312b6c8484180ef47159bc0f65a1f0431
134+
OrderedSet: aaeb196f7fef5a9edf55d89760da9176ad40b93c
135+
permission_handler_apple: 44366e37eaf29454a1e7b1b7d736c2cceaeb17ce
117136
PromisesObjC: ab77feca74fa2823e7af4249b8326368e61014cb
118-
talkjs_webview_flutter_wkwebview: da8761436024d00892de6d282635e88117517da8
137+
talkjs_flutter_inappwebview: 246473e6cdb856fe9e05cef4ea05bb03e52af4c5
138+
url_launcher_ios: ae1517e5e344f5544fb090b079e11f399dfbe4d2
119139

120-
PODFILE CHECKSUM: 7368163408c647b7eb699d0d788ba6718e18fb8d
140+
PODFILE CHECKSUM: 8f12faaffb8abb86a26294dbffe2854a8a8ae5b1
121141

122142
COCOAPODS: 1.11.3

‎example/push_notifications/ios/Runner/Info.plist‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,8 @@
5252
<false/>
5353
<key>flutter_apns.disable_swizzling</key>
5454
<true/>
55+
<key>NSLocationWhenInUseUsageDescription</key>
56+
<string>Your message to user when the location is accessed for the first time</string>
5557
<key>NSMicrophoneUsageDescription</key>
5658
<string>Your message to user when the microphone is accessed for the first time</string>
5759
</dict>

0 commit comments

Comments
 (0)