diff --git a/astrid/src/main/java/com/todoroo/astrid/activity/TaskEditActivity.java b/astrid/src/main/java/com/todoroo/astrid/activity/TaskEditActivity.java index 03ce004bf..8a0031dd5 100644 --- a/astrid/src/main/java/com/todoroo/astrid/activity/TaskEditActivity.java +++ b/astrid/src/main/java/com/todoroo/astrid/activity/TaskEditActivity.java @@ -8,6 +8,7 @@ package com.todoroo.astrid.activity; import android.os.Bundle; import android.support.v4.app.Fragment; import android.support.v7.app.ActionBar; +import android.support.v7.widget.Toolbar; import android.view.KeyEvent; import com.todoroo.andlib.utility.AndroidUtilities; @@ -29,12 +30,14 @@ public class TaskEditActivity extends AstridActivity { super.onCreate(savedInstanceState); preferences.applyTheme(); - ActionBar actionBar = getSupportActionBar(); setContentView(R.layout.task_edit_wrapper_activity); + Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar); + setSupportActionBar(toolbar); + + ActionBar actionBar = getSupportActionBar(); actionBar.setDisplayHomeAsUpEnabled(true); - actionBar.setDisplayShowTitleEnabled(true); - actionBar.setTitle(""); + actionBar.setDisplayShowTitleEnabled(false); } /* (non-Javadoc) diff --git a/astrid/src/main/java/com/todoroo/astrid/activity/TaskListActivity.java b/astrid/src/main/java/com/todoroo/astrid/activity/TaskListActivity.java index fc2fa2002..7dea08000 100644 --- a/astrid/src/main/java/com/todoroo/astrid/activity/TaskListActivity.java +++ b/astrid/src/main/java/com/todoroo/astrid/activity/TaskListActivity.java @@ -16,6 +16,7 @@ import android.support.v4.view.ViewPager.OnPageChangeListener; import android.support.v4.widget.DrawerLayout; import android.support.v7.app.ActionBar; import android.support.v7.widget.SearchView; +import android.support.v7.widget.Toolbar; import android.util.TypedValue; import android.view.KeyEvent; import android.view.Menu; @@ -56,6 +57,7 @@ import javax.inject.Inject; import static com.todoroo.astrid.voice.RecognizerApi.RecognizerApiListener; import static com.todoroo.astrid.voice.VoiceRecognizer.voiceInputAvailable; +import static org.tasks.preferences.ResourceResolver.getData; import static org.tasks.ui.NavigationDrawerFragment.OnFilterItemClickedListener; public class TaskListActivity extends AstridActivity implements OnPageChangeListener, OnFilterItemClickedListener, RecognizerApiListener { @@ -86,15 +88,18 @@ public class TaskListActivity extends AstridActivity implements OnPageChangeList super.onCreate(savedInstanceState); preferences.applyTheme(); - int contentView = getContentView(); - setContentView(contentView); + setContentView(preferences.useTabletLayout() + ? R.layout.task_list_wrapper_activity_3pane + : R.layout.task_list_wrapper_activity_no_swipe); - ActionBar actionBar = getSupportActionBar(); - actionBar.setDisplayUseLogoEnabled(true); - actionBar.setLogo(null); + Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar); + setSupportActionBar(toolbar); navigationDrawer = getNavigationDrawerFragment(); - navigationDrawer.setUp((DrawerLayout) findViewById(R.id.drawer_layout)); + DrawerLayout drawerLayout = (DrawerLayout) findViewById(R.id.drawer_layout); + + navigationDrawer.setUp(drawerLayout); +// drawerLayout.setStatusBarBackgroundColor(getResources().getColor(android.R.color.holo_blue_bright)); TypedValue typedValue = new TypedValue(); getTheme().resolveAttribute(R.attr.ic_drawer, typedValue, true); @@ -182,14 +187,6 @@ public class TaskListActivity extends AstridActivity implements OnPageChangeList return true; } - private int getContentView() { - if (preferences.useTabletLayout()) { - return R.layout.task_list_wrapper_activity_3pane; - } else { - return R.layout.task_list_wrapper_activity_no_swipe; - } - } - protected Filter getDefaultFilter() { return CoreFilterExposer.buildInboxFilter(getResources()); } diff --git a/astrid/src/main/java/org/tasks/ui/NavigationDrawerFragment.java b/astrid/src/main/java/org/tasks/ui/NavigationDrawerFragment.java index d77a42585..5ff4c34a2 100644 --- a/astrid/src/main/java/org/tasks/ui/NavigationDrawerFragment.java +++ b/astrid/src/main/java/org/tasks/ui/NavigationDrawerFragment.java @@ -147,9 +147,9 @@ public class NavigationDrawerFragment extends InjectingFragment { mDrawerLayout.setDrawerShadow(R.drawable.drawer_shadow, GravityCompat.START); // set up the drawer's list view with items and click listener - ActionBar actionBar = getActionBar(); - actionBar.setDisplayHomeAsUpEnabled(true); - actionBar.setHomeButtonEnabled(true); +// ActionBar actionBar = getActionBar(); +// actionBar.setDisplayHomeAsUpEnabled(true); +// actionBar.setHomeButtonEnabled(true); // ActionBarDrawerToggle ties together the the proper interactions // between the navigation drawer and the action bar app icon. diff --git a/astrid/src/main/res/layout/fragment_navigation_drawer.xml b/astrid/src/main/res/layout/fragment_navigation_drawer.xml index 8e6400243..98ed78124 100644 --- a/astrid/src/main/res/layout/fragment_navigation_drawer.xml +++ b/astrid/src/main/res/layout/fragment_navigation_drawer.xml @@ -10,4 +10,5 @@ android:layout_alignParentTop="true" android:cacheColorHint="@android:color/transparent" android:scrollingCache="false" + android:fitsSystemWindows="true" tools:context=".NavigationDrawerFragment" /> diff --git a/astrid/src/main/res/layout/task_edit_activity.xml b/astrid/src/main/res/layout/task_edit_activity.xml index 32117e292..cb946016c 100644 --- a/astrid/src/main/res/layout/task_edit_activity.xml +++ b/astrid/src/main/res/layout/task_edit_activity.xml @@ -10,7 +10,9 @@ android:layout_width="fill_parent" android:layout_height="fill_parent" android:orientation="vertical" > - + + + - - - - - - - - + diff --git a/astrid/src/main/res/layout/task_list_body_subtasks.xml b/astrid/src/main/res/layout/task_list_body_subtasks.xml index 804f6c0c4..53fa5ecc9 100644 --- a/astrid/src/main/res/layout/task_list_body_subtasks.xml +++ b/astrid/src/main/res/layout/task_list_body_subtasks.xml @@ -19,27 +19,6 @@ - - - - - - - - + diff --git a/astrid/src/main/res/layout/task_list_swipe_layout_empty.xml b/astrid/src/main/res/layout/task_list_swipe_layout_empty.xml new file mode 100644 index 000000000..243198fca --- /dev/null +++ b/astrid/src/main/res/layout/task_list_swipe_layout_empty.xml @@ -0,0 +1,22 @@ + + + + + + + + diff --git a/astrid/src/main/res/layout/task_list_wrapper_activity_3pane.xml b/astrid/src/main/res/layout/task_list_wrapper_activity_3pane.xml index f169e43ab..85a598551 100644 --- a/astrid/src/main/res/layout/task_list_wrapper_activity_3pane.xml +++ b/astrid/src/main/res/layout/task_list_wrapper_activity_3pane.xml @@ -2,7 +2,8 @@ xmlns:tools="http://schemas.android.com/tools" android:id="@+id/drawer_layout" android:layout_width="match_parent" - android:layout_height="match_parent"> + android:layout_height="match_parent" + android:fitsSystemWindows="true"> + + diff --git a/astrid/src/main/res/layout/task_list_wrapper_activity_no_swipe.xml b/astrid/src/main/res/layout/task_list_wrapper_activity_no_swipe.xml index 4832fd4e7..6872db319 100644 --- a/astrid/src/main/res/layout/task_list_wrapper_activity_no_swipe.xml +++ b/astrid/src/main/res/layout/task_list_wrapper_activity_no_swipe.xml @@ -2,13 +2,23 @@ xmlns:tools="http://schemas.android.com/tools" android:id="@+id/drawer_layout" android:layout_width="match_parent" - android:layout_height="match_parent"> + android:layout_height="match_parent" + android:fitsSystemWindows="true"> - + android:layout_height="match_parent" + android:orientation="vertical"> + + + + + + + + + + + + + \ No newline at end of file diff --git a/astrid/src/main/res/values/styles.xml b/astrid/src/main/res/values/styles.xml index 674627035..5def82aa5 100644 --- a/astrid/src/main/res/values/styles.xml +++ b/astrid/src/main/res/values/styles.xml @@ -8,7 +8,9 @@ - + @@ -75,9 +79,11 @@ @drawable/ic_action_overflow_light - -