|
|
@@ -1,23 +1,25 @@
|
|
|
/**
|
|
|
- * ownCloud Android client application
|
|
|
+ * Nextcloud Android client application
|
|
|
*
|
|
|
+ * @author Andy Scherzinger
|
|
|
* @author Bartek Przybylski
|
|
|
* @author David A. Velasco
|
|
|
* Copyright (C) 2011 Bartek Przybylski
|
|
|
* Copyright (C) 2015 ownCloud Inc.
|
|
|
+ * Copyright (C) 2016 Andy Scherzinger
|
|
|
*
|
|
|
- * This program is free software: you can redistribute it and/or modify
|
|
|
- * it under the terms of the GNU General Public License version 2,
|
|
|
- * as published by the Free Software Foundation.
|
|
|
+ * 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 General Public License for more details.
|
|
|
- *
|
|
|
- * You should have received a copy of the GNU General Public License
|
|
|
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
|
+ * 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.utils;
|
|
|
@@ -37,7 +39,6 @@ import android.support.design.widget.Snackbar;
|
|
|
import android.support.v4.app.FragmentActivity;
|
|
|
import android.support.v4.content.ContextCompat;
|
|
|
import android.text.format.DateUtils;
|
|
|
-import android.view.Display;
|
|
|
import android.view.View;
|
|
|
import android.widget.ProgressBar;
|
|
|
import android.widget.SeekBar;
|
|
|
@@ -60,20 +61,21 @@ import java.util.HashMap;
|
|
|
import java.util.Map;
|
|
|
|
|
|
/**
|
|
|
- * A helper class for some string operations.
|
|
|
+ * A helper class for UI/display related operations.
|
|
|
*/
|
|
|
public class DisplayUtils {
|
|
|
private static final String TAG = DisplayUtils.class.getSimpleName();
|
|
|
-
|
|
|
- private static final String OWNCLOUD_APP_NAME = "ownCloud";
|
|
|
-
|
|
|
+
|
|
|
private static final String[] sizeSuffixes = { "B", "KB", "MB", "GB", "TB", "PB", "EB", "ZB", "YB" };
|
|
|
private static final int[] sizeScales = { 0, 0, 1, 1, 1, 2, 2, 2, 2 };
|
|
|
+ public static final int RELATIVE_THRESHOLD_WARNING = 90;
|
|
|
+ public static final int RELATIVE_THRESHOLD_CRITICAL = 95;
|
|
|
+ public static final String MIME_TYPE_UNKNOWN = "Unknown type";
|
|
|
|
|
|
private static Map<String, String> mimeType2HumanReadable;
|
|
|
|
|
|
static {
|
|
|
- mimeType2HumanReadable = new HashMap<String, String>();
|
|
|
+ mimeType2HumanReadable = new HashMap<>();
|
|
|
// images
|
|
|
mimeType2HumanReadable.put("image/jpeg", "JPEG image");
|
|
|
mimeType2HumanReadable.put("image/jpg", "JPEG image");
|
|
|
@@ -94,19 +96,19 @@ public class DisplayUtils {
|
|
|
* <li>rounds the size based on the suffix to 0,1 or 2 decimals</li>
|
|
|
* </ul>
|
|
|
*
|
|
|
- * @param bytes Input file size
|
|
|
- * @return Like something readable like "12 MB"
|
|
|
+ * @param bytes Input file size
|
|
|
+ * @return something readable like "12 MB"
|
|
|
*/
|
|
|
public static String bytesToHumanReadable(long bytes) {
|
|
|
double result = bytes;
|
|
|
- int attachedSuff = 0;
|
|
|
- while (result > 1024 && attachedSuff < sizeSuffixes.length) {
|
|
|
+ int suffixIndex = 0;
|
|
|
+ while (result > 1024 && suffixIndex < sizeSuffixes.length) {
|
|
|
result /= 1024.;
|
|
|
- attachedSuff++;
|
|
|
+ suffixIndex++;
|
|
|
}
|
|
|
|
|
|
return new BigDecimal(result).setScale(
|
|
|
- sizeScales[attachedSuff], BigDecimal.ROUND_HALF_UP) + " " + sizeSuffixes[attachedSuff];
|
|
|
+ sizeScales[suffixIndex], BigDecimal.ROUND_HALF_UP) + " " + sizeSuffixes[suffixIndex];
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
@@ -114,7 +116,7 @@ public class DisplayUtils {
|
|
|
* like "JPG image".
|
|
|
*
|
|
|
* @param mimetype MIME type to convert
|
|
|
- * @return A human friendly version of the MIME type
|
|
|
+ * @return A human friendly version of the MIME type, {@link #MIME_TYPE_UNKNOWN} if it can't be converted
|
|
|
*/
|
|
|
public static String convertMIMEtoPrettyPrint(String mimetype) {
|
|
|
if (mimeType2HumanReadable.containsKey(mimetype)) {
|
|
|
@@ -122,11 +124,12 @@ public class DisplayUtils {
|
|
|
}
|
|
|
if (mimetype.split("/").length >= 2)
|
|
|
return mimetype.split("/")[1].toUpperCase() + " file";
|
|
|
- return "Unknown type";
|
|
|
+ return MIME_TYPE_UNKNOWN;
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
* Converts Unix time to human readable format
|
|
|
+ *
|
|
|
* @param milliseconds that have passed since 01/01/1970
|
|
|
* @return The human readable time for the users locale
|
|
|
*/
|
|
|
@@ -138,6 +141,7 @@ public class DisplayUtils {
|
|
|
|
|
|
/**
|
|
|
* Converts an internationalized domain name (IDN) in an URL to and from ASCII/Unicode.
|
|
|
+ *
|
|
|
* @param url the URL where the domain name should be converted
|
|
|
* @param toASCII if true converts from Unicode to ASCII, if false converts from ASCII to Unicode
|
|
|
* @return the URL containing the converted domain name
|
|
|
@@ -155,9 +159,9 @@ public class DisplayUtils {
|
|
|
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.GINGERBREAD) {
|
|
|
// Find host name after '//' or '@'
|
|
|
int hostStart = 0;
|
|
|
- if (urlNoDots.indexOf("//") != -1) {
|
|
|
+ if (urlNoDots.contains("//")) {
|
|
|
hostStart = url.indexOf("//") + "//".length();
|
|
|
- } else if (url.indexOf("@") != -1) {
|
|
|
+ } else if (url.contains("@")) {
|
|
|
hostStart = url.indexOf("@") + "@".length();
|
|
|
}
|
|
|
|
|
|
@@ -207,17 +211,33 @@ public class DisplayUtils {
|
|
|
DateUtils.WEEK_IN_MILLIS, 0);
|
|
|
}
|
|
|
|
|
|
- @SuppressWarnings("deprecation")
|
|
|
- public static CharSequence getRelativeDateTimeString (
|
|
|
- Context c, long time, long minResolution, long transitionResolution, int flags
|
|
|
- ){
|
|
|
-
|
|
|
+ /**
|
|
|
+ * determines the info level color based on certain thresholds
|
|
|
+ * {@link #RELATIVE_THRESHOLD_WARNING} and {@link #RELATIVE_THRESHOLD_CRITICAL}.
|
|
|
+ *
|
|
|
+ * @param context the app's context
|
|
|
+ * @param relative relative value for which the info level color should be looked up
|
|
|
+ * @return info level color
|
|
|
+ */
|
|
|
+ public static int getRelativeInfoColor(Context context, int relative) {
|
|
|
+ if (relative < RELATIVE_THRESHOLD_WARNING) {
|
|
|
+ return context.getResources().getColor(R.color.infolevel_info);
|
|
|
+ } else if (relative >= RELATIVE_THRESHOLD_WARNING && relative < RELATIVE_THRESHOLD_CRITICAL) {
|
|
|
+ return context.getResources().getColor(R.color.infolevel_warning);
|
|
|
+ } else {
|
|
|
+ return context.getResources().getColor(R.color.infolevel_critical);
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ public static CharSequence getRelativeDateTimeString(
|
|
|
+ Context c, long time, long minResolution, long transitionResolution, int flags) {
|
|
|
+
|
|
|
CharSequence dateString = "";
|
|
|
-
|
|
|
+
|
|
|
// in Future
|
|
|
- if (time > System.currentTimeMillis()){
|
|
|
+ if (time > System.currentTimeMillis()) {
|
|
|
return DisplayUtils.unixTimeToHumanReadable(time);
|
|
|
- }
|
|
|
+ }
|
|
|
// < 60 seconds -> seconds ago
|
|
|
else if ((System.currentTimeMillis() - time) < 60 * 1000) {
|
|
|
return c.getString(R.string.file_list_seconds_ago);
|
|
|
@@ -238,8 +258,9 @@ public class DisplayUtils {
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
- * Update the passed path removing the last "/" if it is not the root folder
|
|
|
- * @param path
|
|
|
+ * Update the passed path removing the last "/" if it is not the root folder.
|
|
|
+ *
|
|
|
+ * @param path the path to be trimmed
|
|
|
*/
|
|
|
public static String getPathWithoutLastSlash(String path) {
|
|
|
|
|
|
@@ -250,22 +271,16 @@ public class DisplayUtils {
|
|
|
return path;
|
|
|
}
|
|
|
|
|
|
-
|
|
|
/**
|
|
|
- * Gets the screen size in pixels in a backwards compatible way
|
|
|
+ * Gets the screen size in pixels.
|
|
|
*
|
|
|
- * @param caller Activity calling; needed to get access to the {@link android.view.WindowManager}
|
|
|
- * @return Size in pixels of the screen, or default {@link Point} if caller is null
|
|
|
+ * @param caller Activity calling; needed to get access to the {@link android.view.WindowManager}
|
|
|
+ * @return Size in pixels of the screen, or default {@link Point} if caller is null
|
|
|
*/
|
|
|
public static Point getScreenSize(Activity caller) {
|
|
|
Point size = new Point();
|
|
|
if (caller != null) {
|
|
|
- Display display = caller.getWindowManager().getDefaultDisplay();
|
|
|
- if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.HONEYCOMB_MR2) {
|
|
|
- display.getSize(size);
|
|
|
- } else {
|
|
|
- size.set(display.getWidth(), display.getHeight());
|
|
|
- }
|
|
|
+ caller.getWindowManager().getDefaultDisplay().getSize(size);
|
|
|
}
|
|
|
return size;
|
|
|
}
|
|
|
@@ -277,7 +292,18 @@ public class DisplayUtils {
|
|
|
*/
|
|
|
public static void colorPreLollipopHorizontalProgressBar(ProgressBar progressBar) {
|
|
|
if (progressBar != null && Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) {
|
|
|
- int color = progressBar.getResources().getColor(R.color.color_accent);
|
|
|
+ colorHorizontalProgressBar(progressBar, progressBar.getResources().getColor(R.color.color_accent));
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ /**
|
|
|
+ * sets the coloring of the given progress bar to color_accent.
|
|
|
+ *
|
|
|
+ * @param progressBar the progress bar to be colored
|
|
|
+ * @param color the color to be used
|
|
|
+ */
|
|
|
+ public static void colorHorizontalProgressBar(ProgressBar progressBar, @ColorInt int color) {
|
|
|
+ if (progressBar != null) {
|
|
|
progressBar.getIndeterminateDrawable().setColorFilter(color, PorterDuff.Mode.SRC_IN);
|
|
|
progressBar.getProgressDrawable().setColorFilter(color, PorterDuff.Mode.SRC_IN);
|
|
|
}
|
|
|
@@ -301,9 +327,9 @@ public class DisplayUtils {
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
- * set the owncloud standard colors for the snackbar.
|
|
|
+ * set the Nextcloud standard colors for the snackbar.
|
|
|
*
|
|
|
- * @param context the context relevant for setting the color according to the context's theme
|
|
|
+ * @param context the context relevant for setting the color according to the context's theme
|
|
|
* @param snackbar the snackbar to be colored
|
|
|
*/
|
|
|
public static void colorSnackbar(Context context, Snackbar snackbar) {
|
|
|
@@ -315,7 +341,7 @@ public class DisplayUtils {
|
|
|
* Sets the color of the status bar to {@code color} on devices with OS version lollipop or higher.
|
|
|
*
|
|
|
* @param fragmentActivity fragment activity
|
|
|
- * @param color the color
|
|
|
+ * @param color the color
|
|
|
*/
|
|
|
public static void colorStatusBar(FragmentActivity fragmentActivity, @ColorInt int color) {
|
|
|
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
|
|
|
@@ -326,11 +352,11 @@ public class DisplayUtils {
|
|
|
/**
|
|
|
* Sets the color of the progressbar to {@code color} within the given toolbar.
|
|
|
*
|
|
|
- * @param activity the toolbar activity instance
|
|
|
+ * @param activity the toolbar activity instance
|
|
|
* @param progressBarColor the color to be used for the toolbar's progress bar
|
|
|
*/
|
|
|
public static void colorToolbarProgressBar(FragmentActivity activity, int progressBarColor) {
|
|
|
- if(activity instanceof ToolbarActivity) {
|
|
|
+ if (activity instanceof ToolbarActivity) {
|
|
|
((ToolbarActivity) activity).setProgressBarBackgroundColor(progressBarColor);
|
|
|
}
|
|
|
}
|
Andy Scherzinger