fixed #310

fixed #311

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.4'
+    compile 'com.github.mariotaku.MediaViewerLibrary:base:0.9.4-SNAPSHOT'
-    compile 'com.github.mariotaku.MediaViewerLibrary:subsample-image-view:0.9.4'
+    compile 'com.github.mariotaku.MediaViewerLibrary:subsample-image-view:0.9.4-SNAPSHOT'
     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 }

twidere/src/main/java/org/mariotaku/twidere/activity/iface/IExtendedActivity.java

@@ -19,6 +19,9 @@
 
 package org.mariotaku.twidere.activity.iface;
 
+import java.util.LinkedList;
+import java.util.Queue;
+
 /**
  * Created by mariotaku on 15/12/28.
  */
@@ -29,4 +32,39 @@ public interface IExtendedActivity {
     interface Action {
         void execute(IExtendedActivity activity);
     }
+
+    class ActionHelper {
+
+        private final IExtendedActivity mActivity;
+
+        private boolean mFragmentResumed;
+        private Queue<Action> mActionQueue = new LinkedList<>();
+
+        public ActionHelper(IExtendedActivity activity) {
+            mActivity = activity;
+        }
+
+        public void dispatchOnPause() {
+            mFragmentResumed = false;
+        }
+
+        public void dispatchOnResumeFragments() {
+            mFragmentResumed = true;
+            executePending();
+        }
+
+
+        private void executePending() {
+            if (!mFragmentResumed) return;
+            Action action;
+            while ((action = mActionQueue.poll()) != null) {
+                action.execute(mActivity);
+            }
+        }
+
+        public void executeAfterFragmentResumed(Action action) {
+            mActionQueue.add(action);
+            executePending();
+        }
+    }
 }

twidere/src/main/java/org/mariotaku/twidere/activity/support/BaseAppCompatActivity.java

@@ -45,8 +45,6 @@ import org.mariotaku.twidere.util.dagger.GeneralComponentHelper;
 import org.mariotaku.twidere.view.iface.IExtendedView.OnFitSystemWindowsListener;
 
 import java.util.ArrayList;
-import java.util.LinkedList;
-import java.util.Queue;
 
 import javax.inject.Inject;
 
@@ -69,6 +67,8 @@ public class BaseAppCompatActivity extends ThemedAppCompatActivity implements Co
     @Inject
     protected NotificationManagerWrapper mNotificationManager;
 
+    private ActionHelper mActionHelper = new ActionHelper(this);
+
     // Registered listeners
     private ArrayList<ControlBarOffsetListener> mControlBarOffsetListeners = new ArrayList<>();
 
@@ -77,8 +77,6 @@ public class BaseAppCompatActivity extends ThemedAppCompatActivity implements Co
     private boolean mIsVisible;
     private Rect mSystemWindowsInsets;
     private int mKeyMetaState;
-    private boolean mFragmentResumed;
-    private Queue<Action> mActionQueue = new LinkedList<>();
 
     @Override
     public boolean getSystemWindowsInsets(Rect insets) {
@@ -184,7 +182,7 @@ public class BaseAppCompatActivity extends ThemedAppCompatActivity implements Co
 
     @Override
     protected void onPause() {
-        mFragmentResumed = false;
+        mActionHelper.dispatchOnPause();
         super.onPause();
     }
 
@@ -255,21 +253,12 @@ public class BaseAppCompatActivity extends ThemedAppCompatActivity implements Co
     @Override
     protected void onResumeFragments() {
         super.onResumeFragments();
-        mFragmentResumed = true;
+        mActionHelper.dispatchOnResumeFragments();
-        executePending();
     }
 
     @Override
     public void executeAfterFragmentResumed(Action action) {
-        mActionQueue.add(action);
+        mActionHelper.executeAfterFragmentResumed(action);
-        executePending();
     }
 
-    private void executePending() {
-        if (!mFragmentResumed) return;
-        Action action;
-        while ((action = mActionQueue.poll()) != null) {
-            action.execute(this);
-        }
-    }
 }

twidere/src/main/java/org/mariotaku/twidere/activity/support/MediaViewerActivity.java

@@ -16,12 +16,17 @@
 
 package org.mariotaku.twidere.activity.support;
 
+import android.Manifest;
 import android.annotation.SuppressLint;
+import android.app.Activity;
+import android.app.DialogFragment;
+import android.app.FragmentManager;
 import android.content.Intent;
 import android.content.res.Configuration;
 import android.media.AudioManager;
 import android.media.MediaPlayer;
 import android.net.Uri;
+import android.os.AsyncTask;
 import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
@@ -33,6 +38,8 @@ import android.support.v4.app.ActivityCompat;
 import android.support.v4.app.Fragment;
 import android.support.v4.app.NavUtils;
 import android.support.v4.app.TaskStackBuilder;
+import android.support.v4.content.FileProvider;
+import android.support.v4.view.PagerAdapter;
 import android.support.v4.view.ViewPager;
 import android.support.v7.app.ActionBar;
 import android.support.v7.app.ActionBarDrawerToggle;
@@ -43,7 +50,9 @@ import android.support.v7.widget.Toolbar;
 import android.text.TextUtils;
 import android.util.Pair;
 import android.view.LayoutInflater;
+import android.view.Menu;
 import android.view.MenuInflater;
+import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
 import android.webkit.WebSettings;
@@ -52,6 +61,7 @@ import android.widget.ImageButton;
 import android.widget.MediaController;
 import android.widget.ProgressBar;
 import android.widget.TextView;
+import android.widget.Toast;
 
 import com.pnikosis.materialishprogress.ProgressWheel;
 import com.sprylab.android.widget.TextureVideoView;
@@ -66,18 +76,32 @@ import org.mariotaku.mediaviewer.library.MediaViewerFragment;
 import org.mariotaku.mediaviewer.library.subsampleimageview.SubsampleImageViewerFragment;
 import org.mariotaku.twidere.Constants;
 import org.mariotaku.twidere.R;
+import org.mariotaku.twidere.activity.iface.IExtendedActivity;
+import org.mariotaku.twidere.fragment.ProgressDialogFragment;
 import org.mariotaku.twidere.model.ParcelableMedia;
