From a88dc5d13ca8aa1a6d92b6bd9b26a8350670710a Mon Sep 17 00:00:00 2001 From: Gregor Santner Date: Fri, 30 Mar 2018 00:24:52 +0200 Subject: [PATCH] . --- .../activity/MainActivity.java | 24 +++++++++---------- .../ui/theme/ThemedFragment.java | 7 ++++++ .../opoc/activity}/CustomFragment.java | 8 ++----- 3 files changed, 21 insertions(+), 18 deletions(-) rename app/src/main/java/{com/github/dfa/diaspora_android/ui/theme => net/gsantner/opoc/activity}/CustomFragment.java (88%) diff --git a/app/src/main/java/com/github/dfa/diaspora_android/activity/MainActivity.java b/app/src/main/java/com/github/dfa/diaspora_android/activity/MainActivity.java index 348643db..f0ea1d11 100644 --- a/app/src/main/java/com/github/dfa/diaspora_android/activity/MainActivity.java +++ b/app/src/main/java/com/github/dfa/diaspora_android/activity/MainActivity.java @@ -71,10 +71,10 @@ import com.github.dfa.diaspora_android.receiver.OpenExternalLinkReceiver; import com.github.dfa.diaspora_android.receiver.UpdateTitleReceiver; import com.github.dfa.diaspora_android.ui.BadgeDrawable; import com.github.dfa.diaspora_android.ui.PodSelectionDialog; -import com.github.dfa.diaspora_android.ui.theme.CustomFragment; import com.github.dfa.diaspora_android.ui.theme.ThemeHelper; import com.github.dfa.diaspora_android.ui.theme.ThemedActivity; import com.github.dfa.diaspora_android.ui.theme.ThemedAlertDialogBuilder; +import com.github.dfa.diaspora_android.ui.theme.ThemedFragment; import com.github.dfa.diaspora_android.util.ActivityUtils; import com.github.dfa.diaspora_android.util.AndroidBug5497Workaround; import com.github.dfa.diaspora_android.util.AppLog; @@ -199,7 +199,7 @@ public class MainActivity extends ThemedActivity brOpenExternalLink = new OpenExternalLinkReceiver(this); brSetTitle = new UpdateTitleReceiver(app, urls, new UpdateTitleReceiver.TitleCallback() { public void setTitle(String url, int resId) { - CustomFragment top = getTopFragment(); + ThemedFragment top = getTopFragment(); if (top != null && top.getFragmentTag().equals(DiasporaStreamFragment.TAG)) { MainActivity.this.setTitle(resId); showLastVisitedTimestampMessageIfNeeded(url); @@ -207,7 +207,7 @@ public class MainActivity extends ThemedActivity } public void setTitle(String url, String title) { - CustomFragment top = getTopFragment(); + ThemedFragment top = getTopFragment(); if (top != null && top.getFragmentTag().equals(DiasporaStreamFragment.TAG)) { MainActivity.this.setTitle(title); } @@ -292,15 +292,15 @@ public class MainActivity extends ThemedActivity } /** - * Get an instance of the CustomFragment with the tag fragmentTag. + * Get an instance of the ThemedFragment with the tag fragmentTag. * If there was no instance so far, create a new one and add it to the FragmentManagers pool. * If there is no Fragment with the corresponding Tag, return the top fragment. * * @param fragmentTag tag * @return corresponding Fragment */ - protected CustomFragment getFragment(String fragmentTag) { - CustomFragment fragment = (CustomFragment) fm.findFragmentByTag(fragmentTag); + protected ThemedFragment getFragment(String fragmentTag) { + ThemedFragment fragment = (ThemedFragment) fm.findFragmentByTag(fragmentTag); if (fragment != null) { return fragment; } else { @@ -358,9 +358,9 @@ public class MainActivity extends ThemedActivity * * @param fragment Fragment to show */ - protected void showFragment(CustomFragment fragment) { + protected void showFragment(ThemedFragment fragment) { AppLog.v(this, "showFragment()"); - CustomFragment currentTop = (CustomFragment) fm.findFragmentById(R.id.fragment_container); + ThemedFragment currentTop = (ThemedFragment) fm.findFragmentById(R.id.fragment_container); if (currentTop == null || !currentTop.getFragmentTag().equals(fragment.getFragmentTag())) { AppLog.v(this, "Fragment was not visible. Replace it."); fm.beginTransaction().addToBackStack(null).replace(R.id.fragment_container, fragment, fragment.getFragmentTag()).commit(); @@ -591,8 +591,8 @@ public class MainActivity extends ThemedActivity * * @return top fragment or null if there is none displayed */ - private CustomFragment getTopFragment() { - return (CustomFragment) fm.findFragmentById(R.id.fragment_container); + private ThemedFragment getTopFragment() { + return (ThemedFragment) fm.findFragmentById(R.id.fragment_container); } /** @@ -605,7 +605,7 @@ public class MainActivity extends ThemedActivity navDrawer.closeDrawer(navView); return; } - CustomFragment top = getTopFragment(); + ThemedFragment top = getTopFragment(); if (top != null) { AppLog.v(this, "Top Fragment is not null"); if (!top.onBackPressed()) { @@ -683,7 +683,7 @@ public class MainActivity extends ThemedActivity //Clear the menus menu.clear(); - CustomFragment top = getTopFragment(); + ThemedFragment top = getTopFragment(); if (top != null) { if (!top.getFragmentTag().equals(PodSelectionFragment.TAG)) { cache = _appSettings.isExtendedNotificationsActivated(); diff --git a/app/src/main/java/com/github/dfa/diaspora_android/ui/theme/ThemedFragment.java b/app/src/main/java/com/github/dfa/diaspora_android/ui/theme/ThemedFragment.java index b68da449..6bda3814 100644 --- a/app/src/main/java/com/github/dfa/diaspora_android/ui/theme/ThemedFragment.java +++ b/app/src/main/java/com/github/dfa/diaspora_android/ui/theme/ThemedFragment.java @@ -21,6 +21,8 @@ package com.github.dfa.diaspora_android.ui.theme; import com.github.dfa.diaspora_android.App; import com.github.dfa.diaspora_android.util.AppSettings; +import net.gsantner.opoc.activity.CustomFragment; + /** * Fragment that supports color schemes * Created by vanitas on 06.10.16. @@ -39,4 +41,9 @@ public abstract class ThemedFragment extends CustomFragment { ThemeHelper.getInstance(getAppSettings()); applyColorToViews(); } + + + public boolean isAllowedIntellihide() { + return true; + } } diff --git a/app/src/main/java/com/github/dfa/diaspora_android/ui/theme/CustomFragment.java b/app/src/main/java/net/gsantner/opoc/activity/CustomFragment.java similarity index 88% rename from app/src/main/java/com/github/dfa/diaspora_android/ui/theme/CustomFragment.java rename to app/src/main/java/net/gsantner/opoc/activity/CustomFragment.java index 82dcf93c..e6d50c75 100644 --- a/app/src/main/java/com/github/dfa/diaspora_android/ui/theme/CustomFragment.java +++ b/app/src/main/java/net/gsantner/opoc/activity/CustomFragment.java @@ -16,7 +16,7 @@ If not, see . */ -package com.github.dfa.diaspora_android.ui.theme; +package net.gsantner.opoc.activity; import android.os.Bundle; import android.support.v4.app.Fragment; @@ -28,7 +28,7 @@ import android.support.v4.app.Fragment; public abstract class CustomFragment extends Fragment { - public static final String TAG = "com.github.dfa.diaspora_android.ui.theme.CustomFragment"; + public static final String TAG = "net.gsantner.opoc.activity.CustomFragment"; /** * We have an optionsMenu @@ -55,9 +55,5 @@ public abstract class CustomFragment extends Fragment { * @return did we react to the back press? */ public abstract boolean onBackPressed(); - - public boolean isAllowedIntellihide() { - return true; - } }