From ff1cb190d9bbba850e8846f7085ed46a4761c46d Mon Sep 17 00:00:00 2001 From: Mikel Date: Tue, 18 Jul 2017 20:29:40 +0100 Subject: [PATCH 1/7] Add ripple effect to Coordinates --- app/src/main/res/layout/fragment_media_detail.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/app/src/main/res/layout/fragment_media_detail.xml b/app/src/main/res/layout/fragment_media_detail.xml index 16dba06e5..ae644b7dd 100644 --- a/app/src/main/res/layout/fragment_media_detail.xml +++ b/app/src/main/res/layout/fragment_media_detail.xml @@ -179,6 +179,7 @@ android:id="@+id/mediaDetailCoordinates" android:layout_gravity="start" android:background="?attr/subBackground" + android:foreground="?attr/selectableItemBackground" android:textColor="@android:color/white" android:textSize="14sp" android:padding="12dp" From d3149640186d989b81681c7a3e164150ecaee8ab Mon Sep 17 00:00:00 2001 From: Mikel Date: Wed, 2 Aug 2017 21:57:13 +0100 Subject: [PATCH 2/7] Merge from master and add icons to clickable fields --- .../commons/media/MediaDetailFragment.java | 79 ++++++-- .../free/nrw/commons/mwapi/UploadResult.java | 11 ++ .../fr/free/nrw/commons/utils/UiUtils.java | 32 ++++ .../drawable/ic_info_outline_white_24dp.xml | 9 + .../main/res/layout/fragment_media_detail.xml | 169 +++++++++--------- 5 files changed, 197 insertions(+), 103 deletions(-) create mode 100644 app/src/main/res/drawable/ic_info_outline_white_24dp.xml diff --git a/app/src/main/java/fr/free/nrw/commons/media/MediaDetailFragment.java b/app/src/main/java/fr/free/nrw/commons/media/MediaDetailFragment.java index d739e9040..0837f905b 100644 --- a/app/src/main/java/fr/free/nrw/commons/media/MediaDetailFragment.java +++ b/app/src/main/java/fr/free/nrw/commons/media/MediaDetailFragment.java @@ -7,7 +7,9 @@ import android.os.AsyncTask; import android.os.Bundle; import android.support.annotation.Nullable; import android.support.v4.app.Fragment; +import android.support.v7.content.res.AppCompatResources; import android.util.TypedValue; +import android.view.Gravity; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -30,6 +32,7 @@ import fr.free.nrw.commons.MediaWikiImageView; import fr.free.nrw.commons.PageTitle; import fr.free.nrw.commons.R; import fr.free.nrw.commons.location.LatLng; +import fr.free.nrw.commons.utils.UiUtils; import timber.log.Timber; public class MediaDetailFragment extends Fragment { @@ -211,22 +214,8 @@ public class MediaDetailFragment extends Fragment { if (success) { extractor.fill(media); - // Set text of desc, license, and categories - desc.setText(prettyDescription(media)); - license.setText(prettyLicense(media)); - coordinates.setText(prettyCoordinates(media)); - uploadedDate.setText(prettyUploadedDate(media)); - - categoryNames.clear(); - categoryNames.addAll(media.getCategories()); - - categoriesLoaded = true; - categoriesPresent = (categoryNames.size() > 0); - if (!categoriesPresent) { - // Stick in a filler element. - categoryNames.add(getString(R.string.detail_panel_cats_none)); - } - rebuildCatList(); + setTextFields(media); + setOnClickListeners(media); } else { Timber.d("Failed to load photo details."); } @@ -260,6 +249,31 @@ public class MediaDetailFragment extends Fragment { super.onDestroyView(); } + private void setTextFields(Media media) { + desc.setText(prettyDescription(media)); + license.setText(prettyLicense(media)); + coordinates.setText(prettyCoordinates(media)); + uploadedDate.setText(prettyUploadedDate(media)); + + categoryNames.clear(); + categoryNames.addAll(media.getCategories()); + + categoriesLoaded = true; + categoriesPresent = (categoryNames.size() > 0); + if (!categoriesPresent) { + // Stick in a filler element. + categoryNames.add(getString(R.string.detail_panel_cats_none)); + } + rebuildCatList(); + } + + private void setOnClickListeners(final Media media) { + license.setOnClickListener(v -> openWebBrowser(licenseLink(media))); + if (media.getCoordinates() != null) { + coordinates.setOnClickListener(v -> openMap(media.getCoordinates())); + } + } + private void rebuildCatList() { categoryContainer.removeAllViews(); // @fixme add the category items @@ -275,6 +289,9 @@ public class MediaDetailFragment extends Fragment { textView.setText(catName); if (categoriesLoaded && categoriesPresent) { + textView.setCompoundDrawablesWithIntrinsicBounds(AppCompatResources.getDrawable(getContext(), R.drawable.ic_info_outline_white_24dp), null, null, null); + textView.setCompoundDrawablePadding((int) UiUtils.convertDpToPixel(6, getContext())); + textView.setGravity(Gravity.CENTER_VERTICAL); textView.setOnClickListener(view -> { String selectedCategoryTitle = "Category:" + catName; Intent viewIntent = new Intent(); @@ -342,4 +359,34 @@ public class MediaDetailFragment extends Fragment { } return media.getCoordinates().getPrettyCoordinateString(); } + + + private @Nullable String licenseLink(Media media) { + String licenseKey = media.getLicense(); + if (licenseKey == null || licenseKey.equals("")) { + return null; + } + License licenseObj = licenseList.get(licenseKey); + if (licenseObj == null) { + return null; + } else { + return licenseObj.getUrl(Locale.getDefault().getLanguage()); + } + } + + private void openWebBrowser(String url) { + Intent browser = new Intent(Intent.ACTION_VIEW, Uri.parse(url)); + startActivity(browser); + } + + private void openMap(LatLng coordinates) { + //Open map app at given position + Uri gmmIntentUri = Uri.parse( + "geo:0,0?q=" + coordinates.getLatitude() + "," + coordinates.getLatitude()); + Intent mapIntent = new Intent(Intent.ACTION_VIEW, gmmIntentUri); + + if (mapIntent.resolveActivity(getActivity().getPackageManager()) != null) { + startActivity(mapIntent); + } + } } diff --git a/app/src/main/java/fr/free/nrw/commons/mwapi/UploadResult.java b/app/src/main/java/fr/free/nrw/commons/mwapi/UploadResult.java index 34d050b2c..8a53e4b8b 100644 --- a/app/src/main/java/fr/free/nrw/commons/mwapi/UploadResult.java +++ b/app/src/main/java/fr/free/nrw/commons/mwapi/UploadResult.java @@ -40,4 +40,15 @@ public class UploadResult { public String getResultStatus() { return resultStatus; } + + @Override + public String toString() { + return "UploadResult{" + + "errorCode='" + errorCode + '\'' + + ", resultStatus='" + resultStatus + '\'' + + ", dateUploaded=" + dateUploaded + + ", imageUrl='" + imageUrl + '\'' + + ", canonicalFilename='" + canonicalFilename + '\'' + + '}'; + } } diff --git a/app/src/main/java/fr/free/nrw/commons/utils/UiUtils.java b/app/src/main/java/fr/free/nrw/commons/utils/UiUtils.java index b2c073850..3d3dcafff 100644 --- a/app/src/main/java/fr/free/nrw/commons/utils/UiUtils.java +++ b/app/src/main/java/fr/free/nrw/commons/utils/UiUtils.java @@ -1,8 +1,16 @@ package fr.free.nrw.commons.utils; +import android.content.Context; +import android.content.res.Resources; +import android.content.res.TypedArray; import android.graphics.Bitmap; import android.graphics.Canvas; +import android.graphics.drawable.Drawable; import android.support.graphics.drawable.VectorDrawableCompat; +import android.support.v7.content.res.AppCompatResources; +import android.util.DisplayMetrics; + +import fr.free.nrw.commons.R; public class UiUtils { @@ -19,4 +27,28 @@ public class UiUtils { vectorDrawable.draw(canvas); return bitmap; } + + /** + * Converts dp unit to equivalent pixels. + * + * @param dp density independent pixels + * @param context + * @return px equivalent to dp value + */ + public static float convertDpToPixel(float dp, Context context){ + DisplayMetrics metrics = context.getResources().getDisplayMetrics(); + return dp * ((float)metrics.densityDpi / DisplayMetrics.DENSITY_DEFAULT); + } + + /** + * Converts device specific pixels to dp. + * + * @param px pixels + * @param context + * @return dp equivalent to px value + */ + public static float convertPixelsToDp(float px, Context context){ + DisplayMetrics metrics = context.getResources().getDisplayMetrics(); + return px / ((float)metrics.densityDpi / DisplayMetrics.DENSITY_DEFAULT); + } } diff --git a/app/src/main/res/drawable/ic_info_outline_white_24dp.xml b/app/src/main/res/drawable/ic_info_outline_white_24dp.xml new file mode 100644 index 000000000..9567ecd77 --- /dev/null +++ b/app/src/main/res/drawable/ic_info_outline_white_24dp.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/layout/fragment_media_detail.xml b/app/src/main/res/layout/fragment_media_detail.xml index 333cfba25..5bdcea2d9 100644 --- a/app/src/main/res/layout/fragment_media_detail.xml +++ b/app/src/main/res/layout/fragment_media_detail.xml @@ -26,121 +26,111 @@ /> + android:fillViewport="true"> + android:orientation="vertical"> + android:layout_width="match_parent" + android:layout_height="16dp" /> + android:orientation="vertical" + android:padding="16dp"> + android:orientation="vertical" + android:padding="16dp"> + + android:text="@string/media_detail_title" + android:textColor="@android:color/white" + android:textSize="16sp" + android:textStyle="bold" /> + + android:text="@string/media_detail_media_title" + android:textColor="@android:color/white" + android:textSize="14sp" /> + android:layout_height="8dp" /> + android:orientation="vertical" + android:padding="16dp"> + + android:textStyle="bold" /> + + android:text="@string/media_detail_description_explanation" + android:textColor="@android:color/white" + android:textSize="14sp" /> + android:layout_height="8dp" /> + android:orientation="vertical" + android:padding="16dp"> + android:textStyle="bold" /> + android:orientation="vertical" + android:padding="16dp"> + - + + + tools:text="Coordinates link" /> + android:layout_height="8dp" /> + android:textStyle="bold"> + + android:textSize="16sp" + android:textStyle="bold" /> + + android:orientation="vertical" /> + android:layout_height="8dp" /> + android:orientation="vertical" + android:padding="16dp"> + + android:textStyle="bold" /> + + android:text="@string/media_detail_uploaded_date" + android:textColor="@android:color/white" + android:textSize="14sp" /> From 1618640046a7749a9e8075f8e0f3e73430bf7343 Mon Sep 17 00:00:00 2001 From: Mikel Date: Wed, 2 Aug 2017 22:02:36 +0100 Subject: [PATCH 3/7] Make Codacy happy --- .../fr/free/nrw/commons/mwapi/UploadResult.java | 11 ----------- .../java/fr/free/nrw/commons/utils/UiUtils.java | 14 ++++++-------- 2 files changed, 6 insertions(+), 19 deletions(-) diff --git a/app/src/main/java/fr/free/nrw/commons/mwapi/UploadResult.java b/app/src/main/java/fr/free/nrw/commons/mwapi/UploadResult.java index 8a53e4b8b..34d050b2c 100644 --- a/app/src/main/java/fr/free/nrw/commons/mwapi/UploadResult.java +++ b/app/src/main/java/fr/free/nrw/commons/mwapi/UploadResult.java @@ -40,15 +40,4 @@ public class UploadResult { public String getResultStatus() { return resultStatus; } - - @Override - public String toString() { - return "UploadResult{" + - "errorCode='" + errorCode + '\'' + - ", resultStatus='" + resultStatus + '\'' + - ", dateUploaded=" + dateUploaded + - ", imageUrl='" + imageUrl + '\'' + - ", canonicalFilename='" + canonicalFilename + '\'' + - '}'; - } } diff --git a/app/src/main/java/fr/free/nrw/commons/utils/UiUtils.java b/app/src/main/java/fr/free/nrw/commons/utils/UiUtils.java index 3d3dcafff..361a766a2 100644 --- a/app/src/main/java/fr/free/nrw/commons/utils/UiUtils.java +++ b/app/src/main/java/fr/free/nrw/commons/utils/UiUtils.java @@ -30,25 +30,23 @@ public class UiUtils { /** * Converts dp unit to equivalent pixels. - * * @param dp density independent pixels - * @param context + * @param context Context to access display metrics * @return px equivalent to dp value */ - public static float convertDpToPixel(float dp, Context context){ + public static float convertDpToPixel(float dp, Context context) { DisplayMetrics metrics = context.getResources().getDisplayMetrics(); - return dp * ((float)metrics.densityDpi / DisplayMetrics.DENSITY_DEFAULT); + return dp * ((float) metrics.densityDpi / DisplayMetrics.DENSITY_DEFAULT); } /** * Converts device specific pixels to dp. - * * @param px pixels - * @param context + * @param context Context to access display metrics * @return dp equivalent to px value */ - public static float convertPixelsToDp(float px, Context context){ + public static float convertPixelsToDp(float px, Context context) { DisplayMetrics metrics = context.getResources().getDisplayMetrics(); - return px / ((float)metrics.densityDpi / DisplayMetrics.DENSITY_DEFAULT); + return px / ((float) metrics.densityDpi / DisplayMetrics.DENSITY_DEFAULT); } } From 04ff70fa5b6552ecf781d5b24e68aaa0f016d6d3 Mon Sep 17 00:00:00 2001 From: Mikel Date: Wed, 2 Aug 2017 22:06:37 +0100 Subject: [PATCH 4/7] Codacy :) --- .../java/fr/free/nrw/commons/media/MediaDetailFragment.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/fr/free/nrw/commons/media/MediaDetailFragment.java b/app/src/main/java/fr/free/nrw/commons/media/MediaDetailFragment.java index 0837f905b..eeb778df6 100644 --- a/app/src/main/java/fr/free/nrw/commons/media/MediaDetailFragment.java +++ b/app/src/main/java/fr/free/nrw/commons/media/MediaDetailFragment.java @@ -289,7 +289,11 @@ public class MediaDetailFragment extends Fragment { textView.setText(catName); if (categoriesLoaded && categoriesPresent) { - textView.setCompoundDrawablesWithIntrinsicBounds(AppCompatResources.getDrawable(getContext(), R.drawable.ic_info_outline_white_24dp), null, null, null); + textView.setCompoundDrawablesWithIntrinsicBounds( + AppCompatResources.getDrawable( + getContext(), + R.drawable.ic_info_outline_white_24dp), + null, null, null); textView.setCompoundDrawablePadding((int) UiUtils.convertDpToPixel(6, getContext())); textView.setGravity(Gravity.CENTER_VERTICAL); textView.setOnClickListener(view -> { From 7754c7c7c42669dcb388a6e3b06dfeb7108dadac Mon Sep 17 00:00:00 2001 From: Mikel Date: Mon, 7 Aug 2017 20:44:35 +0100 Subject: [PATCH 5/7] Fix vectors for drawableStart in API 17 --- .../commons/media/MediaDetailFragment.java | 10 +-- .../nrw/commons/ui/widget/CompatTextView.java | 69 +++++++++++++++++++ .../main/res/layout/detail_category_item.xml | 14 ++-- .../main/res/layout/fragment_media_detail.xml | 14 ++-- app/src/main/res/values/attrs.xml | 8 +++ 5 files changed, 94 insertions(+), 21 deletions(-) create mode 100644 app/src/main/java/fr/free/nrw/commons/ui/widget/CompatTextView.java diff --git a/app/src/main/java/fr/free/nrw/commons/media/MediaDetailFragment.java b/app/src/main/java/fr/free/nrw/commons/media/MediaDetailFragment.java index eeb778df6..a17c130fb 100644 --- a/app/src/main/java/fr/free/nrw/commons/media/MediaDetailFragment.java +++ b/app/src/main/java/fr/free/nrw/commons/media/MediaDetailFragment.java @@ -32,6 +32,7 @@ import fr.free.nrw.commons.MediaWikiImageView; import fr.free.nrw.commons.PageTitle; import fr.free.nrw.commons.R; import fr.free.nrw.commons.location.LatLng; +import fr.free.nrw.commons.ui.widget.CompatTextView; import fr.free.nrw.commons.utils.UiUtils; import timber.log.Timber; @@ -285,17 +286,10 @@ public class MediaDetailFragment extends Fragment { private View buildCatLabel(final String catName) { final View item = getLayoutInflater(null).inflate(R.layout.detail_category_item, null, false); - final TextView textView = (TextView)item.findViewById(R.id.mediaDetailCategoryItemText); + final CompatTextView textView = (CompatTextView)item.findViewById(R.id.mediaDetailCategoryItemText); textView.setText(catName); if (categoriesLoaded && categoriesPresent) { - textView.setCompoundDrawablesWithIntrinsicBounds( - AppCompatResources.getDrawable( - getContext(), - R.drawable.ic_info_outline_white_24dp), - null, null, null); - textView.setCompoundDrawablePadding((int) UiUtils.convertDpToPixel(6, getContext())); - textView.setGravity(Gravity.CENTER_VERTICAL); textView.setOnClickListener(view -> { String selectedCategoryTitle = "Category:" + catName; Intent viewIntent = new Intent(); diff --git a/app/src/main/java/fr/free/nrw/commons/ui/widget/CompatTextView.java b/app/src/main/java/fr/free/nrw/commons/ui/widget/CompatTextView.java new file mode 100644 index 000000000..f6cb2ac9e --- /dev/null +++ b/app/src/main/java/fr/free/nrw/commons/ui/widget/CompatTextView.java @@ -0,0 +1,69 @@ +package fr.free.nrw.commons.ui.widget; + +/** + * Created by mikel on 07/08/2017. + */ + +import android.content.Context; +import android.content.res.TypedArray; +import android.graphics.drawable.Drawable; +import android.support.annotation.Nullable; +import android.support.v4.view.ViewCompat; +import android.support.v7.widget.AppCompatDrawableManager; +import android.support.v7.widget.AppCompatTextView; +import android.util.AttributeSet; + +import fr.free.nrw.commons.R; +import fr.free.nrw.commons.utils.UiUtils; + +public class CompatTextView extends AppCompatTextView { + public CompatTextView(Context context) { + super(context); + init(null); + } + + public CompatTextView(Context context, AttributeSet attrs) { + super(context, attrs); + init(attrs); + } + + public CompatTextView(Context context, AttributeSet attrs, int defStyleAttr) { + super(context, attrs, defStyleAttr); + init(attrs); + } + + private void init(@Nullable AttributeSet attrs) { + if (attrs != null) { + Context context = getContext(); + TypedArray a = context.obtainStyledAttributes(attrs, R.styleable.CompatTextView); + + // Obtain DrawableManager used to pull Drawables safely, and check if we're in RTL + AppCompatDrawableManager dm = AppCompatDrawableManager.get(); + boolean rtl = ViewCompat.getLayoutDirection(this) == ViewCompat.LAYOUT_DIRECTION_RTL; + + // Grab the compat drawable padding from the XML + float drawablePadding = a.getDimension(R.styleable.CompatTextView_drawablePadding, 0); + + // Grab the compat drawable resources from the XML + int startDrawableRes = a.getResourceId(R.styleable.CompatTextView_drawableStart, 0); + int topDrawableRes = a.getResourceId(R.styleable.CompatTextView_drawableTop, 0); + int endDrawableRes = a.getResourceId(R.styleable.CompatTextView_drawableEnd, 0); + int bottomDrawableRes = a.getResourceId(R.styleable.CompatTextView_drawableBottom, 0); + + // Load the used drawables, falling back to whatever may be set in an "android:" namespace attribute + Drawable[] currentDrawables = getCompoundDrawables(); + Drawable left = startDrawableRes != 0 ? dm.getDrawable(context, startDrawableRes) : currentDrawables[0]; + Drawable right = endDrawableRes != 0 ? dm.getDrawable(context, endDrawableRes) : currentDrawables[1]; + Drawable top = topDrawableRes != 0 ? dm.getDrawable(context, topDrawableRes) : currentDrawables[2]; + Drawable bottom = bottomDrawableRes != 0 ? dm.getDrawable(context, bottomDrawableRes) : currentDrawables[3]; + + // Account for RTL and apply the compound Drawables + Drawable start = rtl ? right : left; + Drawable end = rtl ? left : right; + setCompoundDrawablesWithIntrinsicBounds(start, top, end, bottom); + setCompoundDrawablePadding((int) UiUtils.convertDpToPixel(drawablePadding, getContext())); + + a.recycle(); + } + } +} diff --git a/app/src/main/res/layout/detail_category_item.xml b/app/src/main/res/layout/detail_category_item.xml index 3b74af4d4..89197db5d 100644 --- a/app/src/main/res/layout/detail_category_item.xml +++ b/app/src/main/res/layout/detail_category_item.xml @@ -1,20 +1,24 @@ - - @@ -166,21 +165,20 @@ android:textSize="16sp" android:textStyle="bold" /> - diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml index e56bddc85..22da8c207 100644 --- a/app/src/main/res/values/attrs.xml +++ b/app/src/main/res/values/attrs.xml @@ -13,4 +13,12 @@ + + + + + + + + \ No newline at end of file From 304e998a0b07be2409acf181aa2bd0f850238b1e Mon Sep 17 00:00:00 2001 From: Mikel Date: Mon, 7 Aug 2017 20:53:00 +0100 Subject: [PATCH 6/7] Line break to add readability --- .../free/nrw/commons/ui/widget/CompatTextView.java | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/fr/free/nrw/commons/ui/widget/CompatTextView.java b/app/src/main/java/fr/free/nrw/commons/ui/widget/CompatTextView.java index f6cb2ac9e..2508877ed 100644 --- a/app/src/main/java/fr/free/nrw/commons/ui/widget/CompatTextView.java +++ b/app/src/main/java/fr/free/nrw/commons/ui/widget/CompatTextView.java @@ -50,12 +50,16 @@ public class CompatTextView extends AppCompatTextView { int endDrawableRes = a.getResourceId(R.styleable.CompatTextView_drawableEnd, 0); int bottomDrawableRes = a.getResourceId(R.styleable.CompatTextView_drawableBottom, 0); - // Load the used drawables, falling back to whatever may be set in an "android:" namespace attribute + // Load the used drawables, fall back to whatever was set in an "android:" Drawable[] currentDrawables = getCompoundDrawables(); - Drawable left = startDrawableRes != 0 ? dm.getDrawable(context, startDrawableRes) : currentDrawables[0]; - Drawable right = endDrawableRes != 0 ? dm.getDrawable(context, endDrawableRes) : currentDrawables[1]; - Drawable top = topDrawableRes != 0 ? dm.getDrawable(context, topDrawableRes) : currentDrawables[2]; - Drawable bottom = bottomDrawableRes != 0 ? dm.getDrawable(context, bottomDrawableRes) : currentDrawables[3]; + Drawable left = startDrawableRes != 0 + ? dm.getDrawable(context, startDrawableRes) : currentDrawables[0]; + Drawable right = endDrawableRes != 0 + ? dm.getDrawable(context, endDrawableRes) : currentDrawables[1]; + Drawable top = topDrawableRes != 0 + ? dm.getDrawable(context, topDrawableRes) : currentDrawables[2]; + Drawable bottom = bottomDrawableRes != 0 + ? dm.getDrawable(context, bottomDrawableRes) : currentDrawables[3]; // Account for RTL and apply the compound Drawables Drawable start = rtl ? right : left; From bef42de61335eb64005d3242d223210bd71b4dcd Mon Sep 17 00:00:00 2001 From: Mikel Date: Tue, 8 Aug 2017 13:04:16 +0100 Subject: [PATCH 7/7] Remove unused imports --- .../java/fr/free/nrw/commons/media/MediaDetailFragment.java | 3 --- app/src/main/java/fr/free/nrw/commons/utils/UiUtils.java | 6 ------ 2 files changed, 9 deletions(-) diff --git a/app/src/main/java/fr/free/nrw/commons/media/MediaDetailFragment.java b/app/src/main/java/fr/free/nrw/commons/media/MediaDetailFragment.java index a17c130fb..f2461fcf0 100644 --- a/app/src/main/java/fr/free/nrw/commons/media/MediaDetailFragment.java +++ b/app/src/main/java/fr/free/nrw/commons/media/MediaDetailFragment.java @@ -7,9 +7,7 @@ import android.os.AsyncTask; import android.os.Bundle; import android.support.annotation.Nullable; import android.support.v4.app.Fragment; -import android.support.v7.content.res.AppCompatResources; import android.util.TypedValue; -import android.view.Gravity; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -33,7 +31,6 @@ import fr.free.nrw.commons.PageTitle; import fr.free.nrw.commons.R; import fr.free.nrw.commons.location.LatLng; import fr.free.nrw.commons.ui.widget.CompatTextView; -import fr.free.nrw.commons.utils.UiUtils; import timber.log.Timber; public class MediaDetailFragment extends Fragment { diff --git a/app/src/main/java/fr/free/nrw/commons/utils/UiUtils.java b/app/src/main/java/fr/free/nrw/commons/utils/UiUtils.java index 361a766a2..e038ec097 100644 --- a/app/src/main/java/fr/free/nrw/commons/utils/UiUtils.java +++ b/app/src/main/java/fr/free/nrw/commons/utils/UiUtils.java @@ -1,17 +1,11 @@ package fr.free.nrw.commons.utils; import android.content.Context; -import android.content.res.Resources; -import android.content.res.TypedArray; import android.graphics.Bitmap; import android.graphics.Canvas; -import android.graphics.drawable.Drawable; import android.support.graphics.drawable.VectorDrawableCompat; -import android.support.v7.content.res.AppCompatResources; import android.util.DisplayMetrics; -import fr.free.nrw.commons.R; - public class UiUtils { /**