+import org.mariotaku.twidere.model.ParcelableStatus;
+import org.mariotaku.twidere.provider.CacheProvider;
+import org.mariotaku.twidere.task.SaveFileTask;
+import org.mariotaku.twidere.task.SaveImageToGalleryTask;
+import org.mariotaku.twidere.util.AsyncTaskUtils;
+import org.mariotaku.twidere.util.IntentUtils;
+import org.mariotaku.twidere.util.MenuUtils;
+import org.mariotaku.twidere.util.PermissionUtils;
 import org.mariotaku.twidere.util.ThemeUtils;
 import org.mariotaku.twidere.util.Utils;
 import org.mariotaku.twidere.util.dagger.GeneralComponentHelper;
 
+import java.io.File;
 import java.util.concurrent.TimeUnit;
 
 import javax.inject.Inject;
 
 
 public final class MediaViewerActivity extends AbsMediaViewerActivity implements Constants,
-        AppCompatCallback, TaskStackBuilder.SupportParentable, ActionBarDrawerToggle.DelegateProvider {
+        AppCompatCallback, TaskStackBuilder.SupportParentable, ActionBarDrawerToggle.DelegateProvider,
+        IExtendedActivity {
+
+    private static final int REQUEST_SHARE_MEDIA = 201;
 
     @Inject
     FileCache mFileCache;
@@ -85,6 +109,11 @@ public final class MediaViewerActivity extends AbsMediaViewerActivity implements
     MediaDownloader mMediaDownloader;
 
     private ParcelableMedia[] mMedia;
+    private AppCompatDelegate mDelegate;
+    private ActionHelper mActionHelper = new ActionHelper(this);
+    private SaveFileTask mSaveFileTask;
+    private int mSaveToStoragePosition = -1;
+    private File mShareFile;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -97,9 +126,37 @@ public final class MediaViewerActivity extends AbsMediaViewerActivity implements
         actionBar.setDisplayHomeAsUpEnabled(true);
     }
 
+    @Override
+    public void onActivityResult(int requestCode, int resultCode, Intent data) {
+        switch (requestCode) {
+            case REQUEST_SHARE_MEDIA: {
+                if (mShareFile != null) {
+                    mShareFile.delete();
+                    mShareFile = null;
+                }
+                break;
+            }
+        }
+    }
+
+    public void processShareIntent(Intent intent) {
+        if (!hasStatus()) return;
+        final ParcelableStatus status = getStatus();
+        intent.putExtra(Intent.EXTRA_SUBJECT, IntentUtils.getStatusShareSubject(this, status));
+        intent.putExtra(Intent.EXTRA_TEXT, IntentUtils.getStatusShareText(this, status));
+    }
+
+    public boolean hasStatus() {
+        return getIntent().hasExtra(EXTRA_STATUS);
+    }
+
+    private ParcelableStatus getStatus() {
+        return getIntent().getParcelableExtra(EXTRA_STATUS);
+    }
+
     @Override
     protected int getInitialPosition() {
-        return ArrayUtils.indexOf(getMedia(), getCurrentMedia());
+        return ArrayUtils.indexOf(getMedia(), getInitialMedia());
     }
 
     @Override
@@ -121,6 +178,23 @@ public final class MediaViewerActivity extends AbsMediaViewerActivity implements
         return actionBar != null && actionBar.isShowing();
     }
 
+    @Override
+    protected void onPause() {
+        mActionHelper.dispatchOnPause();
+        super.onPause();
+    }
+
+    @Override
+    protected void onResumeFragments() {
+        super.onResumeFragments();
+        mActionHelper.dispatchOnResumeFragments();
+    }
+
+    @Override
+    public void executeAfterFragmentResumed(Action action) {
+        mActionHelper.executeAfterFragmentResumed(action);
+    }
+
     @Override
     public void setBarVisibility(boolean visible) {
         final ActionBar actionBar = getSupportActionBar();
@@ -181,7 +255,7 @@ public final class MediaViewerActivity extends AbsMediaViewerActivity implements
         return getMedia().length;
     }
 
-    private ParcelableMedia getCurrentMedia() {
+    private ParcelableMedia getInitialMedia() {
         return getIntent().getParcelableExtra(EXTRA_CURRENT_MEDIA);
     }
 
@@ -195,302 +269,178 @@ public final class MediaViewerActivity extends AbsMediaViewerActivity implements
         return null;
     }
 
-    public static class ImagePageFragment extends SubsampleImageViewerFragment {
+    @Override
-        @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
-        protected Object getDownloadExtra() {
+        getMenuInflater().inflate(R.menu.menu_media_viewer, menu);
-            return ((MediaViewerActivity) getActivity()).getDownloadExtra();
+        return true;
-        }
+    }
 
