close #89

Piwigo · Oct 19, 2019 · c98a896 · c98a896
1 parent 4918f60
commit c98a896
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 11 deletions.
diff --git a/app/src/main/java/org/piwigo/internal/binding/adapter/ImageViewBindingAdapter.java b/app/src/main/java/org/piwigo/internal/binding/adapter/ImageViewBindingAdapter.java
@@ -33,10 +33,7 @@ public ImageViewBindingAdapter(Picasso picasso) {
     }
 
     @BindingAdapter("android:src") public void loadImage(ImageView imageView, String url) {
-        picasso.load(url)
+        picasso.load(url).into(imageView); // centering and cropping is done by ImageView from the resources
-                .fit()
-                .centerCrop()
-                .into(imageView);
     }
 
     @BindingAdapter("heightRatio") public void setHeighRatio(ImageView imageView, double ratio) {

diff --git a/app/src/main/java/org/piwigo/ui/main/AlbumsViewModel.java b/app/src/main/java/org/piwigo/ui/main/AlbumsViewModel.java
@@ -131,7 +131,7 @@ public void onError(Throwable e) {
                 // NO: NEVER throw an exception here
                 // throw new RuntimeException(e);
                 Log.e(TAG, "CategoriesSubscriber: " + e.getMessage());
-                // TODO: highlight problem to the user
+                // TODO: #161 highlight problem to the user
             }
         }
 
@@ -182,7 +182,7 @@ public void onError(Throwable e) {
                 // NO: NEVER throw an exception here
                 // throw new RuntimeException(e);
                 Log.e(TAG, "ImagesSubscriber: " + e.getMessage());
-                // TODO: highlight problem to the user
+                // TODO: #161 highlight problem to the user
             }
         }
 

diff --git a/app/src/main/res/layout/item_album.xml b/app/src/main/res/layout/item_album.xml
@@ -24,7 +24,10 @@
             android:src="@{viewModel.url}"
             android:contentDescription="@{viewModel.title}"
             android:onClick="@{viewModel::onClickDo}"
-            app:heightRatio="@{0.66}" />
+            app:heightRatio="@{0.66}"
+            android:cropToPadding="false"
+            android:scaleType="centerCrop"
+            />
 
         <LinearLayout
             android:layout_width="match_parent"

diff --git a/app/src/main/res/layout/item_images.xml b/app/src/main/res/layout/item_images.xml
@@ -42,12 +42,13 @@
         <ImageView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:adjustViewBounds="true"
+            android:adjustViewBounds="false"
-            android:src="@{viewModel.url}"
             android:contentDescription="@{viewModel.title}"
+            android:cropToPadding="false"
             android:onClick="@{viewModel::onClickDo}"
-            app:heightRatio="@{1}"
+            android:scaleType="centerCrop"
-            />
+            android:src="@{viewModel.url}"
+            app:heightRatio="@{1}" />
 
     </androidx.cardview.widget.CardView>
 </layout>