Skip to content

Commit

Permalink
remove navigator dynamic feature
Browse files Browse the repository at this point in the history
  • Loading branch information
Alexandr Motorin authored and Alexandr Motorin committed Sep 9, 2024
1 parent f200066 commit 0309cb4
Show file tree
Hide file tree
Showing 15 changed files with 5 additions and 762 deletions.
4 changes: 0 additions & 4 deletions buildSrc/components.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -782,10 +782,6 @@
"dir": "lib-core-navigation",
"artifact_name": "core-navigation",
"third_party_dependencies": [
{
"name": "com.google.android.play:core",
"type": "implementation"
},
{
"name": "androidx.browser:browser",
"type": "implementation"
Expand Down
1 change: 0 additions & 1 deletion buildSrc/config.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,6 @@ ext {
"com.google.firebase:firebase-messaging" : "23.0.0", //http://bit.ly/2Q81pGJ
"com.google.firebase:firebase-analytics" : "20.0.0", //http://bit.ly/2Q81pGJ
"com.google.android.material:material" : "1.4.0", //http://bit.ly/2KAAq1y
"com.google.android.play:core" : "1.10.2", //http://bit.ly/2Hod1T1
"com.github.bumptech.glide:glide" : "4.12.0", //http://bit.ly/2Q7Fa41
"com.squareup.retrofit2:retrofit" : "2.9.0", //https://vk.cc/7UFxk3
"com.squareup.retrofit2:converter-gson" : "2.9.0", //https://vk.cc/7UFxk3
Expand Down
106 changes: 2 additions & 104 deletions ...n/java/ru/surfstudio/android/core/ui/navigation/activity/navigator/ActivityNavigator.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,6 @@
import androidx.core.app.ActivityCompat;
import androidx.core.app.ActivityOptionsCompat;

import com.agna.ferro.rx.ObservableOperatorFreeze;

import java.io.Serializable;
import java.util.HashMap;
import java.util.Map;
Expand All @@ -42,21 +40,14 @@
import ru.surfstudio.android.core.ui.event.lifecycle.pause.OnPauseDelegate;
import ru.surfstudio.android.core.ui.event.lifecycle.resume.OnResumeDelegate;
import ru.surfstudio.android.core.ui.event.newintent.NewIntentDelegate;
import ru.surfstudio.android.core.ui.navigation.event.result.BaseActivityResultDelegate;
import ru.surfstudio.android.core.ui.navigation.event.result.CrossFeatureSupportOnActivityResultRoute;
import ru.surfstudio.android.core.ui.navigation.event.result.SupportOnActivityResultRoute;
import ru.surfstudio.android.core.ui.navigation.ActivityRouteInterface;
import ru.surfstudio.android.core.ui.navigation.Navigator;
import ru.surfstudio.android.core.ui.navigation.ScreenResult;
import ru.surfstudio.android.core.ui.navigation.activity.route.ActivityRoute;
import ru.surfstudio.android.core.ui.navigation.activity.route.ActivityWithResultRoute;
import ru.surfstudio.android.core.ui.navigation.activity.route.NewIntentRoute;
import ru.surfstudio.android.core.ui.navigation.feature.installer.SplitFeatureEvent;
import ru.surfstudio.android.core.ui.navigation.feature.installer.SplitFeatureInstallState;
import ru.surfstudio.android.core.ui.navigation.feature.installer.SplitFeatureInstallStatus;
import ru.surfstudio.android.core.ui.navigation.feature.installer.SplitFeatureInstaller;
import ru.surfstudio.android.core.ui.navigation.feature.route.dynamic_feature.DynamicCrossFeatureRoute;
import ru.surfstudio.android.core.ui.navigation.feature.route.feature.ActivityCrossFeatureRoute;
import ru.surfstudio.android.core.ui.navigation.event.result.BaseActivityResultDelegate;
import ru.surfstudio.android.core.ui.navigation.event.result.SupportOnActivityResultRoute;
import ru.surfstudio.android.core.ui.provider.ActivityProvider;

/**
Expand All @@ -72,15 +63,9 @@ public abstract class ActivityNavigator extends BaseActivityResultDelegate

private Map<NewIntentRoute, Subject> newIntentSubjects = new HashMap<>();
private final ActivityProvider activityProvider;
private final SplitFeatureInstaller splitFeatureInstaller;
private Disposable splitFeatureInstallDisposable = Disposables.disposed();
private final Boolean isSplitFeatureModeOn;
private final BehaviorSubject<Boolean> freezeSelector = BehaviorSubject.createDefault(false);

private interface OnFeatureInstallListener {
void doOnInstall(BehaviorSubject<SplitFeatureInstallState> startStatusSubject);
}

/**
* Base activity navigator constructor.
*
Expand All @@ -89,28 +74,8 @@ private interface OnFeatureInstallListener {
*/
public ActivityNavigator(ActivityProvider activityProvider,
ScreenEventDelegateManager eventDelegateManager) {
this(activityProvider, eventDelegateManager, null, false);
}

/**
* Activity navigator with "split-features" support constructor.
*
* @param activityProvider actual Activity provider instance
* @param eventDelegateManager screen event delegate manager instance
* @param splitFeatureInstaller "split-feature" install manager
* @param isSplitFeatureModeOn "split-feature" navigation activation flag.
* Actually, it needs to be {@code true} just for release build which
* has already been deployed to Google Play. Otherwise, cross-feature
* navigation won't work at all.
*/
public ActivityNavigator(ActivityProvider activityProvider,
ScreenEventDelegateManager eventDelegateManager,
SplitFeatureInstaller splitFeatureInstaller,
Boolean isSplitFeatureModeOn) {
eventDelegateManager.registerDelegate(this);
this.activityProvider = activityProvider;
this.splitFeatureInstaller = splitFeatureInstaller;
this.isSplitFeatureModeOn = isSplitFeatureModeOn;
}

protected abstract void startActivityForResult(Intent intent, int requestCode, @Nullable Bundle bundle);
Expand Down Expand Up @@ -230,73 +195,6 @@ public boolean start(ActivityRoute route) {
return false;
}

/**
* Launch a new activity from another Feature Module.
* <p>
* Performs asynchronically due to type of the target Feature Module.
* This method returns stream of install state change events. You can make a subscription in
* your Presenter and handle errors or any other type of events during Dynamic Feature
* installation.
*
* @param route navigation route
* @return stream of install state change events
*/
public Observable<SplitFeatureInstallState> start(ActivityCrossFeatureRoute route) {
return startCrossFeature(route, startStatusSubject -> performStart(route, startStatusSubject));
}

/**
* Launch a new Activity for result from another Feature Module.
* <p>
* Performs asynchronously due to type of the target Feature Module.
* This method returns stream of install state change events. You can make a subscription in
* your Presenter and handle errors or any other type of events during Dynamic Feature
* installation.
*
* @param route navigation route
* @return stream of install state change events
*/
public Observable<SplitFeatureInstallState> startForResult(CrossFeatureSupportOnActivityResultRoute route) {
return startCrossFeature(route, startStatusSubject -> performStartForResult(route, startStatusSubject));
}

private Observable<SplitFeatureInstallState> startCrossFeature(
ActivityRouteInterface route,
OnFeatureInstallListener onFeatureInstallListener
) {
BehaviorSubject<SplitFeatureInstallState> startStatusSubject = BehaviorSubject.create();
if (route instanceof DynamicCrossFeatureRoute && this.isSplitFeatureModeOn) {
DynamicCrossFeatureRoute dynamicCrossFeatureRoute = (DynamicCrossFeatureRoute) route;
splitFeatureInstallDisposable.dispose();
splitFeatureInstallDisposable =
splitFeatureInstaller.installFeature(dynamicCrossFeatureRoute.splitNames())
.lift(new ObservableOperatorFreeze<>(freezeSelector))
.subscribe(splitFeatureInstallState -> {
if (splitFeatureInstallState.getInstallEvent() instanceof SplitFeatureEvent.InstallationStateEvent.Installed) {
startStatusSubject.onNext(splitFeatureInstallState);
onFeatureInstallListener.doOnInstall(startStatusSubject);
}
});
} else {
onFeatureInstallListener.doOnInstall(startStatusSubject);
}
return startStatusSubject.hide();
}

private void performStart(ActivityRoute route, BehaviorSubject<SplitFeatureInstallState> startStatusSubject) {
boolean startupStatus = start(route);
emitFeatureInstallState(startStatusSubject, startupStatus);
}

private void performStartForResult(SupportOnActivityResultRoute route, BehaviorSubject<SplitFeatureInstallState> startStatusSubject) {
boolean startupStatus = startForResult(route);
emitFeatureInstallState(startStatusSubject, startupStatus);
}

private void emitFeatureInstallState(BehaviorSubject<SplitFeatureInstallState> splitFeatureInstallStateSubject, boolean startupStatus) {
SplitFeatureInstallStatus status = SplitFeatureInstallStatus.Companion.getByValue(startupStatus);
splitFeatureInstallStateSubject.onNext(new SplitFeatureInstallState(status));
}

/**
* Launch a new activity for result.
Expand Down
10 changes: 1 addition & 9 deletions ...urfstudio/android/core/ui/navigation/activity/navigator/ActivityNavigatorForActivity.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
import androidx.annotation.Nullable;

import ru.surfstudio.android.core.ui.event.ScreenEventDelegateManager;
import ru.surfstudio.android.core.ui.navigation.feature.installer.SplitFeatureInstaller;
import ru.surfstudio.android.core.ui.provider.ActivityProvider;

/**
Expand All @@ -34,14 +33,7 @@ public class ActivityNavigatorForActivity extends ActivityNavigator {

public ActivityNavigatorForActivity(ActivityProvider activityProvider,
ScreenEventDelegateManager eventDelegateManager) {
this(activityProvider, eventDelegateManager, null, false);
}

public ActivityNavigatorForActivity(ActivityProvider activityProvider,
ScreenEventDelegateManager eventDelegateManager,
SplitFeatureInstaller splitFeatureInstaller,
Boolean isSplitFeatureModeOn) {
super(activityProvider, eventDelegateManager, splitFeatureInstaller, isSplitFeatureModeOn);
super(activityProvider, eventDelegateManager);
this.activityProvider = activityProvider;
}

Expand Down
13 changes: 2 additions & 11 deletions ...urfstudio/android/core/ui/navigation/activity/navigator/ActivityNavigatorForFragment.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
import androidx.annotation.Nullable;

import ru.surfstudio.android.core.ui.event.ScreenEventDelegateManager;
import ru.surfstudio.android.core.ui.navigation.feature.installer.SplitFeatureInstaller;
import ru.surfstudio.android.core.ui.provider.ActivityProvider;
import ru.surfstudio.android.core.ui.provider.FragmentProvider;

Expand All @@ -36,17 +35,9 @@ public class ActivityNavigatorForFragment extends ActivityNavigator {
public ActivityNavigatorForFragment(ActivityProvider activityProvider,
FragmentProvider fragmentProvider,
ScreenEventDelegateManager eventDelegateManager) {
this(activityProvider, fragmentProvider, eventDelegateManager, null, false);

}

public ActivityNavigatorForFragment(ActivityProvider activityProvider,
FragmentProvider fragmentProvider,
ScreenEventDelegateManager eventDelegateManager,
SplitFeatureInstaller splitFeatureInstaller,
Boolean isSplitFeatureModeOn) {
super(activityProvider, eventDelegateManager, splitFeatureInstaller, isSplitFeatureModeOn);
super(activityProvider, eventDelegateManager);
this.fragmentProvider = fragmentProvider;

}

@Override
Expand Down
162 changes: 0 additions & 162 deletions ...main/java/ru/surfstudio/android/core/ui/navigation/feature/installer/SplitFeatureEvent.kt
View file

This file was deleted.

Loading

0 comments on commit 0309cb4

Please sign in to comment.