-        @Override
+    @Override
-        public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
+    public boolean onPrepareOptionsMenu(Menu menu) {
-            super.onViewCreated(view, savedInstanceState);
+        final ViewPager viewPager = findViewPager();
-            final ProgressWheel progressWheel = (ProgressWheel) view.findViewById(org.mariotaku.mediaviewer.library.R.id.load_progress);
+        final PagerAdapter adapter = viewPager.getAdapter();
-            progressWheel.setBarColor(ThemeUtils.getUserAccentColor(getContext()));
+        final Object object = adapter.instantiateItem(viewPager, viewPager.getCurrentItem());
+        if (!(object instanceof MediaViewerFragment)) return false;
+        if (object instanceof CacheDownloadMediaViewerFragment) {
+            CacheDownloadMediaViewerFragment f = (CacheDownloadMediaViewerFragment) object;
+            final boolean running = f.getLoaderManager().hasRunningLoaders();
+            final boolean downloaded = f.hasDownloadedData();
+            MenuUtils.setMenuItemAvailability(menu, R.id.refresh, !running && !downloaded);
+            MenuUtils.setMenuItemAvailability(menu, R.id.share, !running && downloaded);
+            MenuUtils.setMenuItemAvailability(menu, R.id.save, !running && downloaded);
+        } else {
+            MenuUtils.setMenuItemAvailability(menu, R.id.refresh, false);
+            MenuUtils.setMenuItemAvailability(menu, R.id.share, true);
+            MenuUtils.setMenuItemAvailability(menu, R.id.save, false);
+        }
+        return true;
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        final ViewPager viewPager = findViewPager();
+        final PagerAdapter adapter = viewPager.getAdapter();
+        final int currentItem = viewPager.getCurrentItem();
+        final Object object = adapter.instantiateItem(viewPager, currentItem);
+        if (!(object instanceof MediaViewerFragment)) return false;
+        switch (item.getItemId()) {
+            case R.id.refresh: {
+                if (object instanceof CacheDownloadMediaViewerFragment) {
+                    ((CacheDownloadMediaViewerFragment) object).startLoading(true);
+                }
+                return true;
+            }
+            case R.id.share: {
+                shareMedia();
+                return true;
+            }
+            case R.id.save: {
+                requestAndSaveToStorage(currentItem);
+                return true;
+            }
+            case R.id.open_in_browser: {
+                final ParcelableMedia media = getMedia()[currentItem];
+                startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(media.media_url)));
+                return true;
+            }
+        }
+        return super.onOptionsItemSelected(item);
+    }
+
+    @Override
+    public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
+        switch (requestCode) {
+            case REQUEST_REQUEST_PERMISSIONS: {
+                if (PermissionUtils.hasPermission(permissions, grantResults, Manifest.permission.WRITE_EXTERNAL_STORAGE)) {
+                    saveToStorage();
+                } else {
+                    Toast.makeText(this, R.string.save_media_no_storage_permission_message, Toast.LENGTH_LONG).show();
+                }
+                return;
+            }
+        }
+        super.onRequestPermissionsResult(requestCode, permissions, grantResults);
+    }
+
+
+    protected final void shareMedia() {
+        final ViewPager viewPager = findViewPager();
+        final PagerAdapter adapter = viewPager.getAdapter();
+        final Object object = adapter.instantiateItem(viewPager, viewPager.getCurrentItem());
+        if (!(object instanceof CacheDownloadMediaViewerFragment)) return;
+        CacheDownloadLoader.Result result = ((CacheDownloadMediaViewerFragment) object).getDownloadResult();
+        if (result == null || result.cacheUri == null) {
+            // TODO show error
+            return;
+        }
+        final File destination = new File(getCacheDir(), "shared_files");
+        final SaveFileTask task = new SaveFileTask(this, result.cacheUri, destination,
+                new CacheProvider.CacheFileTypeCallback(this)) {
+            private static final String PROGRESS_FRAGMENT_TAG = "progress";
+
+            protected void dismissProgress() {
+                final IExtendedActivity activity = (IExtendedActivity) getContext();
+                if (activity == null) return;
+                activity.executeAfterFragmentResumed(new IExtendedActivity.Action() {
+                    @Override
+                    public void execute(IExtendedActivity activity) {
+                        final FragmentManager fm = ((Activity) activity).getFragmentManager();
+                        final DialogFragment fragment = (DialogFragment) fm.findFragmentByTag(PROGRESS_FRAGMENT_TAG);
+                        if (fragment != null) {
+                            fragment.dismiss();
+                        }
+                    }
+                });
+            }
+
+            protected void showProgress() {
+                final IExtendedActivity activity = (IExtendedActivity) getContext();
+                if (activity == null) return;
+                activity.executeAfterFragmentResumed(new IExtendedActivity.Action() {
+                    @Override
+                    public void execute(IExtendedActivity activity) {
+                        final DialogFragment fragment = new ProgressDialogFragment();
+                        fragment.setCancelable(false);
+                        fragment.show(((Activity) activity).getFragmentManager(), PROGRESS_FRAGMENT_TAG);
+                    }
+                });
+            }
+
+            protected void onFileSaved(File savedFile, String mimeType) {
+                final MediaViewerActivity activity = (MediaViewerActivity) getContext();
+                if (activity == null) return;
+
+                activity.mShareFile = savedFile;
+                final Uri fileUri = FileProvider.getUriForFile(activity, AUTHORITY_TWIDERE_FILE,
+                        savedFile);
+
+                final Intent intent = new Intent(Intent.ACTION_SEND);
+                intent.setDataAndType(fileUri, mimeType);
+                intent.putExtra(Intent.EXTRA_STREAM, fileUri);
+                intent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
+                activity.processShareIntent(intent);
+                startActivityForResult(Intent.createChooser(intent, activity.getString(R.string.share)),
+                        REQUEST_SHARE_MEDIA);
+            }
+
+        };
+        task.execute();
+    }
+
+    protected final void requestAndSaveToStorage(int position) {
+        mSaveToStoragePosition = position;
+        if (PermissionUtils.hasPermission(this, Manifest.permission.WRITE_EXTERNAL_STORAGE)) {
+            saveToStorage();
+        } else {
+            final String[] permissions;
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) {
+                permissions = new String[]{Manifest.permission.WRITE_EXTERNAL_STORAGE,
+                        Manifest.permission.READ_EXTERNAL_STORAGE};
+            } else {
+                permissions = new String[]{Manifest.permission.WRITE_EXTERNAL_STORAGE};
+            }
+            ActivityCompat.requestPermissions(this, permissions, REQUEST_REQUEST_PERMISSIONS);
         }
     }
 
