mnalis/apps-android-commons
1
0
Fork 0
mirror of https://github.com/commons-app/apps-android-commons.git synced 2025-10-27 04:43:54 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Regarding issue 4042: bordering (#4071)

Browse source
This commit is contained in:
Saral Verma 2020-12-13 00:27:06 +05:30 • committed by GitHub
parent 7d8e09f708
commit 0415a57d34
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 12 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

12
app/src/main/java/fr/free/nrw/commons/upload/ThumbnailsAdapter.java
View file

@ -1,5 +1,7 @@
package fr.free.nrw.commons.upload; package fr.free.nrw.commons.upload;
import android.content.Context;
import android.graphics.drawable.GradientDrawable;
import android.net.Uri; import android.net.Uri;
import android.os.Build.VERSION; import android.os.Build.VERSION;
import android.os.Build.VERSION_CODES; import android.os.Build.VERSION_CODES;
@ -27,7 +29,7 @@ import fr.free.nrw.commons.filepicker.UploadableFile;
* The adapter class for image thumbnails to be shown while uploading. * The adapter class for image thumbnails to be shown while uploading.
*/ */
class ThumbnailsAdapter extends RecyclerView.Adapter<ThumbnailsAdapter.ViewHolder> { class ThumbnailsAdapter extends RecyclerView.Adapter<ThumbnailsAdapter.ViewHolder> {
public static Context context;
List<UploadableFile> uploadableFiles; List<UploadableFile> uploadableFiles;
private Callback callback; private Callback callback;
@ -85,18 +87,22 @@ class ThumbnailsAdapter extends RecyclerView.Adapter<ThumbnailsAdapter.ViewHolde
UploadableFile uploadableFile = uploadableFiles.get(position); UploadableFile uploadableFile = uploadableFiles.get(position);
Uri uri = uploadableFile.getMediaUri(); Uri uri = uploadableFile.getMediaUri();
background.setImageURI(Uri.fromFile(new File(String.valueOf(uri)))); background.setImageURI(Uri.fromFile(new File(String.valueOf(uri))));
if (position == callback.getCurrentSelectedFilePosition()) { if (position == callback.getCurrentSelectedFilePosition()) {
GradientDrawable border = new GradientDrawable();
border.setShape(GradientDrawable.RECTANGLE);
border.setStroke(8, context.getResources().getColor(R.color.primaryColor));
rlContainer.setEnabled(true); rlContainer.setEnabled(true);
rlContainer.setClickable(true); rlContainer.setClickable(true);
rlContainer.setAlpha(1.0f); rlContainer.setAlpha(1.0f);
rlContainer.setBackground(border);
if (VERSION.SDK_INT >= VERSION_CODES.LOLLIPOP) { if (VERSION.SDK_INT >= VERSION_CODES.LOLLIPOP) {
rlContainer.setElevation(10); rlContainer.setElevation(10);
} }
} else { } else {
rlContainer.setEnabled(false); rlContainer.setEnabled(false);
rlContainer.setClickable(false); rlContainer.setClickable(false);
rlContainer.setAlpha(0.5f); rlContainer.setAlpha(0.7f);
rlContainer.setBackground(null);
if (VERSION.SDK_INT >= VERSION_CODES.LOLLIPOP) { if (VERSION.SDK_INT >= VERSION_CODES.LOLLIPOP) {
rlContainer.setElevation(0); rlContainer.setElevation(0);
} }

1
app/src/main/java/fr/free/nrw/commons/upload/UploadActivity.java
View file

@ -290,6 +290,7 @@ public class UploadActivity extends BaseActivity implements UploadContract.View,
} }
private void receiveSharedItems() { private void receiveSharedItems() {
thumbnailsAdapter.context=this;
Intent intent = getIntent(); Intent intent = getIntent();
String action = intent.getAction(); String action = intent.getAction();
if (Intent.ACTION_SEND.equals(action) || Intent.ACTION_SEND_MULTIPLE.equals(action)) { if (Intent.ACTION_SEND.equals(action) || Intent.ACTION_SEND_MULTIPLE.equals(action)) {

1
app/src/main/res/layout/activity_upload.xml
View file

@ -72,6 +72,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/small_gap" android:layout_marginTop="@dimen/small_gap"
android:padding="8px"
/> />
</LinearLayout> </LinearLayout>

1
app/src/main/res/layout/item_upload_thumbnail.xml
View file

@ -13,6 +13,7 @@
android:id="@+id/iv_thumbnail" android:id="@+id/iv_thumbnail"
android:layout_width="@dimen/big_height" android:layout_width="@dimen/big_height"
android:layout_height="@dimen/big_height" android:layout_height="@dimen/big_height"
android:padding="8px"
fresco:actualImageScaleType="fitCenter"/> fresco:actualImageScaleType="fitCenter"/>
<ImageView <ImageView