gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-07-13 07:44:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

reformat code

Browse Source 
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
This commit is contained in:
Andy Scherzinger 2021-11-06 12:21:02 +01:00
parent 61e0c88188
commit a8c8fbe191
No known key found for this signature in database
GPG Key ID: 6CADC7E3523C308B
1 changed files with 86 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

146
app/src/main/java/com/nextcloud/talk/utils/DisplayUtils.java
View File

@ -131,7 +131,11 @@ public class DisplayUtils {
public void onClick(@NonNull View widget) { public void onClick(@NonNull View widget) {
Intent browserIntent = new Intent(Intent.ACTION_VIEW, Uri.parse(url)); Intent browserIntent = new Intent(Intent.ACTION_VIEW, Uri.parse(url));
browserIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); browserIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
NextcloudTalkApplication.Companion.getSharedApplication().getApplicationContext().startActivity(browserIntent); NextcloudTalkApplication
.Companion
.getSharedApplication()
.getApplicationContext()
.startActivity(browserIntent);
} }
@Override @Override
@ -161,7 +165,7 @@ public class DisplayUtils {
} }
public static Bitmap getRoundedBitmapFromVectorDrawableResource(Resources resources, int resource) { public static Bitmap getRoundedBitmapFromVectorDrawableResource(Resources resources, int resource) {
VectorDrawable vectorDrawable = (VectorDrawable) ResourcesCompat.getDrawable(resources, resource,null); VectorDrawable vectorDrawable = (VectorDrawable) ResourcesCompat.getDrawable(resources, resource, null);
Bitmap bitmap = getBitmap(vectorDrawable); Bitmap bitmap = getBitmap(vectorDrawable);
new RoundPostprocessor(true).process(bitmap); new RoundPostprocessor(true).process(bitmap);
return bitmap; return bitmap;
@ -173,7 +177,8 @@ public class DisplayUtils {
public static Bitmap getBitmap(Drawable drawable) { public static Bitmap getBitmap(Drawable drawable) {
Bitmap bitmap = Bitmap.createBitmap(drawable.getIntrinsicWidth(), Bitmap bitmap = Bitmap.createBitmap(drawable.getIntrinsicWidth(),
drawable.getIntrinsicHeight(), Bitmap.Config.ARGB_8888); drawable.getIntrinsicHeight(),
Bitmap.Config.ARGB_8888);
Canvas canvas = new Canvas(bitmap); Canvas canvas = new Canvas(bitmap);
drawable.setBounds(0, 0, canvas.getWidth(), canvas.getHeight()); drawable.setBounds(0, 0, canvas.getWidth(), canvas.getHeight());
drawable.draw(canvas); drawable.draw(canvas);
@ -182,16 +187,18 @@ public class DisplayUtils {
public static ImageRequest getImageRequestForUrl(String url, @Nullable UserEntity userEntity) { public static ImageRequest getImageRequestForUrl(String url, @Nullable UserEntity userEntity) {
Map<String, String> headers = new HashMap<>(); Map<String, String> headers = new HashMap<>();
if (userEntity != null && url.startsWith(userEntity.getBaseUrl()) && (url.contains("index.php/core/preview?fileId=") || url.contains("/avatar/"))) { if (userEntity != null &&
url.startsWith(userEntity.getBaseUrl()) &&
(url.contains("index.php/core/preview?fileId=") || url.contains("/avatar/"))) {
headers.put("Authorization", ApiUtils.getCredentials(userEntity.getUsername(), userEntity.getToken())); headers.put("Authorization", ApiUtils.getCredentials(userEntity.getUsername(), userEntity.getToken()));
} }
return ImageRequestBuilder.newBuilderWithSource(Uri.parse(url)) return ImageRequestBuilder.newBuilderWithSource(Uri.parse(url))
.setProgressiveRenderingEnabled(true) .setProgressiveRenderingEnabled(true)
.setRotationOptions(RotationOptions.autoRotate()) .setRotationOptions(RotationOptions.autoRotate())
.disableDiskCache() .disableDiskCache()
.setHeaders(headers) .setHeaders(headers)
.build(); .build();
} }
public static ControllerListener getImageControllerListener(SimpleDraweeView draweeView) { public static ControllerListener getImageControllerListener(SimpleDraweeView draweeView) {
@ -202,7 +209,9 @@ public class DisplayUtils {
} }
@Override @Override
public void onFinalImageSet(String id, @androidx.annotation.Nullable Object imageInfo, @androidx.annotation.Nullable Animatable animatable) { public void onFinalImageSet(String id,
@androidx.annotation.Nullable Object imageInfo,
@androidx.annotation.Nullable Animatable animatable) {
updateViewSize((ImageInfo) imageInfo, draweeView); updateViewSize((ImageInfo) imageInfo, draweeView);
} }
@ -230,7 +239,7 @@ public class DisplayUtils {
public static float convertDpToPixel(float dp, Context context) { public static float convertDpToPixel(float dp, Context context) {
return Math.round(TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, dp, return Math.round(TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, dp,
context.getResources().getDisplayMetrics()) + 0.5f); context.getResources().getDisplayMetrics()) + 0.5f);
} }
public static float convertPixelToDp(float px, Context context) { public static float convertPixelToDp(float px, Context context) {
@ -242,8 +251,10 @@ public class DisplayUtils {
if (Build.VERSION.SDK_INT < 23) { if (Build.VERSION.SDK_INT < 23) {
try { try {
@SuppressLint("RestrictedApi") AppCompatDrawableManager drawableManager = AppCompatDrawableManager.get(); @SuppressLint("RestrictedApi") AppCompatDrawableManager drawableManager = AppCompatDrawableManager.get();
Class<?> inflateDelegateClass = Class.forName("android.support.v7.widget.AppCompatDrawableManager$InflateDelegate"); Class<?> inflateDelegateClass = Class.forName(
Class<?> vdcInflateDelegateClass = Class.forName("android.support.v7.widget.AppCompatDrawableManager$VdcInflateDelegate"); "android.support.v7.widget.AppCompatDrawableManager$InflateDelegate");
Class<?> vdcInflateDelegateClass = Class.forName(
"android.support.v7.widget.AppCompatDrawableManager$VdcInflateDelegate");
Constructor<?> constructor = vdcInflateDelegateClass.getDeclaredConstructor(); Constructor<?> constructor = vdcInflateDelegateClass.getDeclaredConstructor();
constructor.setAccessible(true); constructor.setAccessible(true);
@ -254,14 +265,15 @@ public class DisplayUtils {
addDelegate.setAccessible(true); addDelegate.setAccessible(true);
addDelegate.invoke(drawableManager, "vector", vdcInflateDelegate); addDelegate.invoke(drawableManager, "vector", vdcInflateDelegate);
} catch (ClassNotFoundException | NoSuchMethodException | InstantiationException | } catch (ClassNotFoundException | NoSuchMethodException | InstantiationException |
InvocationTargetException | IllegalAccessException e) { InvocationTargetException | IllegalAccessException e) {
Log.e(TAG, "Failed to use reflection to enable proper vector scaling"); Log.e(TAG, "Failed to use reflection to enable proper vector scaling");
} }
} }
} }
public static Drawable getTintedDrawable(Resources res, @DrawableRes int drawableResId, @ColorRes int colorResId) { public static Drawable getTintedDrawable(Resources res, @DrawableRes int drawableResId, @ColorRes int colorResId) {
Drawable drawable = ResourcesCompat.getDrawable(res, drawableResId,null);; Drawable drawable = ResourcesCompat.getDrawable(res, drawableResId, null);
;
int color = res.getColor(colorResId); int color = res.getColor(colorResId);
if (drawable != null) { if (drawable != null) {
drawable.setTint(color); drawable.setTint(color);
@ -303,31 +315,37 @@ public class DisplayUtils {
if (!isCall) { if (!isCall) {
String url = ApiUtils.getUrlForAvatarWithName(conversationUser.getBaseUrl(), id, R.dimen.avatar_size_big); String url = ApiUtils.getUrlForAvatarWithName(conversationUser.getBaseUrl(), id, R.dimen.avatar_size_big);
if ("guests".equals(type) || "guest".equals(type)) { if ("guests".equals(type) || "guest".equals(type)) {
url = ApiUtils.getUrlForAvatarWithNameForGuests(conversationUser.getBaseUrl(), String.valueOf(label), R.dimen.avatar_size_big); url = ApiUtils.getUrlForAvatarWithNameForGuests(
conversationUser.getBaseUrl(),
String.valueOf(label), R.dimen.avatar_size_big);
} }
ImageRequest imageRequest = getImageRequestForUrl(url, null); ImageRequest imageRequest = getImageRequestForUrl(url, null);
ImagePipeline imagePipeline = Fresco.getImagePipeline(); ImagePipeline imagePipeline = Fresco.getImagePipeline();
DataSource<CloseableReference<CloseableImage>> dataSource = imagePipeline.fetchDecodedImage(imageRequest, context); DataSource<CloseableReference<CloseableImage>> dataSource = imagePipeline.fetchDecodedImage(
imageRequest,
context);
dataSource.subscribe( dataSource.subscribe(
new BaseBitmapDataSubscriber() { new BaseBitmapDataSubscriber() {
@Override @Override
protected void onNewResultImpl(Bitmap bitmap) { protected void onNewResultImpl(Bitmap bitmap) {
if (bitmap != null) { if (bitmap != null) {
chip.setChipIcon(getRoundedDrawable(new BitmapDrawable(bitmap))); chip.setChipIcon(getRoundedDrawable(new BitmapDrawable(bitmap)));
// A hack to refresh the chip icon // A hack to refresh the chip icon
if (emojiEditText != null) { if (emojiEditText != null) {
emojiEditText.post(() -> emojiEditText.setTextKeepState(emojiEditText.getText(), TextView.BufferType.SPANNABLE)); emojiEditText.post(() -> emojiEditText.setTextKeepState(
} emojiEditText.getText(),
TextView.BufferType.SPANNABLE));
} }
} }
}
@Override @Override
protected void onFailureImpl(DataSource<CloseableReference<CloseableImage>> dataSource) { protected void onFailureImpl(DataSource<CloseableReference<CloseableImage>> dataSource) {
} }
}, },
UiThreadImmediateExecutorService.getInstance()); UiThreadImmediateExecutorService.getInstance());
} }
return chip; return chip;
@ -342,8 +360,8 @@ public class DisplayUtils {
String stringText = text.toString(); String stringText = text.toString();
Matcher m = Pattern.compile("@" + label, Matcher m = Pattern.compile("@" + label,
Pattern.CASE_INSENSITIVE | Pattern.LITERAL | Pattern.MULTILINE) Pattern.CASE_INSENSITIVE | Pattern.LITERAL | Pattern.MULTILINE)
.matcher(spannableString); .matcher(spannableString);
ClickableSpan clickableSpan = new ClickableSpan() { ClickableSpan clickableSpan = new ClickableSpan() {
@Override @Override
@ -359,9 +377,14 @@ public class DisplayUtils {
int end = start + m.group().length(); int end = start + m.group().length();
lastStartIndex = end; lastStartIndex = end;
mentionChipSpan = new Spans.MentionChipSpan(DisplayUtils.getDrawableForMentionChipSpan(context, mentionChipSpan = new Spans.MentionChipSpan(DisplayUtils.getDrawableForMentionChipSpan(context,
id, label, conversationUser, type, chipXmlRes, null), id,
BetterImageSpan.ALIGN_CENTER, id, label,
label); conversationUser,
type,
chipXmlRes,
null),
BetterImageSpan.ALIGN_CENTER, id,
label);
spannableString.setSpan(mentionChipSpan, start, end, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE); spannableString.setSpan(mentionChipSpan, start, end, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
if ("user".equals(type) && !conversationUser.getUserId().equals(id)) { if ("user".equals(type) && !conversationUser.getUserId().equals(id)) {
spannableString.setSpan(clickableSpan, start, end, Spannable.SPAN_INCLUSIVE_EXCLUSIVE); spannableString.setSpan(clickableSpan, start, end, Spannable.SPAN_INCLUSIVE_EXCLUSIVE);
@ -380,12 +403,12 @@ public class DisplayUtils {
} }
Matcher m = Pattern.compile(searchText, Matcher m = Pattern.compile(searchText,
Pattern.CASE_INSENSITIVE | Pattern.LITERAL | Pattern.MULTILINE) Pattern.CASE_INSENSITIVE | Pattern.LITERAL | Pattern.MULTILINE)
.matcher(spannableString); .matcher(spannableString);
int textSize = NextcloudTalkApplication.Companion.getSharedApplication().getResources().getDimensionPixelSize(R.dimen int textSize = NextcloudTalkApplication.Companion.getSharedApplication().getResources().getDimensionPixelSize(R.dimen
.chat_text_size); .chat_text_size);
int lastStartIndex = -1; int lastStartIndex = -1;
while (m.find()) { while (m.find()) {
@ -393,7 +416,7 @@ public class DisplayUtils {
int end = start + m.group().length(); int end = start + m.group().length();
lastStartIndex = end; lastStartIndex = end;
spannableString.setSpan(new ForegroundColorSpan(color), start, end, spannableString.setSpan(new ForegroundColorSpan(color), start, end,
Spannable.SPAN_EXCLUSIVE_EXCLUSIVE); Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
spannableString.setSpan(new StyleSpan(Typeface.BOLD), start, end, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE); spannableString.setSpan(new StyleSpan(Typeface.BOLD), start, end, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
spannableString.setSpan(new AbsoluteSizeSpan(textSize), start, end, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE); spannableString.setSpan(new AbsoluteSizeSpan(textSize), start, end, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
} }
@ -401,23 +424,25 @@ public class DisplayUtils {
return spannableString; return spannableString;
} }
public static Drawable getMessageSelector(@ColorInt int normalColor, @ColorInt int selectedColor, public static Drawable getMessageSelector(@ColorInt int normalColor,
@ColorInt int pressedColor, @DrawableRes int shape) { @ColorInt int selectedColor,
@ColorInt int pressedColor,
@DrawableRes int shape) {
Drawable vectorDrawable = ContextCompat.getDrawable(NextcloudTalkApplication.Companion.getSharedApplication() Drawable vectorDrawable = ContextCompat.getDrawable(NextcloudTalkApplication.Companion.getSharedApplication()
.getApplicationContext(), .getApplicationContext(),
shape); shape);
Drawable drawable = DrawableCompat.wrap(vectorDrawable).mutate(); Drawable drawable = DrawableCompat.wrap(vectorDrawable).mutate();
DrawableCompat.setTintList( DrawableCompat.setTintList(
drawable, drawable,
new ColorStateList( new ColorStateList(
new int[][]{ new int[][]{
new int[]{android.R.attr.state_selected}, new int[]{android.R.attr.state_selected},
new int[]{android.R.attr.state_pressed}, new int[]{android.R.attr.state_pressed},
new int[]{-android.R.attr.state_pressed, -android.R.attr.state_selected} new int[]{-android.R.attr.state_pressed, -android.R.attr.state_selected}
}, },
new int[]{selectedColor, pressedColor, normalColor} new int[]{selectedColor, pressedColor, normalColor}
)); ));
return drawable; return drawable;
} }
@ -436,7 +461,8 @@ public class DisplayUtils {
if (isLightTheme) { if (isLightTheme) {
int systemUiFlagLightStatusBar; int systemUiFlagLightStatusBar;
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
systemUiFlagLightStatusBar = View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR | View.SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR; systemUiFlagLightStatusBar = View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR |
View.SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR;
} else { } else {
systemUiFlagLightStatusBar = View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR; systemUiFlagLightStatusBar = View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR;
} }
@ -554,14 +580,15 @@ public class DisplayUtils {
} }
DraweeController draweeController = Fresco.newDraweeControllerBuilder() DraweeController draweeController = Fresco.newDraweeControllerBuilder()
.setOldController(avatarImageView.getController()) .setOldController(avatarImageView.getController())
.setAutoPlayAnimations(true) .setAutoPlayAnimations(true)
.setImageRequest(DisplayUtils.getImageRequestForUrl(avatarString, null)) .setImageRequest(DisplayUtils.getImageRequestForUrl(avatarString, null))
.build(); .build();
avatarImageView.setController(draweeController); avatarImageView.setController(draweeController);
} }
public static @StringRes int getSortOrderStringId(FileSortOrder sortOrder) { public static @StringRes
int getSortOrderStringId(FileSortOrder sortOrder) {
switch (sortOrder.name) { switch (sortOrder.name) {
case sort_z_to_a_id: case sort_z_to_a_id:
return R.string.menu_item_sort_by_name_z_a; return R.string.menu_item_sort_by_name_z_a;
@ -579,4 +606,3 @@ public class DisplayUtils {
} }
} }
} }