From 9af73c11b7e96e84a67302e3995bafdb550059ab Mon Sep 17 00:00:00 2001 From: Gavriil Sitnikov Date: Sun, 22 May 2016 13:35:29 +0300 Subject: [PATCH] targeted viewcontrollers added --- build.gradle | 4 +- .../components/navigation/ViewController.java | 17 ++-- .../navigation/ViewControllerNavigation.java | 95 ++++++++++++------- ...atelessTargetedViewControllerFragment.java | 32 +++++++ .../TargetedViewControllerFragment.java | 36 ++++++- .../fragments/ViewControllerFragment.java | 4 +- 6 files changed, 140 insertions(+), 48 deletions(-) create mode 100644 src/main/java/ru/touchin/roboswag/components/navigation/fragments/StatelessTargetedViewControllerFragment.java diff --git a/build.gradle b/build.gradle index 8ce19f4..0387449 100644 --- a/build.gradle +++ b/build.gradle @@ -19,8 +19,8 @@ android { dependencies { compile project(':libraries:core') - provided 'com.android.support:appcompat-v7:23.3.0' - provided 'com.android.support:recyclerview-v7:23.3.0' + provided 'com.android.support:appcompat-v7:23.4.0' + provided 'com.android.support:recyclerview-v7:23.4.0' provided 'io.reactivex:rxandroid:1.1.0' diff --git a/src/main/java/ru/touchin/roboswag/components/navigation/ViewController.java b/src/main/java/ru/touchin/roboswag/components/navigation/ViewController.java index 1d58c9a..7632c51 100644 --- a/src/main/java/ru/touchin/roboswag/components/navigation/ViewController.java +++ b/src/main/java/ru/touchin/roboswag/components/navigation/ViewController.java @@ -57,10 +57,10 @@ public class ViewController, @SuppressWarnings("PMD.UnusedFormalParameter") //UnusedFormalParameter: savedInstanceState could be used by children - public ViewController(@NonNull final CreationContext creationContext, + public ViewController(@NonNull final CreationContext creationContext, @Nullable final Bundle savedInstanceState) { - this.activity = creationContext.activity; - this.fragment = creationContext.fragment; + this.activity = (TActivity) creationContext.activity; + this.fragment = (TFragment) creationContext.fragment; this.container = creationContext.container; } @@ -168,18 +168,17 @@ public class ViewController, /** * Class to simplify constructor override. */ - public static class CreationContext, - TFragment extends ViewControllerFragment> { + public static class CreationContext { @NonNull - private final TActivity activity; + private final ViewControllerActivity activity; @NonNull - private final TFragment fragment; + private final ViewControllerFragment fragment; @NonNull private final ViewGroup container; - public CreationContext(@NonNull final TActivity activity, - @NonNull final TFragment fragment, + public CreationContext(@NonNull final ViewControllerActivity activity, + @NonNull final ViewControllerFragment fragment, @NonNull final ViewGroup container) { this.activity = activity; this.fragment = fragment; diff --git a/src/main/java/ru/touchin/roboswag/components/navigation/ViewControllerNavigation.java b/src/main/java/ru/touchin/roboswag/components/navigation/ViewControllerNavigation.java index 069f047..1b6c8d0 100644 --- a/src/main/java/ru/touchin/roboswag/components/navigation/ViewControllerNavigation.java +++ b/src/main/java/ru/touchin/roboswag/components/navigation/ViewControllerNavigation.java @@ -10,7 +10,9 @@ import android.support.v4.app.FragmentTransaction; import ru.touchin.roboswag.components.navigation.activities.ViewControllerActivity; import ru.touchin.roboswag.components.navigation.fragments.SimpleViewControllerFragment; +import ru.touchin.roboswag.components.navigation.fragments.StatelessTargetedViewControllerFragment; import ru.touchin.roboswag.components.navigation.fragments.StatelessViewControllerFragment; +import ru.touchin.roboswag.components.navigation.fragments.TargetedViewControllerFragment; import ru.touchin.roboswag.components.navigation.fragments.ViewControllerFragment; import rx.functions.Func1; @@ -27,50 +29,50 @@ public class ViewControllerNavigation void push(@NonNull final Class> fragmentClass, - @NonNull final TState state) { + @NonNull final TState state) { addToStack(fragmentClass, null, ViewControllerFragment.createState(state), null, null); } public void push(@NonNull final Class> fragmentClass, - @Nullable final TState state, - @Nullable final Func1 transactionSetup) { + @Nullable final TState state, + @Nullable final Func1 transactionSetup) { addToStack(fragmentClass, null, ViewControllerFragment.createState(state), null, transactionSetup); } public void pushForResult(@NonNull final Class> fragmentClass, - @NonNull final Fragment targetFragment, - @NonNull final TState state) { + @NonNull final Fragment targetFragment, + @NonNull final TState state) { addToStack(fragmentClass, targetFragment, ViewControllerFragment.createState(state), fragmentClass.getName() + ';' + WITH_TARGET_FRAGMENT_TAG_MARK, null); } public void pushForResult(@NonNull final Class> fragmentClass, - @NonNull final Fragment targetFragment, - @Nullable final TState state, - @Nullable final Func1 transactionSetup) { + @NonNull final Fragment targetFragment, + @Nullable final TState state, + @Nullable final Func1 transactionSetup) { addToStack(fragmentClass, targetFragment, ViewControllerFragment.createState(state), fragmentClass.getName() + ';' + WITH_TARGET_FRAGMENT_TAG_MARK, transactionSetup); } public void setAsTop(@NonNull final Class> fragmentClass, - @NonNull final TState state) { + @NonNull final TState state) { setAsTop(fragmentClass, ViewControllerFragment.createState(state), null); } public void setAsTop(@NonNull final Class> fragmentClass, - @Nullable final TState state, - @Nullable final Func1 transactionSetup) { + @Nullable final TState state, + @Nullable final Func1 transactionSetup) { setAsTop(fragmentClass, ViewControllerFragment.createState(state), transactionSetup); } public void setInitial(@NonNull final Class> fragmentClass, - @NonNull final TState state) { + @NonNull final TState state) { setInitial(fragmentClass, ViewControllerFragment.createState(state), null); } public void setInitial(@NonNull final Class> fragmentClass, - @Nullable final TState state, - @Nullable final Func1 transactionSetup) { + @Nullable final TState state, + @Nullable final Func1 transactionSetup) { setInitial(fragmentClass, ViewControllerFragment.createState(state), transactionSetup); } @@ -81,7 +83,7 @@ public class ViewControllerNavigation void pushViewController(@NonNull final Class>> viewControllerClass, - @NonNull final TState state) { + @NonNull final TState state) { addViewControllerToStack(viewControllerClass, null, state, null, null); } @@ -98,35 +100,45 @@ public class ViewControllerNavigation>> viewControllerClass, - @NonNull final Fragment targetFragment) { - addStatelessViewControllerToStack(viewControllerClass, targetFragment, + public > void pushViewControllerForResult( + @NonNull final Class>> viewControllerClass, + @NonNull final TTargetFragment targetFragment) { + addTargetedStatelessViewControllerToStack(viewControllerClass, targetFragment, viewControllerClass.getName() + ';' + WITH_TARGET_FRAGMENT_TAG_MARK, null); } - public void pushViewControllerForResult( - @NonNull final Class>> viewControllerClass, - @NonNull final Fragment targetFragment, + @SuppressWarnings("CPD-START") + public > void pushViewControllerForResult( + @NonNull final Class>> viewControllerClass, + @NonNull final TTargetFragment targetFragment, @NonNull final TState state) { - addViewControllerToStack(viewControllerClass, targetFragment, state, + addTargetedViewControllerToStack(viewControllerClass, targetFragment, state, viewControllerClass.getName() + ';' + WITH_TARGET_FRAGMENT_TAG_MARK, null); } - public void pushViewControllerForResult( - @NonNull final Class>> viewControllerClass, - @NonNull final Fragment targetFragment, + @SuppressWarnings("CPD-END") + public > void pushViewControllerForResult( + @NonNull final Class>> viewControllerClass, + @NonNull final TTargetFragment targetFragment, @NonNull final TState state, @Nullable final Func1 transactionSetup) { - addViewControllerToStack(viewControllerClass, targetFragment, state, + addTargetedViewControllerToStack(viewControllerClass, targetFragment, state, viewControllerClass.getName() + ';' + WITH_TARGET_FRAGMENT_TAG_MARK, transactionSetup); } - public void pushViewControllerForResult( - @NonNull final Class>> viewControllerClass, - @NonNull final Fragment targetFragment, + public > void pushViewControllerForResult( + @NonNull final Class>> viewControllerClass, + @NonNull final TTargetFragment targetFragment, @Nullable final Func1 transactionSetup) { - addStatelessViewControllerToStack(viewControllerClass, targetFragment, + addTargetedStatelessViewControllerToStack(viewControllerClass, targetFragment, viewControllerClass.getName() + ';' + WITH_TARGET_FRAGMENT_TAG_MARK, transactionSetup); } @@ -191,13 +203,32 @@ public class ViewControllerNavigation void addTargetedViewControllerToStack( + @NonNull final Class>> viewControllerClass, + @NonNull final Fragment targetFragment, + @NonNull final TState state, + @Nullable final String backStackTag, + @Nullable final Func1 transactionSetup) { + addToStack(TargetedViewControllerFragment.class, targetFragment, + SimpleViewControllerFragment.createState(viewControllerClass, state), backStackTag, transactionSetup); + } + protected void addStatelessViewControllerToStack( @NonNull final Class>> viewControllerClass, @Nullable final Fragment targetFragment, @Nullable final String backStackTag, @Nullable final Func1 transactionSetup) { addToStack(StatelessViewControllerFragment.class, targetFragment, - SimpleViewControllerFragment.createState(viewControllerClass, null), backStackTag, transactionSetup); + StatelessViewControllerFragment.createState(viewControllerClass, null), backStackTag, transactionSetup); + } + + protected void addTargetedStatelessViewControllerToStack( + @NonNull final Class>> viewControllerClass, + @NonNull final Fragment targetFragment, + @Nullable final String backStackTag, + @Nullable final Func1 transactionSetup) { + addToStack(StatelessTargetedViewControllerFragment.class, targetFragment, + StatelessTargetedViewControllerFragment.createState(viewControllerClass, null), backStackTag, transactionSetup); } } \ No newline at end of file diff --git a/src/main/java/ru/touchin/roboswag/components/navigation/fragments/StatelessTargetedViewControllerFragment.java b/src/main/java/ru/touchin/roboswag/components/navigation/fragments/StatelessTargetedViewControllerFragment.java new file mode 100644 index 0000000..7b5f9cb --- /dev/null +++ b/src/main/java/ru/touchin/roboswag/components/navigation/fragments/StatelessTargetedViewControllerFragment.java @@ -0,0 +1,32 @@ +/* + * Copyright (c) 2015 RoboSwag (Gavriil Sitnikov, Vsevolod Ivanov) + * + * This file is part of RoboSwag library. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +package ru.touchin.roboswag.components.navigation.fragments; + +import ru.touchin.roboswag.components.navigation.AbstractState; +import ru.touchin.roboswag.components.navigation.activities.ViewControllerActivity; + +/** + * Created by Gavriil Sitnikov on 12/03/2016. + * TODO: fill description + */ +public class StatelessTargetedViewControllerFragment> + extends TargetedViewControllerFragment { +} diff --git a/src/main/java/ru/touchin/roboswag/components/navigation/fragments/TargetedViewControllerFragment.java b/src/main/java/ru/touchin/roboswag/components/navigation/fragments/TargetedViewControllerFragment.java index 8d6da46..b7a4286 100644 --- a/src/main/java/ru/touchin/roboswag/components/navigation/fragments/TargetedViewControllerFragment.java +++ b/src/main/java/ru/touchin/roboswag/components/navigation/fragments/TargetedViewControllerFragment.java @@ -1,14 +1,46 @@ +/* + * Copyright (c) 2015 RoboSwag (Gavriil Sitnikov, Vsevolod Ivanov) + * + * This file is part of RoboSwag library. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + package ru.touchin.roboswag.components.navigation.fragments; +import android.support.annotation.NonNull; + import ru.touchin.roboswag.components.navigation.AbstractState; import ru.touchin.roboswag.components.navigation.activities.ViewControllerActivity; +import ru.touchin.roboswag.core.utils.ShouldNotHappenException; /** * Created by Gavriil Sitnikov on 11/04/2016. * TODO: fill description */ -public class TargetedViewControllerFragment> +public class TargetedViewControllerFragment> extends SimpleViewControllerFragment { - + + @SuppressWarnings("unchecked") + @NonNull + public ViewControllerFragment getTarget() { + if (!(getTargetFragment() instanceof ViewControllerFragment)) { + throw new ShouldNotHappenException(); + } + return (ViewControllerFragment) getTargetFragment(); + } } diff --git a/src/main/java/ru/touchin/roboswag/components/navigation/fragments/ViewControllerFragment.java b/src/main/java/ru/touchin/roboswag/components/navigation/fragments/ViewControllerFragment.java index 44d94bb..4758d49 100644 --- a/src/main/java/ru/touchin/roboswag/components/navigation/fragments/ViewControllerFragment.java +++ b/src/main/java/ru/touchin/roboswag/components/navigation/fragments/ViewControllerFragment.java @@ -121,9 +121,7 @@ public abstract class ViewControllerFragment constructor = getViewControllerClass().getConstructors()[0]; - final ViewController.CreationContext> creationContext - = new ViewController.CreationContext<>(activity, this, viewInfo.first); + final ViewController.CreationContext creationContext = new ViewController.CreationContext(activity, this, viewInfo.first); try { switch (constructor.getParameterTypes().length) { case 2: