mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-11-30 07:09:56 +03:00
Code Issues Projects Releases Packages Wiki Activity

Removing RecyclerView

Browse source
This commit is contained in:
alejandro 2017-05-17 12:56:05 -05:00 committed by AndyScherzinger
parent 1cf2ef4395
commit 1d92fe8df6
No known key found for this signature in database
GPG key ID: 6CADC7E3523C308B
4 changed files with 83 additions and 174 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

94
src/main/java/com/owncloud/android/ui/adapter/ActivityListAdapter.java
View file

@ -20,9 +20,9 @@
package com.owncloud.android.ui.adapter;
import android.content.Context;
import android.content.res.Resources;
import android.graphics.drawable.PictureDrawable;
import android.net.Uri;
import android.support.v7.widget.GridLayoutManager;
import android.support.v7.widget.RecyclerView;
import android.text.SpannableStringBuilder;
import android.text.TextUtils;
@ -32,7 +32,9 @@ import android.text.style.StyleSpan;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.GridLayout;
import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.TextView;
import com.bumptech.glide.GenericRequestBuilder;
@ -41,13 +43,17 @@ import com.bumptech.glide.load.engine.DiskCacheStrategy;
import com.bumptech.glide.load.model.StreamEncoder;
import com.bumptech.glide.load.resource.file.FileToStreamDecoder;
import com.caverock.androidsvg.SVG;
import com.owncloud.android.MainApp;
import com.owncloud.android.R;
import com.owncloud.android.datamodel.OCFile;
import com.owncloud.android.lib.common.OwnCloudClient;
import com.owncloud.android.lib.resources.activities.models.Activity;
import com.owncloud.android.lib.resources.activities.models.RichElement;
import com.owncloud.android.lib.resources.activities.models.RichObject;
import com.owncloud.android.lib.resources.activities.models.RichSubject;
import com.owncloud.android.ui.interfaces.ActivityListInterface;
import com.owncloud.android.utils.DisplayUtils;
import com.owncloud.android.utils.MimeTypeUtil;
import com.owncloud.android.utils.glide.CustomGlideStreamLoader;
import com.owncloud.android.utils.svg.SvgDecoder;
import com.owncloud.android.utils.svg.SvgDrawableTranscoder;
import com.owncloud.android.utils.svg.SvgSoftwareLayerSetter;
@ -66,6 +72,7 @@ public class ActivityListAdapter extends RecyclerView.Adapter<RecyclerView.ViewH
public static final int HEADER_TYPE=100;
public static final int ACTIVITY_TYPE=101;
private final ActivityListInterface activityListInterface;
private final int px;
private OwnCloudClient mClient;
private Context context;
@ -75,8 +82,7 @@ public class ActivityListAdapter extends RecyclerView.Adapter<RecyclerView.ViewH
this.mValues = new ArrayList<>();
this.context = context;
this.activityListInterface=activityListInterface;
px=getThumbnailDimension();
}
public void setActivityItems(List<Object> activityItems,OwnCloudClient client) {
@ -128,7 +134,7 @@ public class ActivityListAdapter extends RecyclerView.Adapter<RecyclerView.ViewH
if (!TextUtils.isEmpty(activity.getSubject())) {
activityViewHolder.subject.setMovementMethod(LinkMovementMethod.getInstance());
activityViewHolder.subject.setText(addClickablePart(activity.getRichSubject()), TextView.BufferType.SPANNABLE);
activityViewHolder.subject.setText(addClickablePart(activity.getRichElement()), TextView.BufferType.SPANNABLE);
activityViewHolder.subject.setVisibility(View.VISIBLE);
} else {
activityViewHolder.subject.setVisibility(View.GONE);
@ -145,11 +151,14 @@ public class ActivityListAdapter extends RecyclerView.Adapter<RecyclerView.ViewH
downloadIcon(activity.getIcon(), activityViewHolder.activityIcon);
}
if(activity.getRichSubject()!=null && activity.richSubject.getRichObjectList().size()>0) {
RichObjectAdapter richObjectAdapter = new RichObjectAdapter(context, activityListInterface);
activityViewHolder.list.setLayoutManager(new GridLayoutManager(context, 4));
activityViewHolder.list.setAdapter(richObjectAdapter);
richObjectAdapter.setValues(activity.richSubject.getRichObjectList(),mClient.getBaseUri());
if(activity.getRichElement()!=null && activity.getRichElement().getRichObjectList().size()>0) {
activityViewHolder.list.removeAllViews();
for (RichObject richObject : activity.getRichElement().getRichObjectList()) {
ImageView imageView=createThumbnail(richObject);
activityViewHolder.list.addView(imageView);
}
}
}else{
@ -158,6 +167,50 @@ public class ActivityListAdapter extends RecyclerView.Adapter<RecyclerView.ViewH
}
}
public ImageView createThumbnail(final RichObject richObject){
OCFile file = new OCFile("/" + richObject.getPath());
file.setRemoteId(richObject.getId());
LinearLayout.LayoutParams params=new LinearLayout.LayoutParams(px,px);
params.setMargins(10,10,10,10);
ImageView imageView=new ImageView(context);
imageView.setLayoutParams(params);
imageView.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
activityListInterface.onActivityClicked(richObject);
}
});
setBitmap(file,imageView);
return imageView;
}
public void setBitmap(OCFile file, ImageView fileIcon) {
// No Folder
if (!file.isFolder()) {
if ((MimeTypeUtil.isImage(file) || MimeTypeUtil.isVideo(file)) ) {
String uri = mClient.getBaseUri()+ "" +
"/index.php/apps/files/api/v1/thumbnail/" +
px + "/" + px + Uri.encode(file.getRemotePath(), "/");
Glide.with(context).using(new CustomGlideStreamLoader()).load(uri).into(fileIcon); //Using custom fetcher
} else {
fileIcon.setImageResource(MimeTypeUtil.getFileTypeIconId(file.getMimetype(),
file.getFileName()));
}
} else {
// Folder
fileIcon.setImageResource(
MimeTypeUtil.getFolderTypeIconId(
file.isSharedWithMe() || file.isSharedWithSharee(),
file.isSharedViaLink()
)
);
}
}
private void downloadIcon(String icon, ImageView itemViewType) {
GenericRequestBuilder<Uri, InputStream, SVG, PictureDrawable> requestBuilder = Glide.with(context)
.using(Glide.buildStreamModelLoader(Uri.class, context), InputStream.class)
@ -180,8 +233,8 @@ public class ActivityListAdapter extends RecyclerView.Adapter<RecyclerView.ViewH
.into(itemViewType);
}
private SpannableStringBuilder addClickablePart(RichSubject richSubject) {
String text=richSubject.getRichSubject();
private SpannableStringBuilder addClickablePart(RichElement richElement) {
String text=richElement.getRichSubject();
SpannableStringBuilder ssb = new SpannableStringBuilder(text);
int idx1 = text.indexOf("{");
@ -189,7 +242,7 @@ public class ActivityListAdapter extends RecyclerView.Adapter<RecyclerView.ViewH
while (idx1 != -1) {
idx2 = text.indexOf("}", idx1) + 1;
final String clickString = text.substring(idx1+1, idx2-1);
final RichObject richObject=searchObjectByName(richSubject.getRichObjectList(),clickString);
final RichObject richObject=searchObjectByName(richElement.getRichObjectList(),clickString);
if(richObject!=null) {
String name = richObject.getName();
ssb.replace(idx1, idx2, name);
@ -231,13 +284,24 @@ public class ActivityListAdapter extends RecyclerView.Adapter<RecyclerView.ViewH
return mValues.size();
}
/**
* Converts size of file icon from dp to pixel
* @return int
*/
private int getThumbnailDimension(){
// Converts dp to pixel
Resources r = MainApp.getAppContext().getResources();
Double d = Math.pow(2,Math.floor(Math.log(r.getDimension(R.dimen.file_icon_size_grid))/Math.log(2)));
return d.intValue();
}
class ActivityViewHolder extends RecyclerView.ViewHolder {
private final ImageView activityIcon;
private final TextView subject;
private final TextView message;
private final TextView dateTime;
private final RecyclerView list;
private final GridLayout list;
private ActivityViewHolder(View itemView) {
super(itemView);
@ -245,7 +309,7 @@ public class ActivityListAdapter extends RecyclerView.Adapter<RecyclerView.ViewH
subject = (TextView) itemView.findViewById(R.id.activity_subject);
message = (TextView) itemView.findViewById(R.id.activity_message);
dateTime = (TextView) itemView.findViewById(R.id.activity_datetime);
list = (RecyclerView) itemView.findViewById(R.id.list);
list = (GridLayout) itemView.findViewById(R.id.list);
}
}

144
src/main/java/com/owncloud/android/ui/adapter/RichObjectAdapter.java
View file

@ -1,144 +0,0 @@
/**
* Nextcloud Android client application
*
* @author Alejandro Bautista
* Copyright (C) 2017 Alejandro Bautista
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
* License as published by the Free Software Foundation; either
* version 3 of the License, or 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 AFFERO GENERAL PUBLIC LICENSE for more details.
*
* You should have received a copy of the GNU Affero General Public
* License along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package com.owncloud.android.ui.adapter;
import android.content.Context;
import android.content.res.Resources;
import android.net.Uri;
import android.support.v7.widget.RecyclerView;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.ImageView;
import com.bumptech.glide.Glide;
import com.owncloud.android.MainApp;
import com.owncloud.android.R;
import com.owncloud.android.datamodel.OCFile;
import com.owncloud.android.lib.resources.activities.models.RichObject;
import com.owncloud.android.ui.interfaces.ActivityListInterface;
import com.owncloud.android.utils.MimeTypeUtil;
import com.owncloud.android.utils.glide.CustomGlideStreamLoader;
import java.util.ArrayList;
/**
* Rich Object Adapter
*/
public class RichObjectAdapter extends RecyclerView.Adapter<RichObjectAdapter.RichObjectViewHolder> {
private final Context mContext;
private final int px;
private ArrayList<RichObject> mValues;
private final ActivityListInterface mActivityListInterface;
private Uri mBaseUri;
public RichObjectAdapter(Context context, ActivityListInterface activityListInterface) {
this.mContext = context;
this.mValues = new ArrayList<>();
this.mActivityListInterface = activityListInterface;
px=getThumbnailDimension();
}
public void setValues(ArrayList<RichObject> values,Uri baseUri) {
this.mBaseUri=baseUri;
this.mValues = values;
notifyDataSetChanged();
}
@Override
public RichObjectViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.rich_object_item, parent, false);
return new RichObjectViewHolder(v);
}
@Override
public int getItemCount() {
return mValues.size();
}
@Override
public void onBindViewHolder(RichObjectViewHolder holder, int position) {
final RichObject richObject = mValues.get(position);
OCFile file = new OCFile("/" + richObject.getPath());
file.setRemoteId(richObject.getId());
holder.image.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
mActivityListInterface.onActivityClicked(richObject);
}
});
setBitmap(file, holder.image);
}
public void setBitmap(OCFile file, ImageView fileIcon) {
// No Folder
if (!file.isFolder()) {
if ((MimeTypeUtil.isImage(file) || MimeTypeUtil.isVideo(file)) ) {
String uri = mBaseUri+ "" +
"/index.php/apps/files/api/v1/thumbnail/" +
px + "/" + px + Uri.encode(file.getRemotePath(), "/");
Glide.with(mContext).using(new CustomGlideStreamLoader()).load(uri).into(fileIcon); //Using custom fetcher
} else {
fileIcon.setImageResource(MimeTypeUtil.getFileTypeIconId(file.getMimetype(),
file.getFileName()));
}
} else {
// Folder
fileIcon.setImageResource(
MimeTypeUtil.getFolderTypeIconId(
file.isSharedWithMe() || file.isSharedWithSharee(),
file.isSharedViaLink()
)
);
}
}
/**
* Converts size of file icon from dp to pixel
* @return int
*/
private int getThumbnailDimension(){
// Converts dp to pixel
Resources r = MainApp.getAppContext().getResources();
Double d = Math.pow(2,Math.floor(Math.log(r.getDimension(R.dimen.file_icon_size_grid))/Math.log(2)));
return d.intValue();
}
static class RichObjectViewHolder extends RecyclerView.ViewHolder {
public ImageView image;
RichObjectViewHolder(View v) {
super(v);
image = (ImageView) v.findViewById(R.id.image);
}
}
}

7
src/main/res/layout/activity_list_item.xml
View file

@ -48,7 +48,6 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:ellipsize="end"
android:maxLines="2"
android:text="@string/placeholder_filename"
android:textAppearance="?android:attr/textAppearanceListItem"/>
@ -61,10 +60,12 @@
android:text="@string/placeholder_sentence"
android:textColor="?android:attr/textColorSecondary"/>
<android.support.v7.widget.RecyclerView
<GridLayout
android:id="@+id/list"
android:layout_width="match_parent"
android:layout_height="wrap_content"/>
android:layout_height="wrap_content"
android:layout_marginTop="5dp"
android:columnCount="3" />
<TextView
android:id="@+id/activity_datetime"

12
src/main/res/layout/rich_object_item.xml
View file

@ -1,12 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical" android:layout_width="wrap_content"
android:layout_height="wrap_content">
<ImageView
android:id="@+id/image"
android:layout_width="80dp"
android:layout_height="80dp"
android:layout_margin="5dp"/>
</LinearLayout>