Show shortDescription as subtitle in InfoActivity

teinvdlugt · May 23, 2016 · 4761ba9 · 4761ba9
1 parent 144d87c
commit 4761ba9
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/app/src/main/java/com/teinvdlugt/android/greekgods/InfoActivity.java b/app/src/main/java/com/teinvdlugt/android/greekgods/InfoActivity.java
@@ -30,6 +30,7 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
         if (savedInstanceState != null) {
             backStack = (ArrayList<Info>) savedInstanceState.getSerializable(BACK_STACK);
             posInBackStack = savedInstanceState.getInt(POS_IN_BACK_STACK, 0);
+            showInfo();
         }
         if (backStack == null || backStack.isEmpty()) {
             Info info = (Info) getIntent().getSerializableExtra(INFO_EXTRA);
@@ -40,7 +41,12 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
         }
     }
 
+    public void setSubtitle(String subtitle) {
+        if (getSupportActionBar() != null) getSupportActionBar().setSubtitle(subtitle);
+    }
+
     private void showInfo() {
+        setSubtitle(null);
         Info info = backStack.get(posInBackStack);
         switch (info.infoType) {
             case Info.INFO_TYPE_PERSON:

diff --git a/app/src/main/java/com/teinvdlugt/android/greekgods/PersonFragment.java b/app/src/main/java/com/teinvdlugt/android/greekgods/PersonFragment.java
@@ -191,9 +191,9 @@ protected void onPostExecute(Void aVoid) {
                 if (name != null) {
                     getActivity().setTitle(name);
                 }
-                /*if (shortDescription != null && getSupportActionBar() != null) {
-                    TODO getSupportActionBar().setSubtitle(shortDescription);
-                }*/
+                if (shortDescription != null) {
+                    ((InfoActivity) getActivity()).setSubtitle(shortDescription);
+                }
                 if (description != null) {
                     descriptionTV.setText(description);
                 } else {