rogalikkkkkk
/
iosWebViewFix
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'carloserazo47-issue_location/build_on_and_support_android_12_sdk_31' into develop

This commit is contained in:
Lorenzo Pichilli 2022-04-17 18:16:25 +02:00
parent 2a6b76cd5f 1325e6623c
commit cdb29caefc
6 changed files with 22 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
android/build.gradle
View File

@ -4,7 +4,7 @@ version '1.0-SNAPSHOT'
buildscript { buildscript {
repositories { repositories {
google() google()
jcenter() mavenCentral()
} }
dependencies { dependencies {
@ -15,7 +15,7 @@ buildscript {
rootProject.allprojects { rootProject.allprojects {
repositories { repositories {
google() google()
jcenter() mavenCentral()
} }
} }

3
android/src/main/AndroidManifest.xml
View File

@ -4,13 +4,16 @@
<application> <application>
<activity <activity
android:theme="@style/AppTheme" android:theme="@style/AppTheme"
android:exported="true"
android:name="com.pichillilorenzo.flutter_inappwebview.in_app_browser.InAppBrowserActivity" android:name="com.pichillilorenzo.flutter_inappwebview.in_app_browser.InAppBrowserActivity"
android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|layoutDirection|fontScale|screenLayout|density" /> android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|layoutDirection|fontScale|screenLayout|density" />
<activity <activity
android:theme="@style/ThemeTransparent" android:theme="@style/ThemeTransparent"
android:exported="true"
android:name="com.pichillilorenzo.flutter_inappwebview.chrome_custom_tabs.ChromeCustomTabsActivity" /> android:name="com.pichillilorenzo.flutter_inappwebview.chrome_custom_tabs.ChromeCustomTabsActivity" />
<activity <activity
android:theme="@style/ThemeTransparent" android:theme="@style/ThemeTransparent"
android:exported="true"
android:name="com.pichillilorenzo.flutter_inappwebview.chrome_custom_tabs.ChromeCustomTabsActivitySingleInstance" android:name="com.pichillilorenzo.flutter_inappwebview.chrome_custom_tabs.ChromeCustomTabsActivitySingleInstance"
android:launchMode="singleInstance"/> android:launchMode="singleInstance"/>
<receiver android:name="com.pichillilorenzo.flutter_inappwebview.chrome_custom_tabs.ActionBroadcastReceiver" /> <receiver android:name="com.pichillilorenzo.flutter_inappwebview.chrome_custom_tabs.ActionBroadcastReceiver" />

9
android/src/main/java/com/pichillilorenzo/flutter_inappwebview/chrome_custom_tabs/ChromeCustomTabsActivity.java
View File

@ -207,8 +207,13 @@ public class ChromeCustomTabsActivity extends Activity implements MethodChannel.
extras.putString(ActionBroadcastReceiver.CHROME_MANAGER_ID, manager.id); extras.putString(ActionBroadcastReceiver.CHROME_MANAGER_ID, manager.id);
actionIntent.putExtras(extras); actionIntent.putExtras(extras);
return PendingIntent.getBroadcast( if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.M) {
this, actionSourceId, actionIntent, PendingIntent.FLAG_UPDATE_CURRENT); return PendingIntent.getBroadcast(
this, actionSourceId, actionIntent, PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE);
} else {
return PendingIntent.getBroadcast(
this, actionSourceId, actionIntent, PendingIntent.FLAG_UPDATE_CURRENT);
}
} }
public void dispose() { public void dispose() {

1
example/android/app/src/main/AndroidManifest.xml
View File

@ -55,6 +55,7 @@
android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|layoutDirection|fontScale|screenLayout|density" android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|layoutDirection|fontScale|screenLayout|density"
android:hardwareAccelerated="true" android:hardwareAccelerated="true"
android:launchMode="singleTop" android:launchMode="singleTop"
android:exported="true"
android:name="io.flutter.embedding.android.FlutterActivity" android:name="io.flutter.embedding.android.FlutterActivity"
android:theme="@style/LaunchTheme" android:theme="@style/LaunchTheme"
android:windowSoftInputMode="adjustResize"> android:windowSoftInputMode="adjustResize">

4
example/android/build.gradle
View File

@ -2,7 +2,7 @@ buildscript {
ext.kotlin_version = '1.6.10' ext.kotlin_version = '1.6.10'
repositories { repositories {
google() google()
jcenter() mavenCentral()
} }
dependencies { dependencies {
@ -14,7 +14,7 @@ buildscript {
allprojects { allprojects {
repositories { repositories {
google() google()
jcenter() mavenCentral()
} }
} }

14
example/pubspec.yaml
View File

@ -10,8 +10,8 @@ description: Demonstrates how to use the flutter_inappwebview plugin.
version: 1.0.0+1 version: 1.0.0+1
environment: environment:
sdk: ">=2.12.0-0 <3.0.0" sdk: ">=2.14.0 <3.0.0"
flutter: ">=1.22.2" flutter: ">=2.5.0"
dependencies: dependencies:
flutter: flutter:
@ -19,11 +19,11 @@ dependencies:
# The following adds the Cupertino Icons font to your application. # The following adds the Cupertino Icons font to your application.
# Use with the CupertinoIcons class for iOS style icons. # Use with the CupertinoIcons class for iOS style icons.
cupertino_icons: ^1.0.2 cupertino_icons: ^1.0.4
flutter_downloader: ^1.5.2 flutter_downloader: ^1.7.3
path_provider: ^2.0.0-nullsafety path_provider: ^2.0.9
permission_handler: ^5.1.0+2 permission_handler: ^9.2.0
url_launcher: ^6.0.0-nullsafety.4 url_launcher: ^6.0.20
# connectivity: ^0.4.5+6 # connectivity: ^0.4.5+6
flutter_inappwebview: flutter_inappwebview:
path: ../ path: ../