-    public static class VideoPageFragment extends CacheDownloadMediaViewerFragment
-            implements MediaPlayer.OnPreparedListener, MediaPlayer.OnErrorListener,
-            MediaPlayer.OnCompletionListener, View.OnClickListener {
 
-        private static final String EXTRA_LOOP = "loop";
+    protected final void saveToStorage() {
-
+        if (mSaveToStoragePosition == -1) return;
-        @Override
+        final ViewPager viewPager = findViewPager();
-        protected Object getDownloadExtra() {
+        final PagerAdapter adapter = viewPager.getAdapter();
-            return null;
+        final Object object = adapter.instantiateItem(viewPager, mSaveToStoragePosition);
-        }
+        if (!(object instanceof CacheDownloadMediaViewerFragment)) return;
-
+        final CacheDownloadMediaViewerFragment f = (CacheDownloadMediaViewerFragment) object;
-
+        final CacheDownloadLoader.Result result = f.getDownloadResult();
-        private static final String[] SUPPORTED_VIDEO_TYPES;
+        if (result == null) return;
-
+        if (mSaveFileTask != null && mSaveFileTask.getStatus() == AsyncTask.Status.RUNNING) return;
-        static {
+        final Uri cacheUri = result.cacheUri;
-            if (Build.VERSION.SDK_INT < Build.VERSION_CODES.ICE_CREAM_SANDWICH) {
+        final boolean hasImage = cacheUri != null;
-                SUPPORTED_VIDEO_TYPES = new String[]{"video/mp4"};
+        if (!hasImage) return;
-            } else {
+        mSaveFileTask = SaveImageToGalleryTask.create(this, cacheUri);
-                SUPPORTED_VIDEO_TYPES = new String[]{"video/webm", "video/mp4"};
+        AsyncTaskUtils.executeTask(mSaveFileTask);
-            }
-        }
-
-        private TextureVideoView mVideoView;
-        private View mVideoViewOverlay;
-        private ProgressBar mVideoViewProgress;
-        private TextView mDurationLabel, mPositionLabel;
-        private ImageButton mPlayPauseButton, mVolumeButton;
-        private View mVideoControl;
-
-        private boolean mPlayAudio;
-        private VideoPlayProgressRunnable mVideoProgressRunnable;
-        private MediaPlayer mMediaPlayer;
-        private int mMediaPlayerError;
-
-        public boolean isLoopEnabled() {
-            return getArguments().getBoolean(EXTRA_LOOP, false);
-        }
-
-
-        @Override
-        protected boolean isAbleToLoad() {
-            return getDownloadUri() != null;
-        }
-
-        @Override
-        protected Uri getDownloadUri() {
-            final Pair<String, String> bestVideoUrlAndType = getBestVideoUrlAndType(getMedia());
-            if (bestVideoUrlAndType == null || bestVideoUrlAndType.first == null) return null;
-            return Uri.parse(bestVideoUrlAndType.first);
-        }
-
-        private ParcelableMedia getMedia() {
-            return getArguments().getParcelable(EXTRA_MEDIA);
-        }
-
-        @Override
-        protected void displayMedia(CacheDownloadLoader.Result result) {
-            mVideoView.setVideoURI(result.cacheUri);
-            setMediaViewVisible(true);
-        }
-
-        @Override
-        protected void recycleMedia() {
-
-        }
-
-        @Override
-        public void onStart() {
-            super.onStart();
-        }
-
-        @Override
-        public void onStop() {
-            super.onStop();
-        }
-
-        @Override
-        public void onCompletion(MediaPlayer mp) {
-            updatePlayerState();
-//            mVideoViewProgress.removeCallbacks(mVideoProgressRunnable);
-//            mVideoViewProgress.setVisibility(View.GONE);
-        }
-
-        @Override
-        public boolean onError(MediaPlayer mp, int what, int extra) {
-            mMediaPlayer = null;
-            mVideoViewProgress.removeCallbacks(mVideoProgressRunnable);
-            mVideoViewProgress.setVisibility(View.GONE);
-            mMediaPlayerError = what;
-            return true;
-        }
-
-        @Override
-        public void onPrepared(MediaPlayer mp) {
-            if (getUserVisibleHint()) {
-                mMediaPlayer = mp;
-                mMediaPlayerError = 0;
-                mp.setAudioStreamType(AudioManager.STREAM_MUSIC);
-                mp.setScreenOnWhilePlaying(true);
-                updateVolume();
-                mp.setLooping(isLoopEnabled());
-                mp.start();
-                mVideoViewProgress.setVisibility(View.VISIBLE);
-                mVideoViewProgress.post(mVideoProgressRunnable);
-                updatePlayerState();
-                mVideoControl.setVisibility(View.VISIBLE);
-            }
-        }
-
-        private void updateVolume() {
-            final ImageButton b = mVolumeButton;
-            if (b != null) {
-                b.setImageResource(mPlayAudio ? R.drawable.ic_action_speaker_max : R.drawable.ic_action_speaker_muted);
-            }
-            final MediaPlayer mp = mMediaPlayer;
-            if (mp == null) return;
-            if (mPlayAudio) {
-                mp.setVolume(1, 1);
-            } else {
-                mp.setVolume(0, 0);
-            }
-        }
-
-
-        @Override
-        public void onViewCreated(View view, Bundle savedInstanceState) {
-            super.onViewCreated(view, savedInstanceState);
-            mVideoView = (TextureVideoView) view.findViewById(R.id.video_view);
-            mVideoViewOverlay = view.findViewById(R.id.video_view_overlay);
-            mVideoViewProgress = (ProgressBar) view.findViewById(R.id.video_view_progress);
-            mDurationLabel = (TextView) view.findViewById(R.id.duration_label);
-            mPositionLabel = (TextView) view.findViewById(R.id.position_label);
-            mPlayPauseButton = (ImageButton) view.findViewById(R.id.play_pause_button);
-            mVolumeButton = (ImageButton) view.findViewById(R.id.volume_button);
-            mVideoControl = view.findViewById(R.id.video_control);
-
-            final ProgressWheel progressWheel = (ProgressWheel) view.findViewById(org.mariotaku.mediaviewer.library.R.id.load_progress);
-            progressWheel.setBarColor(ThemeUtils.getUserAccentColor(getContext()));
-        }
-
-
-        @Override
-        public void setUserVisibleHint(boolean isVisibleToUser) {
-            super.setUserVisibleHint(isVisibleToUser);
-            if (!isVisibleToUser && mVideoView != null && mVideoView.isPlaying()) {
-                mVideoView.pause();
-                updatePlayerState();
-            }
-        }
-
-        @Override
-        public void onActivityCreated(@Nullable Bundle savedInstanceState) {
-            super.onActivityCreated(savedInstanceState);
-            setHasOptionsMenu(true);
-
-            Handler handler = mVideoViewProgress.getHandler();
-            if (handler == null) {
-                handler = new Handler(getActivity().getMainLooper());
-            }
-            mVideoProgressRunnable = new VideoPlayProgressRunnable(handler, mVideoViewProgress,
-                    mDurationLabel, mPositionLabel, mVideoView);
-
-
-            mVideoViewOverlay.setOnClickListener(this);
-            mVideoView.setOnPreparedListener(this);
-            mVideoView.setOnErrorListener(this);
-            mVideoView.setOnCompletionListener(this);
-
-            mPlayPauseButton.setOnClickListener(this);
-            mVolumeButton.setOnClickListener(this);
-            startLoading();
-            setMediaViewVisible(false);
-            updateVolume();
-        }
-
-        private Pair<String, String> getBestVideoUrlAndType(ParcelableMedia media) {
-            if (media == null) return null;
-            switch (media.type) {
-                case ParcelableMedia.Type.TYPE_VIDEO:
-                case ParcelableMedia.Type.TYPE_ANIMATED_GIF: {
-                    if (media.video_info == null) {
-                        return Pair.create(media.media_url, null);
-                    }
-                    for (String supportedType : SUPPORTED_VIDEO_TYPES) {
-                        for (ParcelableMedia.VideoInfo.Variant variant : media.video_info.variants) {
-                            if (supportedType.equalsIgnoreCase(variant.content_type))
-                                return Pair.create(variant.url, variant.content_type);
-                        }
-                    }
-                    return null;
-                }
-                case ParcelableMedia.Type.TYPE_CARD_ANIMATED_GIF: {
-                    return Pair.create(media.media_url, "video/mp4");
-                }
-                default: {
-                    return null;
-                }
-            }
-        }
-
-
-        @Override
-        public void onClick(View v) {
-            switch (v.getId()) {
-                case R.id.volume_button: {
-                    mPlayAudio = !mPlayAudio;
-                    updateVolume();
-                    break;
-                }
-                case R.id.play_pause_button: {
-                    final MediaPlayer mp = mMediaPlayer;
-                    if (mp != null) {
-                        if (mp.isPlaying()) {
-                            mp.pause();
-                        } else {
-                            mp.start();
-                        }
-                    }
-                    updatePlayerState();
-                    break;
-                }
-                case R.id.video_view_overlay: {
-                    if (mVideoControl.getVisibility() == View.VISIBLE) {
-                        mVideoControl.setVisibility(View.GONE);
-                    } else {
-                        mVideoControl.setVisibility(View.VISIBLE);
-                    }
-                    break;
-                }
-            }
-        }
-
-        private void updatePlayerState() {
-            final MediaPlayer mp = mMediaPlayer;
-            if (mp != null) {
-                final boolean playing = mp.isPlaying();
-                mPlayPauseButton.setContentDescription(getString(playing ? R.string.pause : R.string.play));
-                mPlayPauseButton.setImageResource(playing ? R.drawable.ic_action_pause : R.drawable.ic_action_play_arrow);
-            } else {
-                mPlayPauseButton.setContentDescription(getString(R.string.play));
-                mPlayPauseButton.setImageResource(R.drawable.ic_action_play_arrow);
-            }
-        }
-
-        @Override
-        public View onCreateMediaView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
-            return inflater.inflate(R.layout.layout_media_viewer_texture_video_view, container, false);
-        }
-
-        private static class VideoPlayProgressRunnable implements Runnable {
-
-            private final Handler mHandler;
-            private final ProgressBar mProgressBar;
-            private final TextView mDurationLabel, mPositionLabel;
-            private final MediaController.MediaPlayerControl mMediaPlayerControl;
-
-            VideoPlayProgressRunnable(Handler handler, ProgressBar progressBar, TextView durationLabel,
-                                      TextView positionLabel, MediaController.MediaPlayerControl mediaPlayerControl) {
-                mHandler = handler;
-                mProgressBar = progressBar;
-                mDurationLabel = durationLabel;
-                mPositionLabel = positionLabel;
-                mMediaPlayerControl = mediaPlayerControl;
-                mProgressBar.setMax(1000);
-            }
-
-            @Override
-            public void run() {
-                final int duration = mMediaPlayerControl.getDuration();
-                final int position = mMediaPlayerControl.getCurrentPosition();
-                if (duration <= 0 || position < 0) return;
-                mProgressBar.setProgress(Math.round(1000 * position / (float) duration));
-                final long durationSecs = TimeUnit.SECONDS.convert(duration, TimeUnit.MILLISECONDS),
-                        positionSecs = TimeUnit.SECONDS.convert(position, TimeUnit.MILLISECONDS);
-                mDurationLabel.setText(String.format("%02d:%02d", durationSecs / 60, durationSecs % 60));
-                mPositionLabel.setText(String.format("%02d:%02d", positionSecs / 60, positionSecs % 60));
-                mHandler.postDelayed(this, 16);
-            }
-        }
     }
 
