Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
F
flutter_boost_1.22.4
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
1
Merge Requests
1
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_boost_1.22.4
Commits
3376d663
Commit
3376d663
authored
Oct 19, 2019
by
sun.fangzhou
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
FIX:adapted androidX
parent
238255d0
Changes
16
Show whitespace changes
Inline
Side-by-side
Showing
16 changed files
with
46 additions
and
41 deletions
+46
-41
android/build.gradle
android/build.gradle
+7
-6
android/gradle.properties
android/gradle.properties
+2
-0
android/src/main/java/com/idlefish/flutterboost/FlutterBoostPlugin.java
...in/java/com/idlefish/flutterboost/FlutterBoostPlugin.java
+1
-1
android/src/main/java/com/idlefish/flutterboost/NewFlutterBoost.java
.../main/java/com/idlefish/flutterboost/NewFlutterBoost.java
+1
-1
android/src/main/java/com/idlefish/flutterboost/XFlutterView.java
...src/main/java/com/idlefish/flutterboost/XFlutterView.java
+5
-5
android/src/main/java/com/idlefish/flutterboost/containers/FlutterActivityAndFragmentDelegate.java
...rboost/containers/FlutterActivityAndFragmentDelegate.java
+3
-3
android/src/main/java/com/idlefish/flutterboost/containers/FlutterSplashView.java
...m/idlefish/flutterboost/containers/FlutterSplashView.java
+2
-2
android/src/main/java/com/idlefish/flutterboost/containers/NewBoostFlutterActivity.java
...fish/flutterboost/containers/NewBoostFlutterActivity.java
+5
-5
android/src/main/java/com/idlefish/flutterboost/containers/NewFlutterFragment.java
.../idlefish/flutterboost/containers/NewFlutterFragment.java
+5
-5
example/android/app/build.gradle
example/android/app/build.gradle
+4
-4
example/android/app/src/main/java/com/taobao/idlefish/flutterboostexample/FlutterFragmentPageActivity.java
...fish/flutterboostexample/FlutterFragmentPageActivity.java
+3
-3
example/android/app/src/main/java/com/taobao/idlefish/flutterboostexample/MainActivity.java
...com/taobao/idlefish/flutterboostexample/MainActivity.java
+2
-2
example/android/app/src/main/java/com/taobao/idlefish/flutterboostexample/NativePageActivity.java
...obao/idlefish/flutterboostexample/NativePageActivity.java
+2
-2
example/android/build.gradle
example/android/build.gradle
+1
-1
example/android/gradle.properties
example/android/gradle.properties
+2
-0
example/android/gradle/wrapper/gradle-wrapper.properties
example/android/gradle/wrapper/gradle-wrapper.properties
+1
-1
No files found.
android/build.gradle
View file @
3376d663
...
@@ -8,7 +8,7 @@ buildscript {
...
@@ -8,7 +8,7 @@ buildscript {
}
}
dependencies
{
dependencies
{
classpath
'com.android.tools.build:gradle:3.
1.2
'
classpath
'com.android.tools.build:gradle:3.
2.0
'
}
}
}
}
...
@@ -23,11 +23,11 @@ apply plugin: 'com.android.library'
...
@@ -23,11 +23,11 @@ apply plugin: 'com.android.library'
android
{
android
{
compileSdkVersion
28
compileSdkVersion
28
buildToolsVersion
'2
7.0.3
'
buildToolsVersion
'2
8.0.2
'
defaultConfig
{
defaultConfig
{
minSdkVersion
16
minSdkVersion
16
targetSdkVersion
28
targetSdkVersion
28
testInstrumentationRunner
"android
.support
.test.runner.AndroidJUnitRunner"
testInstrumentationRunner
"android
x
.test.runner.AndroidJUnitRunner"
}
}
lintOptions
{
lintOptions
{
disable
'InvalidPackage'
disable
'InvalidPackage'
...
@@ -35,9 +35,10 @@ android {
...
@@ -35,9 +35,10 @@ android {
}
}
dependencies
{
dependencies
{
implementation
'com.android.support:appcompat-v7:28.0.0'
implementation
'androidx.legacy:legacy-support-v4:1.0.0'
implementation
'com.android.support:design:28.0.0'
implementation
'com.google.android.material:material:1.0.0'
implementation
'com.android.support:support-v4:28.0.0'
implementation
'androidx.appcompat:appcompat:1.0.0'
implementation
'androidx.annotation:annotation:1.0.0'
implementation
'android.arch.lifecycle:common-java8:1.1.1'
implementation
'android.arch.lifecycle:common-java8:1.1.1'
implementation
'com.alibaba:fastjson:1.2.41'
implementation
'com.alibaba:fastjson:1.2.41'
...
...
android/gradle.properties
View file @
3376d663
org.gradle.jvmargs
=
-Xmx1536M
org.gradle.jvmargs
=
-Xmx1536M
android.useAndroidX
=
true
android.enableJetifier
=
true
\ No newline at end of file
android/src/main/java/com/idlefish/flutterboost/FlutterBoostPlugin.java
View file @
3376d663
package
com.idlefish.flutterboost
;
package
com.idlefish.flutterboost
;
import
android
.support
.annotation.Nullable
;
import
android
x
.annotation.Nullable
;
import
com.idlefish.flutterboost.interfaces.IContainerRecord
;
import
com.idlefish.flutterboost.interfaces.IContainerRecord
;
...
...
android/src/main/java/com/idlefish/flutterboost/NewFlutterBoost.java
View file @
3376d663
...
@@ -5,7 +5,7 @@ import android.app.Activity;
...
@@ -5,7 +5,7 @@ import android.app.Activity;
import
android.app.Application
;
import
android.app.Application
;
import
android.content.Context
;
import
android.content.Context
;
import
android.os.Bundle
;
import
android.os.Bundle
;
import
android
.support
.annotation.NonNull
;
import
android
x
.annotation.NonNull
;
import
com.idlefish.flutterboost.interfaces.*
;
import
com.idlefish.flutterboost.interfaces.*
;
import
io.flutter.Log
;
import
io.flutter.Log
;
import
io.flutter.embedding.android.FlutterView
;
import
io.flutter.embedding.android.FlutterView
;
...
...
android/src/main/java/com/idlefish/flutterboost/XFlutterView.java
View file @
3376d663
...
@@ -8,11 +8,11 @@ import android.content.res.Configuration;
...
@@ -8,11 +8,11 @@ import android.content.res.Configuration;
import
android.graphics.Rect
;
import
android.graphics.Rect
;
import
android.os.Build
;
import
android.os.Build
;
import
android.os.LocaleList
;
import
android.os.LocaleList
;
import
android
.support
.annotation.NonNull
;
import
android
x
.annotation.NonNull
;
import
android
.support
.annotation.Nullable
;
import
android
x
.annotation.Nullable
;
import
android
.support
.annotation.RequiresApi
;
import
android
x
.annotation.RequiresApi
;
import
android
.support
.annotation.VisibleForTesting
;
import
android
x
.annotation.VisibleForTesting
;
import
android
.support.v4
.view.ViewCompat
;
import
android
x.core
.view.ViewCompat
;
import
android.text.format.DateFormat
;
import
android.text.format.DateFormat
;
import
android.util.AttributeSet
;
import
android.util.AttributeSet
;
import
android.view.KeyEvent
;
import
android.view.KeyEvent
;
...
...
android/src/main/java/com/idlefish/flutterboost/containers/FlutterActivityAndFragmentDelegate.java
View file @
3376d663
...
@@ -2,13 +2,13 @@ package com.idlefish.flutterboost.containers;
...
@@ -2,13 +2,13 @@ package com.idlefish.flutterboost.containers;
import
android.annotation.SuppressLint
;
import
android.annotation.SuppressLint
;
import
android.app.Activity
;
import
android.app.Activity
;
import
android
.arch
.lifecycle.Lifecycle
;
import
android
x
.lifecycle.Lifecycle
;
import
android.content.Context
;
import
android.content.Context
;
import
android.content.Intent
;
import
android.content.Intent
;
import
android.os.Build
;
import
android.os.Build
;
import
android.os.Bundle
;
import
android.os.Bundle
;
import
android
.support
.annotation.NonNull
;
import
android
x
.annotation.NonNull
;
import
android
.support
.annotation.Nullable
;
import
android
x
.annotation.Nullable
;
import
android.view.LayoutInflater
;
import
android.view.LayoutInflater
;
import
android.view.View
;
import
android.view.View
;
import
android.view.ViewGroup
;
import
android.view.ViewGroup
;
...
...
android/src/main/java/com/idlefish/flutterboost/containers/FlutterSplashView.java
View file @
3376d663
...
@@ -5,8 +5,8 @@ import android.graphics.Color;
...
@@ -5,8 +5,8 @@ import android.graphics.Color;
import
android.os.Bundle
;
import
android.os.Bundle
;
import
android.os.Parcel
;
import
android.os.Parcel
;
import
android.os.Parcelable
;
import
android.os.Parcelable
;
import
android
.support
.annotation.NonNull
;
import
android
x
.annotation.NonNull
;
import
android
.support
.annotation.Nullable
;
import
android
x
.annotation.Nullable
;
import
android.util.AttributeSet
;
import
android.util.AttributeSet
;
import
android.view.View
;
import
android.view.View
;
import
android.widget.FrameLayout
;
import
android.widget.FrameLayout
;
...
...
android/src/main/java/com/idlefish/flutterboost/containers/NewBoostFlutterActivity.java
View file @
3376d663
...
@@ -2,9 +2,9 @@ package com.idlefish.flutterboost.containers;
...
@@ -2,9 +2,9 @@ package com.idlefish.flutterboost.containers;
import
android.app.Activity
;
import
android.app.Activity
;
import
android
.arch
.lifecycle.Lifecycle
;
import
android
x
.lifecycle.Lifecycle
;
import
android
.arch
.lifecycle.LifecycleOwner
;
import
android
x
.lifecycle.LifecycleOwner
;
import
android
.arch
.lifecycle.LifecycleRegistry
;
import
android
x
.lifecycle.LifecycleRegistry
;
import
android.content.Context
;
import
android.content.Context
;
import
android.content.Intent
;
import
android.content.Intent
;
import
android.content.pm.ActivityInfo
;
import
android.content.pm.ActivityInfo
;
...
@@ -15,8 +15,8 @@ import android.graphics.drawable.ColorDrawable;
...
@@ -15,8 +15,8 @@ import android.graphics.drawable.ColorDrawable;
import
android.graphics.drawable.Drawable
;
import
android.graphics.drawable.Drawable
;
import
android.os.Build
;
import
android.os.Build
;
import
android.os.Bundle
;
import
android.os.Bundle
;
import
android
.support
.annotation.NonNull
;
import
android
x
.annotation.NonNull
;
import
android
.support
.annotation.Nullable
;
import
android
x
.annotation.Nullable
;
import
android.view.*
;
import
android.view.*
;
import
android.widget.*
;
import
android.widget.*
;
import
com.idlefish.flutterboost.NewFlutterBoost
;
import
com.idlefish.flutterboost.NewFlutterBoost
;
...
...
android/src/main/java/com/idlefish/flutterboost/containers/NewFlutterFragment.java
View file @
3376d663
package
com.idlefish.flutterboost.containers
;
package
com.idlefish.flutterboost.containers
;
import
android.app.Activity
;
import
android.app.Activity
;
import
android
.arch
.lifecycle.Lifecycle
;
import
android
x
.lifecycle.Lifecycle
;
import
android.content.Context
;
import
android.content.Context
;
import
android.content.Intent
;
import
android.content.Intent
;
import
android.os.Build
;
import
android.os.Build
;
import
android.os.Bundle
;
import
android.os.Bundle
;
import
android
.support
.annotation.NonNull
;
import
android
x
.annotation.NonNull
;
import
android
.support
.annotation.Nullable
;
import
android
x
.annotation.Nullable
;
import
android
.support.v4
.app.Fragment
;
import
android
x.fragment
.app.Fragment
;
import
android
.support.v4
.app.FragmentActivity
;
import
android
x.fragment
.app.FragmentActivity
;
import
android.view.LayoutInflater
;
import
android.view.LayoutInflater
;
import
android.view.View
;
import
android.view.View
;
import
android.view.ViewGroup
;
import
android.view.ViewGroup
;
...
...
example/android/app/build.gradle
View file @
3376d663
...
@@ -38,7 +38,7 @@ android {
...
@@ -38,7 +38,7 @@ android {
targetSdkVersion
28
targetSdkVersion
28
versionCode
flutterVersionCode
.
toInteger
()
versionCode
flutterVersionCode
.
toInteger
()
versionName
flutterVersionName
versionName
flutterVersionName
testInstrumentationRunner
"android
.support
.test.runner.AndroidJUnitRunner"
testInstrumentationRunner
"android
x
.test.runner.AndroidJUnitRunner"
}
}
buildTypes
{
buildTypes
{
...
@@ -56,8 +56,8 @@ flutter {
...
@@ -56,8 +56,8 @@ flutter {
dependencies
{
dependencies
{
testImplementation
'junit:junit:4.12'
testImplementation
'junit:junit:4.12'
androidTestImplementation
'
com.android.support.test:runner:1.0.2
'
androidTestImplementation
'
androidx.test:runner:1.1.0
'
androidTestImplementation
'
com.android.support.test.espresso:espresso-core:3.0.2
'
androidTestImplementation
'
androidx.test.espresso:espresso-core:3.1.0
'
implementation
'
com.android.support:appcompat-v7:28
.0.0'
implementation
'
androidx.appcompat:appcompat:1
.0.0'
}
}
example/android/app/src/main/java/com/taobao/idlefish/flutterboostexample/FlutterFragmentPageActivity.java
View file @
3376d663
...
@@ -6,9 +6,9 @@ import android.graphics.Color;
...
@@ -6,9 +6,9 @@ import android.graphics.Color;
import
android.graphics.drawable.Drawable
;
import
android.graphics.drawable.Drawable
;
import
android.os.Build
;
import
android.os.Build
;
import
android.os.Bundle
;
import
android.os.Bundle
;
import
android
.support
.annotation.Nullable
;
import
android
x
.annotation.Nullable
;
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.view.View
;
import
android.view.View
;
import
android.view.Window
;
import
android.view.Window
;
import
android.view.WindowManager
;
import
android.view.WindowManager
;
...
...
example/android/app/src/main/java/com/taobao/idlefish/flutterboostexample/MainActivity.java
View file @
3376d663
package
com.taobao.idlefish.flutterboostexample
;
package
com.taobao.idlefish.flutterboostexample
;
import
android.os.Bundle
;
import
android.os.Bundle
;
import
android
.support
.annotation.Nullable
;
import
android
x
.annotation.Nullable
;
import
android
.support.v7
.app.AppCompatActivity
;
import
android
x.appcompat
.app.AppCompatActivity
;
import
android.view.View
;
import
android.view.View
;
import
android.widget.TextView
;
import
android.widget.TextView
;
...
...
example/android/app/src/main/java/com/taobao/idlefish/flutterboostexample/NativePageActivity.java
View file @
3376d663
package
com.taobao.idlefish.flutterboostexample
;
package
com.taobao.idlefish.flutterboostexample
;
import
android.os.Bundle
;
import
android.os.Bundle
;
import
android
.support
.annotation.Nullable
;
import
android
x
.annotation.Nullable
;
import
android
.support.v7
.app.AppCompatActivity
;
import
android
x.appcompat
.app.AppCompatActivity
;
import
android.view.View
;
import
android.view.View
;
import
android.widget.TextView
;
import
android.widget.TextView
;
...
...
example/android/build.gradle
View file @
3376d663
...
@@ -5,7 +5,7 @@ buildscript {
...
@@ -5,7 +5,7 @@ buildscript {
}
}
dependencies
{
dependencies
{
classpath
'com.android.tools.build:gradle:3.
1.2
'
classpath
'com.android.tools.build:gradle:3.
2.0
'
}
}
}
}
...
...
example/android/gradle.properties
View file @
3376d663
org.gradle.jvmargs
=
-Xmx1536M
org.gradle.jvmargs
=
-Xmx1536M
android.useAndroidX
=
true
android.enableJetifier
=
true
\ No newline at end of file
example/android/gradle/wrapper/gradle-wrapper.properties
View file @
3376d663
...
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
...
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath
=
wrapper/dists
distributionPath
=
wrapper/dists
zipStoreBase
=
GRADLE_USER_HOME
zipStoreBase
=
GRADLE_USER_HOME
zipStorePath
=
wrapper/dists
zipStorePath
=
wrapper/dists
distributionUrl
=
https
\:
//services.gradle.org/distributions/gradle-4.
4
-all.zip
distributionUrl
=
https
\:
//services.gradle.org/distributions/gradle-4.
6
-all.zip
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