Skip to content
This repository was archived by the owner on Feb 22, 2023. It is now read-only.

[Share] Support v2 android embedder. #2156

Merged
cyanglaz merged 25 commits into from
Oct 21, 2019
Merged

[Share] Support v2 android embedder. #2156

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
c1b7aa8
git st
Oct 4, 2019
0395b36
gradle properties update
Oct 4, 2019
3b396f3
new embedding
Oct 4, 2019
3f57f80
Update gradle.properties
Oct 4, 2019
d372d3d
refactor
Oct 4, 2019
fa50246
Merge branch 'migrate_share' of github.com:cyanglaz/plugins into migr…
Oct 4, 2019
f8066d2
update javadocs
Oct 7, 2019
0296390
add license header
Oct 7, 2019
f268c32
merge 2 packages
Oct 7, 2019
6488ff6
refactor
Oct 7, 2019
4530b8d
refactor
Oct 7, 2019
ae774b6
rename activities
Oct 8, 2019
250eb14
non public
Oct 8, 2019
7e0d74f
fix gradle
Oct 11, 2019
3033ef6
review fixes
Oct 14, 2019
c76a838
review fixes
Oct 14, 2019
db46000
Merge branch 'master' into migrate_share
Oct 14, 2019
83dfcb5
revert the change that moved the activity out of the constructor
Oct 14, 2019
9ae8145
add driver tests
Oct 15, 2019
3ba4341
e2e tests
Oct 15, 2019
b51bb35
Merge branch 'master' into migrate_share
Oct 15, 2019
7acd1d9
Update pubspec.yaml
Oct 15, 2019
1722803
Update MainActivity.java
Oct 15, 2019
2ffc180
remove androidx constraint
Oct 21, 2019
ba7e66b
Update pubspec.yaml
Oct 21, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions packages/share/android/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,9 +63,10 @@ afterEvaluate {
if (!containsEmbeddingDependencies) {
android {
dependencies {
def lifecycle_version = "2.1.0"
api "androidx.lifecycle:lifecycle-common-java8:$lifecycle_version"
api "androidx.lifecycle:lifecycle-runtime:$lifecycle_version"
def lifecycle_version = "1.1.1"
api "android.arch.lifecycle:runtime:$lifecycle_version"
api "android.arch.lifecycle:common:$lifecycle_version"
api "android.arch.lifecycle:common-java8:$lifecycle_version"
}
}
}
Expand Down
3 changes: 1 addition & 2 deletions packages/share/android/src/main/java/io/flutter/plugins/share/MethodCallHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@

package io.flutter.plugins.share;

import androidx.annotation.NonNull;
import io.flutter.plugin.common.MethodCall;
import io.flutter.plugin.common.MethodChannel;
import java.util.Map;
Expand All @@ -14,7 +13,7 @@ class MethodCallHandler implements MethodChannel.MethodCallHandler {

private Share share;

MethodCallHandler(@NonNull Share share) {
MethodCallHandler(Share share) {
this.share = share;
}

Expand Down
5 changes: 2 additions & 3 deletions packages/share/android/src/main/java/io/flutter/plugins/share/Share.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@

import android.app.Activity;
import android.content.Intent;
import androidx.annotation.Nullable;

/** Handles share intent. */
class Share {
Expand All @@ -18,15 +17,15 @@ class Share {
* null when constructing the {@link Share} object and set to non-null when an activity is
* available using {@link #setActivity(Activity)}.
*/
Share(@Nullable Activity activity) {
Share(Activity activity) {
this.activity = activity;
}

/**
* Sets the activity when an activity is available. When the activity becomes unavailable, use
* this method to set it to null.
*/
void setActivity(@Nullable Activity activity) {
void setActivity(Activity activity) {
this.activity = activity;
}

Expand Down
2 changes: 1 addition & 1 deletion packages/share/pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,4 @@ dev_dependencies:

environment:
sdk: ">=2.0.0-dev.28.0 <3.0.0"
flutter: ">=1.6.7 <2.0.0"
flutter: ">=1.9.1+hotfix.2 <2.0.0"
Copy link
Contributor

@matthew-carroll matthew-carroll Oct 21, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does the share plugin really require such a recent version?