-    private AppCompatDelegate mDelegate;
 
     @Override
     protected void onPostCreate(@Nullable Bundle savedInstanceState) {
@@ -826,6 +776,345 @@ public final class MediaViewerActivity extends AbsMediaViewerActivity implements
         return mDelegate;
     }
 
+
+    public static class ImagePageFragment extends SubsampleImageViewerFragment {
+        @Override
+        protected Object getDownloadExtra() {
+            return ((MediaViewerActivity) getActivity()).getDownloadExtra();
+        }
+
+        @Override
+        public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
+            super.onViewCreated(view, savedInstanceState);
+            final ProgressWheel progressWheel = (ProgressWheel) view.findViewById(org.mariotaku.mediaviewer.library.R.id.load_progress);
+            progressWheel.setBarColor(ThemeUtils.getUserAccentColor(getContext()));
+        }
+
+        @Override
+        public void setUserVisibleHint(boolean isVisibleToUser) {
+            super.setUserVisibleHint(isVisibleToUser);
+            if (isVisibleToUser) {
+                getActivity().supportInvalidateOptionsMenu();
+            }
+        }
+
+        @Override
+        protected void displayMedia(CacheDownloadLoader.Result data) {
+            super.displayMedia(data);
+            getActivity().supportInvalidateOptionsMenu();
+        }
+
+        @Override
+        protected void hideProgress() {
+            super.hideProgress();
+            getActivity().supportInvalidateOptionsMenu();
+        }
+
+        @Override
+        protected void showProgress(boolean indeterminate, float progress) {
+            super.showProgress(indeterminate, progress);
+            getActivity().supportInvalidateOptionsMenu();
+        }
+    }
+
+    public static class VideoPageFragment extends CacheDownloadMediaViewerFragment
+            implements MediaPlayer.OnPreparedListener, MediaPlayer.OnErrorListener,
+            MediaPlayer.OnCompletionListener, View.OnClickListener {
+
+        private static final String EXTRA_LOOP = "loop";
+        private static final String[] SUPPORTED_VIDEO_TYPES;
+
+        static {
+            if (Build.VERSION.SDK_INT < Build.VERSION_CODES.ICE_CREAM_SANDWICH) {
+                SUPPORTED_VIDEO_TYPES = new String[]{"video/mp4"};
+            } else {
+                SUPPORTED_VIDEO_TYPES = new String[]{"video/webm", "video/mp4"};
+            }
+        }
+
+        private TextureVideoView mVideoView;
+        private View mVideoViewOverlay;
+        private ProgressBar mVideoViewProgress;
+        private TextView mDurationLabel, mPositionLabel;
+        private ImageButton mPlayPauseButton, mVolumeButton;
+        private View mVideoControl;
+        private boolean mPlayAudio;
+        private VideoPlayProgressRunnable mVideoProgressRunnable;
+        private MediaPlayer mMediaPlayer;
+        private int mMediaPlayerError;
+
+        @Override
+        protected Object getDownloadExtra() {
+            return null;
+        }
+
+        public boolean isLoopEnabled() {
+            return getArguments().getBoolean(EXTRA_LOOP, false);
+        }
+
+        @Override
+        protected void hideProgress() {
+            super.hideProgress();
+            getActivity().supportInvalidateOptionsMenu();
+        }
+
+        @Override
+        protected void showProgress(boolean indeterminate, float progress) {
+            super.showProgress(indeterminate, progress);
+            getActivity().supportInvalidateOptionsMenu();
+        }
+
+        @Override
+        protected void setMediaViewVisible(boolean visible) {
+            super.setMediaViewVisible(visible);
+            getActivity().supportInvalidateOptionsMenu();
+        }
+
+        @Override
+        protected boolean isAbleToLoad() {
+            return getDownloadUri() != null;
+        }
+
+        @Nullable
+        @Override
+        protected Uri getDownloadUri() {
+            final Pair<String, String> bestVideoUrlAndType = getBestVideoUrlAndType(getMedia());
+            if (bestVideoUrlAndType == null || bestVideoUrlAndType.first == null) return null;
+            return Uri.parse(bestVideoUrlAndType.first);
+        }
+
+        private ParcelableMedia getMedia() {
+            return getArguments().getParcelable(EXTRA_MEDIA);
+        }
+
+        @Override
+        protected void displayMedia(CacheDownloadLoader.Result result) {
+            mVideoView.setVideoURI(result.cacheUri);
+            setMediaViewVisible(true);
+        }
+
+        @Override
+        protected void recycleMedia() {
+
+        }
+
+        @Override
+        public void onStart() {
+            super.onStart();
+        }
+
+        @Override
+        public void onStop() {
+            super.onStop();
+        }
+
+        @Override
+        public void onCompletion(MediaPlayer mp) {
+            updatePlayerState();
+//            mVideoViewProgress.removeCallbacks(mVideoProgressRunnable);
+//            mVideoViewProgress.setVisibility(View.GONE);
+        }
+
+        @Override
+        public boolean onError(MediaPlayer mp, int what, int extra) {
+            mMediaPlayer = null;
+            mVideoViewProgress.removeCallbacks(mVideoProgressRunnable);
+            mVideoViewProgress.setVisibility(View.GONE);
+            mMediaPlayerError = what;
+            return true;
+        }
+
+        @Override
+        public void onPrepared(MediaPlayer mp) {
+            if (getUserVisibleHint()) {
+                mMediaPlayer = mp;
+                mMediaPlayerError = 0;
+                mp.setAudioStreamType(AudioManager.STREAM_MUSIC);
+                mp.setScreenOnWhilePlaying(true);
+                updateVolume();
+                mp.setLooping(isLoopEnabled());
+                mp.start();
+                mVideoViewProgress.setVisibility(View.VISIBLE);
+                mVideoViewProgress.post(mVideoProgressRunnable);
+                updatePlayerState();
+                mVideoControl.setVisibility(View.VISIBLE);
+            }
+        }
+
+        private void updateVolume() {
+            final ImageButton b = mVolumeButton;
+            if (b != null) {
+                b.setImageResource(mPlayAudio ? R.drawable.ic_action_speaker_max : R.drawable.ic_action_speaker_muted);
+            }
+            final MediaPlayer mp = mMediaPlayer;
+            if (mp == null) return;
+            if (mPlayAudio) {
+                mp.setVolume(1, 1);
+            } else {
+                mp.setVolume(0, 0);
+            }
+        }
+
+
+        @Override
+        public void onViewCreated(View view, Bundle savedInstanceState) {
+            super.onViewCreated(view, savedInstanceState);
+            mVideoView = (TextureVideoView) view.findViewById(R.id.video_view);
+            mVideoViewOverlay = view.findViewById(R.id.video_view_overlay);
+            mVideoViewProgress = (ProgressBar) view.findViewById(R.id.video_view_progress);
+            mDurationLabel = (TextView) view.findViewById(R.id.duration_label);
+            mPositionLabel = (TextView) view.findViewById(R.id.position_label);
+            mPlayPauseButton = (ImageButton) view.findViewById(R.id.play_pause_button);
+            mVolumeButton = (ImageButton) view.findViewById(R.id.volume_button);
+            mVideoControl = view.findViewById(R.id.video_control);
+
+            final ProgressWheel progressWheel = (ProgressWheel) view.findViewById(org.mariotaku.mediaviewer.library.R.id.load_progress);
+            progressWheel.setBarColor(ThemeUtils.getUserAccentColor(getContext()));
+        }
+
+
+        @Override
+        public void setUserVisibleHint(boolean isVisibleToUser) {
+            super.setUserVisibleHint(isVisibleToUser);
+            if (isVisibleToUser) {
+                getActivity().supportInvalidateOptionsMenu();
+            } else if (mVideoView != null && mVideoView.isPlaying()) {
+                mVideoView.pause();
+                updatePlayerState();
+            }
+        }
+
+        @Override
+        public void onActivityCreated(@Nullable Bundle savedInstanceState) {
+            super.onActivityCreated(savedInstanceState);
+            setHasOptionsMenu(true);
+
+            Handler handler = mVideoViewProgress.getHandler();
+            if (handler == null) {
+                handler = new Handler(getActivity().getMainLooper());
+            }
+            mVideoProgressRunnable = new VideoPlayProgressRunnable(handler, mVideoViewProgress,
+                    mDurationLabel, mPositionLabel, mVideoView);
+
+
+            mVideoViewOverlay.setOnClickListener(this);
+            mVideoView.setOnPreparedListener(this);
+            mVideoView.setOnErrorListener(this);
+            mVideoView.setOnCompletionListener(this);
+
+            mPlayPauseButton.setOnClickListener(this);
+            mVolumeButton.setOnClickListener(this);
+            startLoading(false);
+            setMediaViewVisible(false);
+            updateVolume();
+        }
+
+        private Pair<String, String> getBestVideoUrlAndType(ParcelableMedia media) {
+            if (media == null) return null;
+            switch (media.type) {
+                case ParcelableMedia.Type.TYPE_VIDEO:
+                case ParcelableMedia.Type.TYPE_ANIMATED_GIF: {
+                    if (media.video_info == null) {
+                        return Pair.create(media.media_url, null);
+                    }
+                    for (String supportedType : SUPPORTED_VIDEO_TYPES) {
+                        for (ParcelableMedia.VideoInfo.Variant variant : media.video_info.variants) {
+                            if (supportedType.equalsIgnoreCase(variant.content_type))
+                                return Pair.create(variant.url, variant.content_type);
+                        }
+                    }
+                    return null;
+                }
+                case ParcelableMedia.Type.TYPE_CARD_ANIMATED_GIF: {
+                    return Pair.create(media.media_url, "video/mp4");
+                }
+                default: {
+                    return null;
+                }
+            }
+        }
+
+
+        @Override
+        public void onClick(View v) {
+            switch (v.getId()) {
+                case R.id.volume_button: {
+                    mPlayAudio = !mPlayAudio;
+                    updateVolume();
+                    break;
+                }
+                case R.id.play_pause_button: {
+                    final MediaPlayer mp = mMediaPlayer;
+                    if (mp != null) {
+                        if (mp.isPlaying()) {
+                            mp.pause();
+                        } else {
+                            mp.start();
+                        }
+                    }
+                    updatePlayerState();
+                    break;
+                }
+                case R.id.video_view_overlay: {
+                    if (mVideoControl.getVisibility() == View.VISIBLE) {
+                        mVideoControl.setVisibility(View.GONE);
+                    } else {
+                        mVideoControl.setVisibility(View.VISIBLE);
+                    }
+                    break;
+                }
+            }
+        }
+
+        private void updatePlayerState() {
+            final MediaPlayer mp = mMediaPlayer;
+            if (mp != null) {
+                final boolean playing = mp.isPlaying();
+                mPlayPauseButton.setContentDescription(getString(playing ? R.string.pause : R.string.play));
+                mPlayPauseButton.setImageResource(playing ? R.drawable.ic_action_pause : R.drawable.ic_action_play_arrow);
+            } else {
+                mPlayPauseButton.setContentDescription(getString(R.string.play));
+                mPlayPauseButton.setImageResource(R.drawable.ic_action_play_arrow);
+            }
+        }
+
+        @Override
+        public View onCreateMediaView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+            return inflater.inflate(R.layout.layout_media_viewer_texture_video_view, container, false);
+        }
+
+        private static class VideoPlayProgressRunnable implements Runnable {
+
+            private final Handler mHandler;
+            private final ProgressBar mProgressBar;
+            private final TextView mDurationLabel, mPositionLabel;
+            private final MediaController.MediaPlayerControl mMediaPlayerControl;
+
+            VideoPlayProgressRunnable(Handler handler, ProgressBar progressBar, TextView durationLabel,
+                                      TextView positionLabel, MediaController.MediaPlayerControl mediaPlayerControl) {
+                mHandler = handler;
+                mProgressBar = progressBar;
+                mDurationLabel = durationLabel;
+                mPositionLabel = positionLabel;
+                mMediaPlayerControl = mediaPlayerControl;
+                mProgressBar.setMax(1000);
+            }
+
+            @Override
+            public void run() {
+                final int duration = mMediaPlayerControl.getDuration();
+                final int position = mMediaPlayerControl.getCurrentPosition();
+                if (duration <= 0 || position < 0) return;
+                mProgressBar.setProgress(Math.round(1000 * position / (float) duration));
+                final long durationSecs = TimeUnit.SECONDS.convert(duration, TimeUnit.MILLISECONDS),
+                        positionSecs = TimeUnit.SECONDS.convert(position, TimeUnit.MILLISECONDS);
+                mDurationLabel.setText(String.format("%02d:%02d", durationSecs / 60, durationSecs % 60));
+                mPositionLabel.setText(String.format("%02d:%02d", positionSecs / 60, positionSecs % 60));
+                mHandler.postDelayed(this, 16);
+            }
+        }
+    }
+
     public static class ExternalBrowserPageFragment extends MediaViewerFragment {
         private WebView mWebView;
 
@@ -875,6 +1164,13 @@ public final class MediaViewerActivity extends AbsMediaViewerActivity implements
         protected void recycleMedia() {
 
         }
-    }
 
