Karl/BobStore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove highlight from snapped screenshot #1068

Browse Source
This commit is contained in:
Christine Emrich 2017-08-27 17:24:53 +02:00
parent 9be13fd2ab
commit e9cdc5e952
3 changed files with 2 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/src/main/java/org/fdroid/fdroid/views/AppDetailsRecyclerViewAdapter.java
View File

@ -582,7 +582,6 @@ public class AppDetailsRecyclerViewAdapter
snapHelper.attachToRecyclerView(null);
}
snapHelper = new LinearLayoutManagerSnapHelper(lm);
snapHelper.setLinearSnapHelperListener(adapter);
snapHelper.attachToRecyclerView(recyclerView);
}
}

43
app/src/main/java/org/fdroid/fdroid/views/ScreenShotsRecyclerViewAdapter.java
View File

@ -1,9 +1,7 @@
package org.fdroid.fdroid.views;
import android.content.Context;
import android.content.res.Resources;
import android.graphics.Bitmap;
import android.support.v4.view.ViewCompat;
import android.support.v7.widget.RecyclerView;
import android.view.LayoutInflater;
import android.view.View;
@ -17,22 +15,13 @@ import com.nostra13.universalimageloader.core.assist.ImageScaleType;
import org.fdroid.fdroid.R;
import org.fdroid.fdroid.data.App;
public class ScreenShotsRecyclerViewAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
implements LinearLayoutManagerSnapHelper.LinearSnapHelperListener {
class ScreenShotsRecyclerViewAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
private final String[] screenshots;
private final DisplayImageOptions displayImageOptions;
private View selectedView;
private int selectedPosition;
private final int selectedItemElevation;
private final int unselectedItemMargin;
public ScreenShotsRecyclerViewAdapter(Context context, App app) {
ScreenShotsRecyclerViewAdapter(Context context, App app) {
super();
screenshots = app.getAllScreenshots(context);
selectedPosition = 0;
Resources r = context.getResources();
selectedItemElevation = r.getDimensionPixelSize(R.dimen.details_screenshot_selected_elevation);
unselectedItemMargin = r.getDimensionPixelSize(R.dimen.details_screenshot_margin);
displayImageOptions = new DisplayImageOptions.Builder()
.cacheInMemory(true)
.cacheOnDisk(true)
@ -46,10 +35,6 @@ public class ScreenShotsRecyclerViewAdapter extends RecyclerView.Adapter<Recycle
@Override
public void onBindViewHolder(RecyclerView.ViewHolder holder, int position) {
ScreenShotViewHolder vh = (ScreenShotViewHolder) holder;
setViewSelected(vh.itemView, position == selectedPosition);
if (position == selectedPosition) {
this.selectedView = vh.itemView;
}
ImageLoader.getInstance().displayImage(screenshots[position],
vh.image, displayImageOptions);
}
@ -66,30 +51,6 @@ public class ScreenShotsRecyclerViewAdapter extends RecyclerView.Adapter<Recycle
return screenshots.length;
}
@Override
public void onSnappedToView(View view, int snappedPosition) {
// Deselect the previous selected view first
setViewSelected(selectedView, false);
// Change the selected view to the newly snapped-to view.
selectedView = view;
selectedPosition = snappedPosition;
setViewSelected(selectedView, true);
}
private void setViewSelected(View view, boolean selected) {
if (view != null) {
RecyclerView.LayoutParams lp = (RecyclerView.LayoutParams) view.getLayoutParams();
if (selected) {
lp.setMargins(0, selectedItemElevation, 0, selectedItemElevation);
} else {
lp.setMargins(0, unselectedItemMargin, 0, unselectedItemMargin);
}
ViewCompat.setElevation(view, selected ? selectedItemElevation : selectedItemElevation / 2);
view.setLayoutParams(lp);
}
}
private class ScreenShotViewHolder extends RecyclerView.ViewHolder {
final ImageView image;

4
app/src/main/res/values/dimens.xml
View File

@ -13,10 +13,6 @@
<dimen name="details_screenshot_height">200dp</dimen>
<dimen name="details_screenshot_width">200dp</dimen>
<!-- "Not selected" items are inset by this value, while the selected one is not -->
<dimen name="details_screenshot_margin">8dp</dimen>
<!-- The selected item stands out from the background by this elevation -->
<dimen name="details_screenshot_selected_elevation">3dp</dimen>
<dimen name="fab_margin">16dp</dimen>