From 4dc7949116b9e8369b62759071c703f318af1dc9 Mon Sep 17 00:00:00 2001 From: Felix Date: Mon, 25 Sep 2017 03:17:11 +0200 Subject: [PATCH] cleanup unused and commented out code --- .../touch/activities/BrowseActivity.java | 53 ++----------------- .../touch/activities/TouchBaseActivity.java | 9 ---- 2 files changed, 4 insertions(+), 58 deletions(-) delete mode 100644 touch/src/main/java/de/nicidienase/chaosflix/touch/activities/TouchBaseActivity.java diff --git a/touch/src/main/java/de/nicidienase/chaosflix/touch/activities/BrowseActivity.java b/touch/src/main/java/de/nicidienase/chaosflix/touch/activities/BrowseActivity.java index 98748e92..f7644c4c 100644 --- a/touch/src/main/java/de/nicidienase/chaosflix/touch/activities/BrowseActivity.java +++ b/touch/src/main/java/de/nicidienase/chaosflix/touch/activities/BrowseActivity.java @@ -8,6 +8,7 @@ import android.support.v4.app.Fragment; import android.support.v4.app.FragmentManager; import android.support.v4.app.FragmentTransaction; import android.support.v4.view.ViewCompat; +import android.support.v7.app.AppCompatActivity; import android.support.v7.widget.Toolbar; import android.transition.Slide; import android.transition.TransitionInflater; @@ -33,14 +34,13 @@ import io.reactivex.schedulers.Schedulers; * Created by felix on 17.09.17. */ -public class BrowseActivity extends TouchBaseActivity implements +public class BrowseActivity extends AppCompatActivity implements ConferencesTabBrowseFragment.OnConferenceListFragmentInteractionListener, EventsFragment.OnEventsListFragmentInteractionListener, EventDetailsFragment.OnEventDetailsFragmentInteractionListener, ExoPlayerFragment.OnMediaPlayerInteractionListener { private static final String TAG = BrowseActivity.class.getSimpleName(); -// private static final String TAG_RETAINED_FRAGMENT = "retained_fragment"; CompositeDisposable mDisposables = new CompositeDisposable(); private ChaosflixViewModel mViewModel; @@ -56,44 +56,19 @@ public class BrowseActivity extends TouchBaseActivity implements res.getString(R.string.streaming_media_ccc_url)); mViewModel = ViewModelProviders.of(this,factory).get(ChaosflixViewModel.class); - FragmentManager fragmentManager = getSupportFragmentManager(); - Fragment fragment = null; - if(savedInstanceState != null){ - // Restore previous state -// fragment = fragmentManager.getFragment(savedInstanceState,TAG_RETAINED_FRAGMENT); - } else { - // New instance - if(fragment != null){ - FragmentTransaction ft = fragmentManager.beginTransaction(); -// ft.replace(R.id.fragment_container,fragment,TAG_RETAINED_FRAGMENT); - ft.replace(R.id.fragment_container,fragment); - ft.commit(); - } else { + if(savedInstanceState == null){ mDisposables.add(mViewModel.getConferencesWrapper() .observeOn(AndroidSchedulers.mainThread()) .subscribe(conferencesWrapper -> { ConferencesTabBrowseFragment browseFragment = ConferencesTabBrowseFragment.newInstance(getNumColumns()); -// browseFragment.setContent(conferencesWrapper); - FragmentTransaction ft = fragmentManager.beginTransaction(); -// ft.replace(R.id.fragment_container,browseFragment,TAG_RETAINED_FRAGMENT); + FragmentTransaction ft = getSupportFragmentManager().beginTransaction(); ft.replace(R.id.fragment_container,browseFragment); ft.commit(); })); - } } } - @Override - protected void onSaveInstanceState(Bundle outState) { - super.onSaveInstanceState(outState); -// FragmentManager fragmentManager = getSupportFragmentManager(); -// Fragment fragment = fragmentManager.findFragmentByTag(TAG_RETAINED_FRAGMENT); -// if(fragment != null){ -// fragmentManager.putFragment(outState,TAG_RETAINED_FRAGMENT,fragment); -// } - } - @Override protected void onStop() { super.onStop(); @@ -120,11 +95,9 @@ public class BrowseActivity extends TouchBaseActivity implements transitionInflater.inflateTransition(android.R.transition.slide_right)); Slide slideTransition = new Slide(Gravity.RIGHT); -// slideTransition.setDuration(1000); eventsFragment.setEnterTransition(slideTransition); FragmentTransaction ft = fm.beginTransaction(); -// ft.replace(R.id.fragment_container, eventsFragment,TAG_RETAINED_FRAGMENT); ft.replace(R.id.fragment_container, eventsFragment); ft.addToBackStack(null); ft.setTransition(FragmentTransaction.TRANSIT_FRAGMENT_OPEN); @@ -145,7 +118,6 @@ public class BrowseActivity extends TouchBaseActivity implements detailsFragment.setAllowReturnTransitionOverlap(true); FragmentTransaction ft = fm.beginTransaction(); -// ft.replace(R.id.fragment_container, detailsFragment,TAG_RETAINED_FRAGMENT); ft.replace(R.id.fragment_container, detailsFragment); ft.addToBackStack(null); @@ -172,28 +144,11 @@ public class BrowseActivity extends TouchBaseActivity implements FragmentTransaction ft = getSupportFragmentManager().beginTransaction(); Fragment playerFragment = ExoPlayerFragment.newInstance(event,recording); -// ft.replace(R.id.fragment_container,playerFragment,TAG_RETAINED_FRAGMENT); ft.replace(R.id.fragment_container,playerFragment); ft.addToBackStack(null); ft.commit(); } -// public List getRelatedEvents(Event event, MediaApiService service){ -// List results = new ArrayList<>(); -// Metadata metadata = event.getMetadata(); -// if(metadata != null && metadata.getRelated() != null){ -// Observable eventObservable = null; -// for(long id: metadata.getRelated()){ -// if(eventObservable == null){ -// eventObservable = service.getEvent(id); -// } else { -// eventObservable.mergeWith(service.getEvent(id)); -// } -// } -// eventObservable.subscribe() -// } -// return results; -// } @Override diff --git a/touch/src/main/java/de/nicidienase/chaosflix/touch/activities/TouchBaseActivity.java b/touch/src/main/java/de/nicidienase/chaosflix/touch/activities/TouchBaseActivity.java deleted file mode 100644 index c49913dd..00000000 --- a/touch/src/main/java/de/nicidienase/chaosflix/touch/activities/TouchBaseActivity.java +++ /dev/null @@ -1,9 +0,0 @@ -package de.nicidienase.chaosflix.touch.activities; - -import android.support.v7.app.AppCompatActivity; - -/** - * Created by felix on 24.03.17. - */ - -public class TouchBaseActivity extends AppCompatActivity {}