+        @Override
+        public void setUserVisibleHint(boolean isVisibleToUser) {
+            super.setUserVisibleHint(isVisibleToUser);
+            if (isVisibleToUser) {
+                getActivity().supportInvalidateOptionsMenu();
+            }
+        }
+    }
 }

twidere/src/main/java/org/mariotaku/twidere/util/UnitConvertUtils.java

@@ -0,0 +1,39 @@
+package org.mariotaku.twidere.util;
+
+/**
+ * Created by mariotaku on 16/2/4.
+ */
+public class UnitConvertUtils {
+
+    public static final String[] fileSizeUnits = {"bytes", "KB", "MB", "GB", "TB", "PB", "EB", "ZB",
+            "YB"};
+
+    public static final String[] countUnits = {null, "K", "M", "B"};
+
+    public static String calculateProperSize(double bytes) {
+        double value = bytes;
+        int index;
+        for (index = 0; index < fileSizeUnits.length; index++) {
+            if (value < 1024) {
+                break;
+            }
+            value = value / 1024;
+        }
+        return String.format("%.2f %s", value, fileSizeUnits[index]);
+    }
+
+    public static String calculateProperCount(long count) {
+        if (count < 1000) {
+            return String.valueOf(count);
+        }
+        double value = count;
+        int index;
+        for (index = 0; index < countUnits.length; index++) {
+            if (value < 1000) {
+                break;
+            }
+            value = value / 1000.0;
+        }
+        return String.format("%.2f %s", value, countUnits[index]);
+    }
+}

