From b069b3e003289dbb939ef956fadef6a0155833d6 Mon Sep 17 00:00:00 2001 From: Mygod Date: Wed, 28 Dec 2016 05:01:03 +0800 Subject: [PATCH] Don't setToolbar in minidrawer mode --- src/main/scala/com/github/shadowsocks/MainActivity.scala | 2 +- src/main/scala/com/github/shadowsocks/ToolbarFragment.scala | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/main/scala/com/github/shadowsocks/MainActivity.scala b/src/main/scala/com/github/shadowsocks/MainActivity.scala index 160f7b6b..6d7d48bb 100644 --- a/src/main/scala/com/github/shadowsocks/MainActivity.scala +++ b/src/main/scala/com/github/shadowsocks/MainActivity.scala @@ -70,7 +70,7 @@ class MainActivity extends Activity with ServiceBoundContext with Drawer.OnDrawe private val handler = new Handler() private var fab: FloatingActionButton = _ private var fabProgressCircle: FABProgressCircle = _ - private var crossfader: Crossfader[CrossFadeSlidingPaneLayout] = _ + var crossfader: Crossfader[CrossFadeSlidingPaneLayout] = _ var drawer: Drawer = _ private var testCount: Int = _ diff --git a/src/main/scala/com/github/shadowsocks/ToolbarFragment.scala b/src/main/scala/com/github/shadowsocks/ToolbarFragment.scala index 54d71b1e..5810aefd 100644 --- a/src/main/scala/com/github/shadowsocks/ToolbarFragment.scala +++ b/src/main/scala/com/github/shadowsocks/ToolbarFragment.scala @@ -32,9 +32,7 @@ class ToolbarFragment extends Fragment { super.onViewCreated(view, savedInstanceState) toolbar = view.findViewById(R.id.toolbar).asInstanceOf[Toolbar] val activity = getActivity.asInstanceOf[MainActivity] - try activity.drawer.setToolbar(activity, toolbar, true) catch { - case _: Exception => // ignore for now - } + if (activity.crossfader == null) activity.drawer.setToolbar(activity, toolbar, true) } def onTrafficUpdated(txRate: Long, rxRate: Long, txTotal: Long, rxTotal: Long): Unit = ()