From fa256c69aa7b1105784cd9b62ee59979bcbb498f Mon Sep 17 00:00:00 2001 From: Mariotaku Lee Date: Fri, 5 Feb 2016 11:44:36 +0800 Subject: [PATCH] fixed #259 fixed #314 --- twidere/build.gradle | 4 +- .../activity/support/MediaViewerActivity.java | 37 +------------------ .../fragment/support/StatusFragment.java | 4 +- .../preference/ColorPickerPreference.java | 1 + 4 files changed, 6 insertions(+), 40 deletions(-) diff --git a/twidere/build.gradle b/twidere/build.gradle index 8aca775c9..5755a2276 100644 --- a/twidere/build.gradle +++ b/twidere/build.gradle @@ -115,8 +115,8 @@ dependencies { compile 'com.google.dagger:dagger:2.0.2' compile 'org.attoparser:attoparser:1.4.0.RELEASE' compile 'com.j256.simplemagic:simplemagic:1.6' - compile 'com.github.mariotaku.MediaViewerLibrary:base:0.9.6' - compile 'com.github.mariotaku.MediaViewerLibrary:subsample-image-view:0.9.6' + compile 'com.github.mariotaku.MediaViewerLibrary:base:0.9.7' + compile 'com.github.mariotaku.MediaViewerLibrary:subsample-image-view:0.9.7' googleCompile 'com.google.android.gms:play-services-maps:8.4.0' // googleCompile 'com.google.maps.android:android-maps-utils:0.4' googleCompile('com.crashlytics.sdk.android:crashlytics:2.5.5@aar') { transitive = true } diff --git a/twidere/src/main/java/org/mariotaku/twidere/activity/support/MediaViewerActivity.java b/twidere/src/main/java/org/mariotaku/twidere/activity/support/MediaViewerActivity.java index 4f0f0d46e..a2ba60ac5 100644 --- a/twidere/src/main/java/org/mariotaku/twidere/activity/support/MediaViewerActivity.java +++ b/twidere/src/main/java/org/mariotaku/twidere/activity/support/MediaViewerActivity.java @@ -99,7 +99,6 @@ import java.util.concurrent.TimeUnit; import javax.inject.Inject; - public final class MediaViewerActivity extends AbsMediaViewerActivity implements Constants, AppCompatCallback, TaskStackBuilder.SupportParentable, ActionBarDrawerToggle.DelegateProvider, IExtendedActivity { @@ -585,6 +584,7 @@ public final class MediaViewerActivity extends AbsMediaViewerActivity implements /** * @hide */ + @Override public void invalidateOptionsMenu() { getDelegate().invalidateOptionsMenu(); } @@ -808,23 +808,6 @@ public final class MediaViewerActivity extends AbsMediaViewerActivity implements } } - @Override - protected void displayMedia(CacheDownloadLoader.Result data) { - super.displayMedia(data); - getActivity().supportInvalidateOptionsMenu(); - } - - @Override - public void hideProgress() { - super.hideProgress(); - getActivity().supportInvalidateOptionsMenu(); - } - - @Override - public void showProgress(boolean indeterminate, float progress) { - super.showProgress(indeterminate, progress); - getActivity().supportInvalidateOptionsMenu(); - } } public static class VideoPageFragment extends CacheDownloadMediaViewerFragment @@ -864,24 +847,6 @@ public final class MediaViewerActivity extends AbsMediaViewerActivity implements return getArguments().getBoolean(EXTRA_LOOP, false); } - @Override - public void hideProgress() { - super.hideProgress(); - getActivity().supportInvalidateOptionsMenu(); - } - - @Override - public void showProgress(boolean indeterminate, float progress) { - super.showProgress(indeterminate, progress); - getActivity().supportInvalidateOptionsMenu(); - } - - @Override - public void setMediaViewVisible(boolean visible) { - super.setMediaViewVisible(visible); - getActivity().supportInvalidateOptionsMenu(); - } - @Override protected boolean isAbleToLoad() { return getDownloadUri() != null; diff --git a/twidere/src/main/java/org/mariotaku/twidere/fragment/support/StatusFragment.java b/twidere/src/main/java/org/mariotaku/twidere/fragment/support/StatusFragment.java index ec961bb53..6d01a3c64 100644 --- a/twidere/src/main/java/org/mariotaku/twidere/fragment/support/StatusFragment.java +++ b/twidere/src/main/java/org/mariotaku/twidere/fragment/support/StatusFragment.java @@ -1392,7 +1392,7 @@ public class StatusFragment extends BaseSupportFragment implements LoaderCallbac @Override public void onLinkClick(String link, String orig, long accountId, long extraId, int type, boolean sensitive, int start, int end) { final ParcelableStatus status = adapter.getStatus(); - ParcelableMedia current = null; + ParcelableMedia current; if ((current = ParcelableMedia.findByUrl(status.media, link)) != null) { expandOrOpenMedia(current); return; @@ -1402,7 +1402,7 @@ public class StatusFragment extends BaseSupportFragment implements LoaderCallbac return; } if (type == TwidereLinkify.LINK_TYPE_STATUS && status.id == NumberUtils.toLong(link)) { - expandOrOpenMedia(current); + expandOrOpenMedia(null); return; } super.onLinkClick(link, orig, accountId, extraId, type, sensitive, start, end); diff --git a/twidere/src/main/java/org/mariotaku/twidere/preference/ColorPickerPreference.java b/twidere/src/main/java/org/mariotaku/twidere/preference/ColorPickerPreference.java index 6a64aef50..7bb04fd66 100644 --- a/twidere/src/main/java/org/mariotaku/twidere/preference/ColorPickerPreference.java +++ b/twidere/src/main/java/org/mariotaku/twidere/preference/ColorPickerPreference.java @@ -116,6 +116,7 @@ public class ColorPickerPreference extends DialogPreference implements DialogInt if (listener != null) { listener.onPreferenceChange(this, color); } + notifyChanged(); break; } }