twidere/src/main/java/org/mariotaku/twidere/util/Utils.java

@@ -197,7 +197,6 @@ import org.mariotaku.twidere.provider.TwidereDataStore.CachedStatuses;
 import org.mariotaku.twidere.provider.TwidereDataStore.CachedUsers;
 import org.mariotaku.twidere.provider.TwidereDataStore.DirectMessages;
 import org.mariotaku.twidere.provider.TwidereDataStore.DirectMessages.ConversationEntries;
-import org.mariotaku.twidere.provider.TwidereDataStore.Filters.Users;
 import org.mariotaku.twidere.provider.TwidereDataStore.Statuses;
 import org.mariotaku.twidere.service.RefreshService;
 import org.mariotaku.twidere.util.TwidereLinkify.HighlightStyle;
@@ -3149,17 +3148,4 @@ public final class Utils implements Constants {
         return location;
     }
 
-    public static final String[] fileSizeUnits = {"bytes", "KB", "MB", "GB", "TB", "PB", "EB", "ZB", "YB"};
-
-    public static String calculateProperSize(double bytes) {
-        double value = bytes;
-        int index;
-        for (index = 0; index < fileSizeUnits.length; index++) {
-            if (value < 1024) {
-                break;
-            }
-            value = value / 1024;
-        }
-        return String.format("%.2f %s", value, fileSizeUnits[index]);
-    }
 }

