some classes moving
This commit is contained in:
parent
fbc8591e8a
commit
5a8446250e
|
|
@ -37,6 +37,7 @@ import android.view.MenuItem;
|
|||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
|
||||
import ru.touchin.roboswag.components.navigation.activities.BaseActivity;
|
||||
import ru.touchin.roboswag.components.utils.PermissionState;
|
||||
import ru.touchin.roboswag.components.utils.UiUtils;
|
||||
import rx.Observable;
|
||||
|
|
@ -47,6 +48,7 @@ import rx.subjects.PublishSubject;
|
|||
* TODO: fill description
|
||||
*/
|
||||
@SuppressWarnings({"PMD.GodClass", "PMD.TooManyMethods"})
|
||||
@Deprecated
|
||||
public abstract class AbstractBaseActivity extends BaseActivity
|
||||
implements FragmentManager.OnBackStackChangedListener,
|
||||
OnFragmentStartedListener {
|
||||
|
|
|
|||
|
|
@ -44,6 +44,7 @@ import java.util.Map;
|
|||
*/
|
||||
// Yes, it's a God class with a lot of methods. Deal with it
|
||||
@SuppressWarnings({"PMD.GodClass", "PMD.TooManyMethods"})
|
||||
@Deprecated
|
||||
public abstract class AbstractBaseFragment<TViewController extends AbstractBaseFragment.ViewController> extends Fragment
|
||||
implements OnFragmentStartedListener {
|
||||
|
||||
|
|
|
|||
|
|
@ -29,6 +29,8 @@ import android.support.v7.app.ActionBarDrawerToggle;
|
|||
import android.view.MenuItem;
|
||||
import android.view.View;
|
||||
|
||||
import ru.touchin.roboswag.components.navigation.activities.BaseActivity;
|
||||
|
||||
/**
|
||||
* Created by Gavriil Sitnikov on 11/03/16.
|
||||
* TODO: descriptions
|
||||
|
|
|
|||
|
|
@ -29,6 +29,8 @@ import android.view.MenuInflater;
|
|||
import android.view.MenuItem;
|
||||
import android.view.ViewGroup;
|
||||
|
||||
import ru.touchin.roboswag.components.navigation.activities.ViewControllerActivity;
|
||||
import ru.touchin.roboswag.components.navigation.fragments.ViewControllerFragment;
|
||||
import rx.Observable;
|
||||
import rx.android.schedulers.AndroidSchedulers;
|
||||
import rx.subjects.BehaviorSubject;
|
||||
|
|
|
|||
|
|
@ -9,6 +9,10 @@ import android.support.v4.app.FragmentTransaction;
|
|||
|
||||
import java.io.Serializable;
|
||||
|
||||
import ru.touchin.roboswag.components.navigation.activities.ViewControllerActivity;
|
||||
import ru.touchin.roboswag.components.navigation.fragments.SimpleViewControllerFragment;
|
||||
import ru.touchin.roboswag.components.navigation.fragments.StatelessViewControllerFragment;
|
||||
import ru.touchin.roboswag.components.navigation.fragments.ViewControllerFragment;
|
||||
import rx.functions.Func1;
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
package ru.touchin.roboswag.components.navigation;
|
||||
package ru.touchin.roboswag.components.navigation.activities;
|
||||
|
||||
import android.app.Activity;
|
||||
import android.support.annotation.NonNull;
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package ru.touchin.roboswag.components.navigation;
|
||||
package ru.touchin.roboswag.components.navigation.activities;
|
||||
|
||||
import android.support.annotation.NonNull;
|
||||
import android.view.Menu;
|
||||
|
|
@ -17,7 +17,7 @@
|
|||
*
|
||||
*/
|
||||
|
||||
package ru.touchin.roboswag.components.navigation;
|
||||
package ru.touchin.roboswag.components.navigation.fragments;
|
||||
|
||||
import android.os.Bundle;
|
||||
import android.support.annotation.NonNull;
|
||||
|
|
@ -25,6 +25,9 @@ import android.support.annotation.Nullable;
|
|||
|
||||
import java.io.Serializable;
|
||||
|
||||
import ru.touchin.roboswag.components.navigation.ViewController;
|
||||
import ru.touchin.roboswag.components.navigation.activities.ViewControllerActivity;
|
||||
|
||||
/**
|
||||
* Created by Gavriil Sitnikov on 07/03/2016.
|
||||
* TODO: fill description
|
||||
|
|
@ -44,7 +47,7 @@ public class SimpleViewControllerFragment<TState extends Serializable, TActivity
|
|||
@NonNull
|
||||
public static Bundle createState(@NonNull final Class<? extends ViewController> viewControllerClass,
|
||||
@Nullable final Serializable state) {
|
||||
final Bundle result = ViewControllerFragment.createState(state);
|
||||
final Bundle result = createState(state);
|
||||
result.putSerializable(VIEW_CONTROLLER_CLASS_EXTRA, viewControllerClass);
|
||||
return result;
|
||||
}
|
||||
|
|
@ -17,10 +17,12 @@
|
|||
*
|
||||
*/
|
||||
|
||||
package ru.touchin.roboswag.components.navigation;
|
||||
package ru.touchin.roboswag.components.navigation.fragments;
|
||||
|
||||
import java.io.Serializable;
|
||||
|
||||
import ru.touchin.roboswag.components.navigation.activities.ViewControllerActivity;
|
||||
|
||||
/**
|
||||
* Created by Gavriil Sitnikov on 12/03/2016.
|
||||
* TODO: fill description
|
||||
|
|
@ -0,0 +1,15 @@
|
|||
package ru.touchin.roboswag.components.navigation.fragments;
|
||||
|
||||
import java.io.Serializable;
|
||||
|
||||
import ru.touchin.roboswag.components.navigation.activities.ViewControllerActivity;
|
||||
|
||||
/**
|
||||
* Created by Gavriil Sitnikov on 11/04/2016.
|
||||
* TODO: fill description
|
||||
*/
|
||||
public class TargetedViewControllerFragment<TState extends Serializable, TActivity extends ViewControllerActivity<?>>
|
||||
extends SimpleViewControllerFragment<TState, TActivity> {
|
||||
|
||||
|
||||
}
|
||||
|
|
@ -17,7 +17,7 @@
|
|||
*
|
||||
*/
|
||||
|
||||
package ru.touchin.roboswag.components.navigation;
|
||||
package ru.touchin.roboswag.components.navigation.fragments;
|
||||
|
||||
import android.content.Context;
|
||||
import android.os.Bundle;
|
||||
|
|
@ -35,6 +35,8 @@ import android.widget.FrameLayout;
|
|||
import java.io.Serializable;
|
||||
import java.lang.reflect.Constructor;
|
||||
|
||||
import ru.touchin.roboswag.components.navigation.ViewController;
|
||||
import ru.touchin.roboswag.components.navigation.activities.ViewControllerActivity;
|
||||
import ru.touchin.roboswag.core.log.Lc;
|
||||
import ru.touchin.roboswag.core.utils.ShouldNotHappenException;
|
||||
import rx.Observable;
|
||||
|
|
@ -17,7 +17,7 @@
|
|||
*
|
||||
*/
|
||||
|
||||
package ru.touchin.roboswag.components.navigation;
|
||||
package ru.touchin.roboswag.components.navigation.fragments;
|
||||
|
||||
import android.os.Bundle;
|
||||
import android.support.annotation.NonNull;
|
||||
|
|
@ -28,6 +28,7 @@ import android.view.LayoutInflater;
|
|||
import android.view.View;
|
||||
import android.view.ViewGroup;
|
||||
|
||||
import ru.touchin.roboswag.components.navigation.OnFragmentStartedListener;
|
||||
import ru.touchin.roboswag.core.log.Lc;
|
||||
import rx.functions.Action2;
|
||||
|
||||
Loading…
Reference in New Issue