From 0c35ab6f10c100798a9528cd5a4b54611484bf07 Mon Sep 17 00:00:00 2001 From: danijoo Date: Sun, 1 Nov 2015 13:55:49 +0100 Subject: [PATCH] master details flow for tablet --- .../udacityproject1/MainActivity.java | 13 +++++- .../res/layout-sw600dp-land/activity_main.xml | 45 +++++++++++++++++++ .../main/res/values-sw600dp-land/dimens.xml | 3 ++ app/src/main/res/values-w820dp/dimens.xml | 6 --- app/src/main/res/values/dimens.xml | 1 + 5 files changed, 61 insertions(+), 7 deletions(-) create mode 100644 app/src/main/res/layout-sw600dp-land/activity_main.xml create mode 100644 app/src/main/res/values-sw600dp-land/dimens.xml delete mode 100644 app/src/main/res/values-w820dp/dimens.xml diff --git a/app/src/main/java/net/headlezz/udacityproject1/MainActivity.java b/app/src/main/java/net/headlezz/udacityproject1/MainActivity.java index 988e6cf..e444ab0 100644 --- a/app/src/main/java/net/headlezz/udacityproject1/MainActivity.java +++ b/app/src/main/java/net/headlezz/udacityproject1/MainActivity.java @@ -4,19 +4,27 @@ import android.os.Bundle; import android.support.v4.app.FragmentManager; import android.support.v7.app.AppCompatActivity; import android.support.v7.widget.Toolbar; +import android.view.View; +import android.widget.TextView; import net.headlezz.udacityproject1.movielist.MovieListFragment; import net.headlezz.udacityproject1.tmdbapi.Movie; +import butterknife.Bind; +import butterknife.ButterKnife; + /** * Main activity is mainly for handling fragment transactions */ public class MainActivity extends AppCompatActivity implements MovieNavigation, FragmentManager.OnBackStackChangedListener { + @Bind(R.id.main_details_placeHolderText) TextView detailsPlaceholderView; + @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_main); + ButterKnife.bind(this); Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar); setSupportActionBar(toolbar); setTitle(getString(R.string.app_name)); @@ -38,8 +46,11 @@ public class MainActivity extends AppCompatActivity implements MovieNavigation, */ public void showDetailsFragment(Movie movie) { MovieDetailsFragment frag = MovieDetailsFragment.newInstance(movie); + int holderId = getResources().getBoolean(R.bool.master_detail) ? R.id.fragmentHolderDetails : R.id.fragmentHolder; + if(detailsPlaceholderView != null) + detailsPlaceholderView.setVisibility(View.GONE); getSupportFragmentManager().beginTransaction() - .replace(R.id.fragmentHolder, frag) + .replace(holderId, frag) .addToBackStack(MovieDetailsFragment.TAG) .commit(); } diff --git a/app/src/main/res/layout-sw600dp-land/activity_main.xml b/app/src/main/res/layout-sw600dp-land/activity_main.xml new file mode 100644 index 0000000..848c2d5 --- /dev/null +++ b/app/src/main/res/layout-sw600dp-land/activity_main.xml @@ -0,0 +1,45 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/values-sw600dp-land/dimens.xml b/app/src/main/res/values-sw600dp-land/dimens.xml new file mode 100644 index 0000000..549c5f4 --- /dev/null +++ b/app/src/main/res/values-sw600dp-land/dimens.xml @@ -0,0 +1,3 @@ + + true + diff --git a/app/src/main/res/values-w820dp/dimens.xml b/app/src/main/res/values-w820dp/dimens.xml deleted file mode 100644 index 63fc816..0000000 --- a/app/src/main/res/values-w820dp/dimens.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - 64dp - diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml index 812cb7b..5595f7e 100644 --- a/app/src/main/res/values/dimens.xml +++ b/app/src/main/res/values/dimens.xml @@ -3,4 +3,5 @@ 16dp 16dp 16dp + false