twidere/src/main/java/org/mariotaku/twidere/util/net/TwidereDns.java

@@ -195,14 +195,13 @@ public class TwidereDns implements Constants, Dns {
     private InetAddress[] fromResolver(String originalHost, String host, int depth) throws IOException {
         final Resolver dns = getResolver();
         final Lookup lookup = new Lookup(new Name(host), Type.A, DClass.IN);
-        final Record[] records;
         lookup.setResolver(dns);
         lookup.run();
         final int result = lookup.getResult();
         if (result != Lookup.SUCCESSFUL) {
             throw new UnknownHostException("Unable to resolve " + host + ", " + lookup.getErrorString());
         }
-        records = lookup.getAnswers();
+        final Record[] records = lookup.getAnswers();
         final ArrayList<InetAddress> resolvedAddresses = new ArrayList<>();
         // Test each IP address resolved.
         long ttl = -1;

twidere/src/main/java/org/mariotaku/twidere/view/holder/StatusViewHolder.java

@@ -27,6 +27,7 @@ import org.mariotaku.twidere.util.HtmlSpanBuilder;
 import org.mariotaku.twidere.util.MediaLoaderWrapper;
 import org.mariotaku.twidere.util.TwidereLinkify;
 import org.mariotaku.twidere.util.TwitterCardUtils;
+import org.mariotaku.twidere.util.UnitConvertUtils;
 import org.mariotaku.twidere.util.UserColorNameManager;
 import org.mariotaku.twidere.util.Utils;
 import org.mariotaku.twidere.view.ActionIconThemedTextView;
@@ -38,7 +39,6 @@ import org.mariotaku.twidere.view.holder.iface.IStatusViewHolder;
 import org.mariotaku.twidere.view.iface.IColorLabelView;
 
 import java.lang.ref.WeakReference;
-import java.util.Locale;
 
 import static org.mariotaku.twidere.util.HtmlEscapeHelper.toPlainText;
 import static org.mariotaku.twidere.util.Utils.getUserTypeIconRes;
@@ -152,9 +152,9 @@ public class StatusViewHolder extends ViewHolder implements Constants, IStatusVi
         final Context context = adapter.getContext();
         final boolean nameFirst = adapter.isNameFirst();
 
-        final long reply_count = status.reply_count;
+        final long replyCount = status.reply_count;
         final long retweetCount;
-        final long favorite_count;
+        final long favoriteCount;
 
         if (TwitterCardUtils.isPoll(status)) {
             statusInfoLabel.setText(R.string.label_poll);
@@ -285,9 +285,8 @@ public class StatusViewHolder extends ViewHolder implements Constants, IStatusVi
                     status.is_possibly_sensitive, adapter.getLinkHighlightingStyle()));
         }
 
-        final Locale locale = Locale.getDefault();
+        if (replyCount > 0) {
-        if (reply_count > 0) {
+            replyCountView.setText(UnitConvertUtils.calculateProperCount(replyCount));
-            replyCountView.setText(Utils.getLocalizedNumber(locale, reply_count));
         } else {
             replyCountView.setText(null);
         }
@@ -302,20 +301,20 @@ public class StatusViewHolder extends ViewHolder implements Constants, IStatusVi
             retweetCount = status.retweet_count + (creatingRetweet ? 1 : 0);
         }
         if (retweetCount > 0) {
-            retweetCountView.setText(Utils.getLocalizedNumber(locale, retweetCount));
+            retweetCountView.setText(UnitConvertUtils.calculateProperCount(retweetCount));
         } else {
             retweetCountView.setText(null);
         }
         if (twitter.isDestroyingFavorite(status.account_id, status.id)) {
             favoriteCountView.setActivated(false);
-            favorite_count = Math.max(0, status.favorite_count - 1);
+            favoriteCount = Math.max(0, status.favorite_count - 1);
         } else {
             final boolean creatingFavorite = twitter.isCreatingFavorite(status.account_id, status.id);
             favoriteCountView.setActivated(creatingFavorite || status.is_favorite);
-            favorite_count = status.favorite_count + (creatingFavorite ? 1 : 0);
+            favoriteCount = status.favorite_count + (creatingFavorite ? 1 : 0);
         }
-        if (favorite_count > 0) {
+        if (favoriteCount > 0) {
-            favoriteCountView.setText(Utils.getLocalizedNumber(locale, favorite_count));
+            favoriteCountView.setText(UnitConvertUtils.calculateProperCount(favoriteCount));
         } else {
             favoriteCountView.setText(null);
         }

twidere/src/main/res/menu/menu_media_viewer_video_page.xml

@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-  ~ Twidere - Twitter client for Android
-  ~
-  ~  Copyright (C) 2012-2015 Mariotaku Lee <mariotaku.lee@gmail.com>
-  ~
-  ~  This program is free software: you can redistribute it and/or modify
-  ~  it under the terms of the GNU General Public License as published by
-  ~  the Free Software Foundation, either version 3 of the License, or
-  ~  (at your option) any later version.
-  ~
-  ~  This program is distributed in the hope that it will be useful,
-  ~  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~  GNU General Public License for more details.
-  ~
-  ~  You should have received a copy of the GNU General Public License
-  ~  along with this program.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-
-<menu xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
-    <item
-        android:id="@id/refresh"
-        android:icon="@drawable/ic_action_refresh"
-        android:title="@string/refresh"
-        app:showAsAction="ifRoom" />
-    <item
-        android:id="@id/share"
-        android:icon="@drawable/ic_action_share"
-        android:title="@string/share"
-        app:showAsAction="ifRoom" />
-    <item
-        android:id="@id/save"
-        android:icon="@drawable/ic_action_save"
-        android:title="@string/save_to_gallery" />
-</menu>