Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
F
Flutter Inappwebview
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
李增强
Flutter Inappwebview
Commits
35d7fe85
Commit
35d7fe85
authored
5 years ago
by
Rex Momoh
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
upgrade to androidX
parent
ca875230
Changes
14
Hide whitespace changes
Inline
Side-by-side
Showing
14 changed files
with
34 additions
and
53 deletions
+34
-53
android/.idea/caches/build_file_checksums.ser
android/.idea/caches/build_file_checksums.ser
+0
-0
android/.idea/caches/gradle_models.ser
android/.idea/caches/gradle_models.ser
+0
-0
android/.idea/gradle.xml
android/.idea/gradle.xml
+3
-5
android/.idea/misc.xml
android/.idea/misc.xml
+5
-29
android/.idea/vcs.xml
android/.idea/vcs.xml
+6
-0
android/build.gradle
android/build.gradle
+4
-4
android/gradle.properties
android/gradle.properties
+2
-0
android/src/main/java/com/pichillilorenzo/flutter_inappbrowser/ChromeCustomTabs/ChromeCustomTabsActivity.java
...appbrowser/ChromeCustomTabs/ChromeCustomTabsActivity.java
+1
-1
android/src/main/java/com/pichillilorenzo/flutter_inappbrowser/ChromeCustomTabs/CustomTabActivityHelper.java
...nappbrowser/ChromeCustomTabs/CustomTabActivityHelper.java
+4
-4
android/src/main/java/com/pichillilorenzo/flutter_inappbrowser/ChromeCustomTabs/ServiceConnection.java
...tter_inappbrowser/ChromeCustomTabs/ServiceConnection.java
+2
-2
android/src/main/java/com/pichillilorenzo/flutter_inappbrowser/ChromeCustomTabs/ServiceConnectionCallback.java
...ppbrowser/ChromeCustomTabs/ServiceConnectionCallback.java
+1
-1
android/src/main/java/com/pichillilorenzo/flutter_inappbrowser/InAppBrowserActivity.java
...llilorenzo/flutter_inappbrowser/InAppBrowserActivity.java
+2
-3
android/src/main/java/com/pichillilorenzo/flutter_inappbrowser/InAppWebView/InAppWebViewClient.java
...flutter_inappbrowser/InAppWebView/InAppWebViewClient.java
+1
-1
android/src/main/java/com/pichillilorenzo/flutter_inappbrowser/RequestPermissionHandler.java
...orenzo/flutter_inappbrowser/RequestPermissionHandler.java
+3
-3
No files found.
android/.idea/caches/build_file_checksums.ser
View file @
35d7fe85
No preview for this file type
This diff is collapsed.
Click to expand it.
android/.idea/caches/gradle_models.ser
0 → 100644
View file @
35d7fe85
File added
This diff is collapsed.
Click to expand it.
android/.idea/gradle.xml
View file @
35d7fe85
...
@@ -3,13 +3,11 @@
...
@@ -3,13 +3,11 @@
<component
name=
"GradleSettings"
>
<component
name=
"GradleSettings"
>
<option
name=
"linkedExternalProjectsSettings"
>
<option
name=
"linkedExternalProjectsSettings"
>
<GradleProjectSettings>
<GradleProjectSettings>
<compositeConfiguration>
<compositeBuild
compositeDefinitionSource=
"SCRIPT"
/>
</compositeConfiguration>
<option
name=
"distributionType"
value=
"DEFAULT_WRAPPED"
/>
<option
name=
"distributionType"
value=
"DEFAULT_WRAPPED"
/>
<option
name=
"externalProjectPath"
value=
"$PROJECT_DIR$"
/>
<option
name=
"externalProjectPath"
value=
"$PROJECT_DIR$"
/>
<option
name=
"modules"
>
<set>
<option
value=
"$PROJECT_DIR$"
/>
</set>
</option>
<option
name=
"resolveModulePerSourceSet"
value=
"false"
/>
<option
name=
"resolveModulePerSourceSet"
value=
"false"
/>
</GradleProjectSettings>
</GradleProjectSettings>
</option>
</option>
...
...
This diff is collapsed.
Click to expand it.
android/.idea/misc.xml
View file @
35d7fe85
<?xml version="1.0" encoding="UTF-8"?>
<?xml version="1.0" encoding="UTF-8"?>
<project
version=
"4"
>
<project
version=
"4"
>
<component
name=
"NullableNotNullManager"
>
<component
name=
"CMakeSettings"
>
<option
name=
"myDefaultNullable"
value=
"android.support.annotation.Nullable"
/>
<configurations>
<option
name=
"myDefaultNotNull"
value=
"android.support.annotation.NonNull"
/>
<configuration
PROFILE_NAME=
"Debug"
CONFIG_NAME=
"Debug"
/>
<option
name=
"myNullables"
>
</configurations>
<value>
<list
size=
"7"
>
<item
index=
"0"
class=
"java.lang.String"
itemvalue=
"org.jetbrains.annotations.Nullable"
/>
<item
index=
"1"
class=
"java.lang.String"
itemvalue=
"javax.annotation.Nullable"
/>
<item
index=
"2"
class=
"java.lang.String"
itemvalue=
"javax.annotation.CheckForNull"
/>
<item
index=
"3"
class=
"java.lang.String"
itemvalue=
"edu.umd.cs.findbugs.annotations.Nullable"
/>
<item
index=
"4"
class=
"java.lang.String"
itemvalue=
"android.support.annotation.Nullable"
/>
<item
index=
"5"
class=
"java.lang.String"
itemvalue=
"androidx.annotation.Nullable"
/>
<item
index=
"6"
class=
"java.lang.String"
itemvalue=
"androidx.annotation.RecentlyNullable"
/>
</list>
</value>
</option>
<option
name=
"myNotNulls"
>
<value>
<list
size=
"6"
>
<item
index=
"0"
class=
"java.lang.String"
itemvalue=
"org.jetbrains.annotations.NotNull"
/>
<item
index=
"1"
class=
"java.lang.String"
itemvalue=
"javax.annotation.Nonnull"
/>
<item
index=
"2"
class=
"java.lang.String"
itemvalue=
"edu.umd.cs.findbugs.annotations.NonNull"
/>
<item
index=
"3"
class=
"java.lang.String"
itemvalue=
"android.support.annotation.NonNull"
/>
<item
index=
"4"
class=
"java.lang.String"
itemvalue=
"androidx.annotation.NonNull"
/>
<item
index=
"5"
class=
"java.lang.String"
itemvalue=
"androidx.annotation.RecentlyNonNull"
/>
</list>
</value>
</option>
</component>
</component>
<component
name=
"ProjectRootManager"
version=
"2"
languageLevel=
"JDK_1_
8
"
project-jdk-name=
"1.8"
project-jdk-type=
"JavaSDK"
>
<component
name=
"ProjectRootManager"
version=
"2"
languageLevel=
"JDK_1_
7
"
project-jdk-name=
"1.8"
project-jdk-type=
"JavaSDK"
>
<output
url=
"file://$PROJECT_DIR$/build/classes"
/>
<output
url=
"file://$PROJECT_DIR$/build/classes"
/>
</component>
</component>
<component
name=
"ProjectType"
>
<component
name=
"ProjectType"
>
...
...
This diff is collapsed.
Click to expand it.
android/.idea/vcs.xml
0 → 100644
View file @
35d7fe85
<?xml version="1.0" encoding="UTF-8"?>
<project
version=
"4"
>
<component
name=
"VcsDirectoryMappings"
>
<mapping
directory=
"$PROJECT_DIR$/.."
vcs=
"Git"
/>
</component>
</project>
\ No newline at end of file
This diff is collapsed.
Click to expand it.
android/build.gradle
View file @
35d7fe85
...
@@ -22,11 +22,11 @@ rootProject.allprojects {
...
@@ -22,11 +22,11 @@ rootProject.allprojects {
apply
plugin:
'com.android.library'
apply
plugin:
'com.android.library'
android
{
android
{
compileSdkVersion
2
7
compileSdkVersion
2
8
defaultConfig
{
defaultConfig
{
minSdkVersion
17
minSdkVersion
17
testInstrumentationRunner
"android
.support
.test.runner.AndroidJUnitRunner"
testInstrumentationRunner
"android
x
.test.runner.AndroidJUnitRunner"
vectorDrawables
.
useSupportLibrary
=
true
vectorDrawables
.
useSupportLibrary
=
true
}
}
...
@@ -36,7 +36,7 @@ android {
...
@@ -36,7 +36,7 @@ android {
}
}
dependencies
{
dependencies
{
implementation
'
com.android.support:customtabs:27.1.
1'
implementation
'
androidx.browser:browser:1.0.0-beta0
1'
implementation
'
com.android.support:appcompat-v7:27.1.
1'
implementation
'
androidx.appcompat:appcompat:1.0.0-beta0
1'
implementation
'com.squareup.okhttp3:mockwebserver:3.11.0'
implementation
'com.squareup.okhttp3:mockwebserver:3.11.0'
}
}
This diff is collapsed.
Click to expand it.
android/gradle.properties
View file @
35d7fe85
android.enableJetifier
=
true
android.useAndroidX
=
true
org.gradle.jvmargs
=
-Xmx1536M
org.gradle.jvmargs
=
-Xmx1536M
This diff is collapsed.
Click to expand it.
android/src/main/java/com/pichillilorenzo/flutter_inappbrowser/ChromeCustomTabs/ChromeCustomTabsActivity.java
View file @
35d7fe85
...
@@ -5,7 +5,7 @@ import android.content.Intent;
...
@@ -5,7 +5,7 @@ import android.content.Intent;
import
android.graphics.Color
;
import
android.graphics.Color
;
import
android.net.Uri
;
import
android.net.Uri
;
import
android.os.Bundle
;
import
android.os.Bundle
;
import
android
.support
.customtabs.CustomTabsIntent
;
import
android
x.browser
.customtabs.CustomTabsIntent
;
import
com.pichillilorenzo.flutter_inappbrowser.InAppBrowserFlutterPlugin
;
import
com.pichillilorenzo.flutter_inappbrowser.InAppBrowserFlutterPlugin
;
import
com.pichillilorenzo.flutter_inappbrowser.R
;
import
com.pichillilorenzo.flutter_inappbrowser.R
;
...
...
This diff is collapsed.
Click to expand it.
android/src/main/java/com/pichillilorenzo/flutter_inappbrowser/ChromeCustomTabs/CustomTabActivityHelper.java
View file @
35d7fe85
...
@@ -3,10 +3,10 @@ package com.pichillilorenzo.flutter_inappbrowser.ChromeCustomTabs;
...
@@ -3,10 +3,10 @@ package com.pichillilorenzo.flutter_inappbrowser.ChromeCustomTabs;
import
android.app.Activity
;
import
android.app.Activity
;
import
android.net.Uri
;
import
android.net.Uri
;
import
android.os.Bundle
;
import
android.os.Bundle
;
import
android
.support
.customtabs.CustomTabsClient
;
import
android
x.browser
.customtabs.CustomTabsClient
;
import
android
.support
.customtabs.CustomTabsIntent
;
import
android
x.browser
.customtabs.CustomTabsIntent
;
import
android
.support
.customtabs.CustomTabsServiceConnection
;
import
android
x.browser
.customtabs.CustomTabsServiceConnection
;
import
android
.support
.customtabs.CustomTabsSession
;
import
android
x.browser
.customtabs.CustomTabsSession
;
import
java.util.List
;
import
java.util.List
;
...
...
This diff is collapsed.
Click to expand it.
android/src/main/java/com/pichillilorenzo/flutter_inappbrowser/ChromeCustomTabs/ServiceConnection.java
View file @
35d7fe85
package
com.pichillilorenzo.flutter_inappbrowser.ChromeCustomTabs
;
package
com.pichillilorenzo.flutter_inappbrowser.ChromeCustomTabs
;
import
android.content.ComponentName
;
import
android.content.ComponentName
;
import
android
.support
.customtabs.CustomTabsClient
;
import
android
x.browser
.customtabs.CustomTabsClient
;
import
android
.support
.customtabs.CustomTabsServiceConnection
;
import
android
x.browser
.customtabs.CustomTabsServiceConnection
;
import
java.lang.ref.WeakReference
;
import
java.lang.ref.WeakReference
;
...
...
This diff is collapsed.
Click to expand it.
android/src/main/java/com/pichillilorenzo/flutter_inappbrowser/ChromeCustomTabs/ServiceConnectionCallback.java
View file @
35d7fe85
package
com.pichillilorenzo.flutter_inappbrowser.ChromeCustomTabs
;
package
com.pichillilorenzo.flutter_inappbrowser.ChromeCustomTabs
;
import
android
.support
.customtabs.CustomTabsClient
;
import
android
x.browser
.customtabs.CustomTabsClient
;
/**
/**
* Callback for events when connecting and disconnecting from Custom Tabs Service.
* Callback for events when connecting and disconnecting from Custom Tabs Service.
...
...
This diff is collapsed.
Click to expand it.
android/src/main/java/com/pichillilorenzo/flutter_inappbrowser/InAppBrowserActivity.java
View file @
35d7fe85
...
@@ -6,10 +6,9 @@ import android.graphics.Canvas;
...
@@ -6,10 +6,9 @@ import android.graphics.Canvas;
import
android.graphics.Color
;
import
android.graphics.Color
;
import
android.graphics.Picture
;
import
android.graphics.Picture
;
import
android.graphics.drawable.ColorDrawable
;
import
android.graphics.drawable.ColorDrawable
;
import
android
.support.v7
.app.ActionBar
;
import
android
x.appcompat
.app.ActionBar
;
import
android
.support.v7
.app.AppCompatActivity
;
import
android
x.appcompat
.app.AppCompatActivity
;
import
android.os.Bundle
;
import
android.os.Bundle
;
import
android.util.Log
;
import
android.view.KeyEvent
;
import
android.view.KeyEvent
;
import
android.view.Menu
;
import
android.view.Menu
;
import
android.view.MenuInflater
;
import
android.view.MenuInflater
;
...
...
This diff is collapsed.
Click to expand it.
android/src/main/java/com/pichillilorenzo/flutter_inappbrowser/InAppWebView/InAppWebViewClient.java
View file @
35d7fe85
...
@@ -5,7 +5,7 @@ import android.graphics.Bitmap;
...
@@ -5,7 +5,7 @@ import android.graphics.Bitmap;
import
android.net.Uri
;
import
android.net.Uri
;
import
android.net.http.SslError
;
import
android.net.http.SslError
;
import
android.os.Build
;
import
android.os.Build
;
import
android
.support
.annotation.RequiresApi
;
import
android
x
.annotation.RequiresApi
;
import
android.util.Log
;
import
android.util.Log
;
import
android.webkit.CookieManager
;
import
android.webkit.CookieManager
;
import
android.webkit.CookieSyncManager
;
import
android.webkit.CookieSyncManager
;
...
...
This diff is collapsed.
Click to expand it.
android/src/main/java/com/pichillilorenzo/flutter_inappbrowser/RequestPermissionHandler.java
View file @
35d7fe85
...
@@ -2,9 +2,9 @@ package com.pichillilorenzo.flutter_inappbrowser;
...
@@ -2,9 +2,9 @@ package com.pichillilorenzo.flutter_inappbrowser;
import
android.app.Activity
;
import
android.app.Activity
;
import
android.content.pm.PackageManager
;
import
android.content.pm.PackageManager
;
import
android
.support
.annotation.NonNull
;
import
android
x
.annotation.NonNull
;
import
android
.support.v4
.app.ActivityCompat
;
import
android
x.core
.app.ActivityCompat
;
import
android
.support.v4
.content.ContextCompat
;
import
android
x.core
.content.ContextCompat
;
import
java.util.Arrays
;
import
java.util.Arrays
;
import
java.util.HashMap
;
import
java.util.HashMap
;
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment