From 197f2136c6ddc231e599b5ad1dc509c22874fb98 Mon Sep 17 00:00:00 2001 From: hyb1996 <946994919@qq.com> Date: Tue, 15 Aug 2017 20:23:17 +0800 Subject: [PATCH] fix: Documentation title not showing --- .../scriptdroid/ui/help/DocumentationActivity.java | 2 +- .../scriptdroid/ui/help/HelpCatalogueActivity.java | 11 +++++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/com/stardust/scriptdroid/ui/help/DocumentationActivity.java b/app/src/main/java/com/stardust/scriptdroid/ui/help/DocumentationActivity.java index 78fe213b..f77bda5b 100644 --- a/app/src/main/java/com/stardust/scriptdroid/ui/help/DocumentationActivity.java +++ b/app/src/main/java/com/stardust/scriptdroid/ui/help/DocumentationActivity.java @@ -40,6 +40,7 @@ public class DocumentationActivity extends BaseActivity { super.onCreate(savedInstanceState); setUpUI(); handleIntent(getIntent()); + setToolbarAsBack(mTitle); } private void handleIntent(Intent intent) { @@ -68,7 +69,6 @@ public class DocumentationActivity extends BaseActivity { private void setUpUI() { setContentView(R.layout.activity_document); - setToolbarAsBack(mTitle); setUpLoadingView(); } diff --git a/app/src/main/java/com/stardust/scriptdroid/ui/help/HelpCatalogueActivity.java b/app/src/main/java/com/stardust/scriptdroid/ui/help/HelpCatalogueActivity.java index 160e2d19..df2d66b3 100644 --- a/app/src/main/java/com/stardust/scriptdroid/ui/help/HelpCatalogueActivity.java +++ b/app/src/main/java/com/stardust/scriptdroid/ui/help/HelpCatalogueActivity.java @@ -107,9 +107,13 @@ public class HelpCatalogueActivity extends BaseActivity { if (CATALOGUES == null) { readCatalogues(); } else { - mLoadingIndicatorView.hide(); - handleIntent(); + onCataloguesAvailable(); } + } + + private void onCataloguesAvailable(){ + mLoadingIndicatorView.hide(); + handleIntent(); setToolbarAsBack(mTitle); } @@ -121,8 +125,7 @@ public class HelpCatalogueActivity extends BaseActivity { runOnUiThread(new Runnable() { @Override public void run() { - mLoadingIndicatorView.hide(); - handleIntent(); + onCataloguesAvailable(); } }); }