Skip to content

Commit

Permalink
update ui
Browse files Browse the repository at this point in the history
  • Loading branch information
REBOOTERS authored and gejiaheng committed May 2, 2018
1 parent ae8785b commit 11e16d4
Show file tree
Hide file tree
Showing 13 changed files with 32 additions and 17 deletions.
29 changes: 18 additions & 11 deletions matisse/src/main/java/com/zhihu/matisse/ui/MatisseActivity.java
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
import android.view.MenuItem;
import android.view.View;
import android.widget.AdapterView;
import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.TextView;

Expand All @@ -50,7 +51,6 @@
import com.zhihu.matisse.internal.ui.adapter.AlbumMediaAdapter;
import com.zhihu.matisse.internal.ui.adapter.AlbumsAdapter;
import com.zhihu.matisse.internal.ui.widget.AlbumsSpinner;
import com.zhihu.matisse.internal.ui.widget.CheckView;
import com.zhihu.matisse.internal.ui.widget.IncapableDialog;
import com.zhihu.matisse.internal.utils.MediaStoreCompat;
import com.zhihu.matisse.internal.utils.PathUtils;
Expand Down Expand Up @@ -86,7 +86,7 @@ public class MatisseActivity extends AppCompatActivity implements
private View mEmptyView;

private LinearLayout mOriginalLayout;
private CheckView mOriginal;
private ImageView mOriginal;
private boolean mOriginalEnable;

@Override
Expand Down Expand Up @@ -257,7 +257,10 @@ private void updateBottomToolbar() {
private void updateOriginalState() {
int selectedCount = mSelectedCollection.count();
if (selectedCount == 0) {
mOriginal.setChecked(false);
// mOriginal.setChecked(false);
if(mSpec.themeId==R.style.Matisse_Zhihu){

}
mOriginalEnable = false;
} else if (countOverMaxSize() > 0) {

Expand All @@ -267,15 +270,9 @@ private void updateOriginalState() {
incapableDialog.show(getSupportFragmentManager(),
IncapableDialog.class.getName());

mOriginal.setChecked(false);
// mOriginal.setChecked(false);
mOriginalEnable = false;

}


} else {
// mOriginal.setChecked(true);
// mOriginalEnable = true;
}
}

Expand Down Expand Up @@ -319,7 +316,17 @@ public void onClick(View v) {
}

mOriginalEnable = !mOriginalEnable;
mOriginal.setChecked(mOriginalEnable);
// mOriginal.setChecked(mOriginalEnable);

if(mOriginalEnable){
if(mSpec.themeId==R.style.Matisse_Zhihu){
mOriginal.setImageResource(R.drawable.ic_imagepicker_radio_on);
}else {
mOriginal.setImageResource(R.drawable.ic_imagepicker_radio_on_night);
}
}else {
mOriginal.setImageResource(R.drawable.ic_preview_radio_off);
}
}
}

Expand Down
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
16 changes: 10 additions & 6 deletions matisse/src/main/res/layout/activity_matisse.xml
Original file line number Diff line number Diff line change
Expand Up @@ -67,28 +67,32 @@

<LinearLayout
android:id="@+id/originalLayout"
android:visibility="invisible"
android:visibility="visible"
android:orientation="horizontal"
android:layout_gravity="center"
android:layout_width="wrap_content"
android:layout_height="wrap_content">


<com.zhihu.matisse.internal.ui.widget.CheckView
<ImageView
android:visibility="visible"
android:id="@+id/original"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"/>
android:src="@drawable/ic_preview_radio_off"
android:layout_gravity="center_vertical"
android:layout_width="16dp"
android:layout_height="16dp" />

<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:enabled="true"
android:paddingStart="4dp"
android:paddingLeft="4dp"
android:foreground="?selectableItemBackground"
android:text="@string/button_original"
android:textColor="?attr/bottomToolbar.preview.textColor"
android:textSize="16sp" />
android:textSize="14sp" />

</LinearLayout>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,11 @@ public void onSelected(
.choose(MimeType.ofImage())
.theme(R.style.Matisse_Dracula)
.countable(false)
.addFilter(new GifSizeFilter(320, 320, 5 * Filter.K * Filter.K))

.maxSelectable(9)
.originalable(true)
.originalMaxSize(10)
.imageEngine(new PicassoEngine())
.forResult(REQUEST_CODE_CHOOSE);
break;
Expand Down

0 comments on commit 11e16d4

Please sign in to comment.