replace apply with sure content

leminhtuan2015 · May 2, 2018 · 94318f0 · 94318f0
1 parent 2ea929e
commit 94318f0
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 10 deletions.
diff --git a/matisse/src/main/java/com/zhihu/matisse/internal/ui/AlbumPreviewActivity.java b/matisse/src/main/java/com/zhihu/matisse/internal/ui/AlbumPreviewActivity.java
@@ -52,9 +52,6 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
             mCheckView.setChecked(mSelectedCollection.isSelected(item));
         }
         updateSize(item);
-
-        mOriginalEnable = getIntent().getBooleanExtra(EXTRA_RESULT_ORIGINAL_ENABLE, false);
-
     }
 
     @Override

diff --git a/matisse/src/main/java/com/zhihu/matisse/internal/ui/BasePreviewActivity.java b/matisse/src/main/java/com/zhihu/matisse/internal/ui/BasePreviewActivity.java
@@ -83,7 +83,6 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
         } else {
             mSelectedCollection.onCreate(savedInstanceState);
         }
-
         mOriginalEnable = getIntent().getBooleanExtra(EXTRA_RESULT_ORIGINAL_ENABLE, false);
         mButtonBack = (TextView) findViewById(R.id.button_back);
         mButtonApply = (TextView) findViewById(R.id.button_apply);
@@ -225,14 +224,14 @@ public void onPageScrollStateChanged(int state) {
     private void updateApplyButton() {
         int selectedCount = mSelectedCollection.count();
         if (selectedCount == 0) {
-            mButtonApply.setText(R.string.button_apply_default);
+            mButtonApply.setText(R.string.button_sure_default);
             mButtonApply.setEnabled(false);
         } else if (selectedCount == 1 && mSpec.singleSelectionModeEnabled()) {
-            mButtonApply.setText(R.string.button_apply_default);
+            mButtonApply.setText(R.string.button_sure_default);
             mButtonApply.setEnabled(true);
         } else {
             mButtonApply.setEnabled(true);
-            mButtonApply.setText(getString(R.string.button_apply, selectedCount));
+            mButtonApply.setText(getString(R.string.button_sure, selectedCount));
         }
 
         if (mSpec.originalable) {

diff --git a/matisse/src/main/java/com/zhihu/matisse/ui/MatisseActivity.java b/matisse/src/main/java/com/zhihu/matisse/ui/MatisseActivity.java
@@ -236,7 +236,7 @@ private void updateBottomToolbar() {
             mButtonApply.setText(getString(R.string.button_sure_default));
         } else if (selectedCount == 1 && mSpec.singleSelectionModeEnabled()) {
             mButtonPreview.setEnabled(true);
-            mButtonApply.setText(R.string.button_apply_default);
+            mButtonApply.setText(R.string.button_sure_default);
             mButtonApply.setEnabled(true);
         } else {
             mButtonPreview.setEnabled(true);

diff --git a/sample/src/main/java/com/zhihu/matisse/sample/SampleActivity.java b/sample/src/main/java/com/zhihu/matisse/sample/SampleActivity.java
@@ -17,7 +17,6 @@
 
 import android.Manifest;
 import android.content.Intent;
-import android.content.pm.ActivityInfo;
 import android.net.Uri;
 import android.os.Bundle;
 import android.support.annotation.NonNull;
@@ -89,7 +88,7 @@ public void onNext(Boolean aBoolean) {
                                             .addFilter(new GifSizeFilter(320, 320, 5 * Filter.K * Filter.K))
                                             .gridExpectedSize(
                                                     getResources().getDimensionPixelSize(R.dimen.grid_expected_size))
-                                            .restrictOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT)
+//                                            .restrictOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT)
                                             .thumbnailScale(0.85f)
                                             .imageEngine(new GlideEngine())
                                             .setOnSelectedListener(new OnSelectedListener() {