mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-11-23 13:45:35 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #5114 from nextcloud/richWorkspaceFixes

Browse source 
- fix not clickable rich workspace area
This commit is contained in:
Tobias Kaminsky 2020-01-08 09:03:03 +01:00 committed by GitHub
commit 1343ba08e2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 16 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
scripts/analysis/findbugs-results.txt
View file

@ -1 +1 @@
413
414

2
src/main/java/com/owncloud/android/ui/adapter/OCFileListAdapter.java
View file

@ -329,7 +329,7 @@ public class OCFileListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHol
OCFileListHeaderViewHolder headerViewHolder = (OCFileListHeaderViewHolder) holder;
String text = currentDirectory.getRichWorkspace();
PreviewTextFragment.setText(headerViewHolder.headerText, text, getItem(position), activity);
PreviewTextFragment.setText(headerViewHolder.headerText, text, null, activity, true, true);
headerViewHolder.headerView.setOnClickListener(v -> ocFileListFragmentInterface.onHeaderClicked());
} else {
OCFileListGridImageViewHolder gridViewHolder = (OCFileListGridImageViewHolder) holder;

17
src/main/java/com/owncloud/android/ui/preview/PreviewTextFragment.java
View file

@ -55,6 +55,7 @@ import com.owncloud.android.utils.ThemeUtils;
import javax.inject.Inject;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.appcompat.widget.SearchView;
import io.noties.markwon.AbstractMarkwonPlugin;
import io.noties.markwon.Markwon;
@ -226,14 +227,22 @@ public abstract class PreviewTextFragment extends FileFragment implements Search
}
public static void setText(TextView textView, String text, OCFile file, Activity activity) {
setText(textView, text, file, activity, false);
setText(textView, text, file, activity, false, false);
}
public static void setText(TextView textView, String text, OCFile file, Activity activity, boolean ignoreMimetype) {
if ((MimeTypeUtil.MIMETYPE_TEXT_MARKDOWN.equals(file.getMimeType()) || ignoreMimetype) &&
public static void setText(TextView textView,
String text,
@Nullable OCFile file,
Activity activity,
boolean ignoreMimetype,
boolean preview) {
if ((ignoreMimetype || file != null && MimeTypeUtil.MIMETYPE_TEXT_MARKDOWN.equals(file.getMimeType())) &&
android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.JELLY_BEAN
&& activity != null) {
textView.setMovementMethod(LinkMovementMethod.getInstance());
if (!preview) {
// clickable links prevent to open full view of rich workspace
textView.setMovementMethod(LinkMovementMethod.getInstance());
}
textView.setText(getRenderedMarkdownText(activity, text));
} else {
textView.setText(text);

2
src/main/java/com/owncloud/android/ui/preview/PreviewTextStringFragment.java
View file

@ -145,7 +145,7 @@ public class PreviewTextStringFragment extends PreviewTextFragment {
void loadAndShowTextPreview() {
if (mTextPreview != null) {
mOriginalText = getFile().getRichWorkspace();
setText(mTextPreview, mOriginalText, getFile(), requireActivity(), true);
setText(mTextPreview, mOriginalText, getFile(), requireActivity(), true, false);
mTextPreview.setVisibility(View.VISIBLE);
}