Browse Source

Readd necessaries values

Signed-off-by: Joris Bodin <joris.bodin@infomaniak.com>
Joris Bodin 5 years ago
parent
commit
cbeaf726b3

+ 44 - 0
src/main/java/com/owncloud/android/ui/SquareImageView.java

@@ -0,0 +1,44 @@
+/**
+ * ownCloud Android client application
+ *
+ * Copyright (C) 2015 ownCloud Inc.
+ *
+ * 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 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/>.
+ */
+
+package com.owncloud.android.ui;
+
+import android.content.Context;
+import android.util.AttributeSet;
+
+import androidx.appcompat.widget.AppCompatImageView;
+
+public class SquareImageView extends AppCompatImageView {
+
+    public SquareImageView(Context context) {
+        super(context);
+    }
+
+    public SquareImageView(Context context, AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    public SquareImageView(Context context, AttributeSet attrs, int defStyle) {
+        super(context, attrs, defStyle);
+    }
+
+    @Override
+    protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+        super.onMeasure(widthMeasureSpec, widthMeasureSpec);
+    }
+}

+ 1 - 1
src/main/res/layout/grid_image.xml

@@ -47,7 +47,7 @@
                 app:width_weight="0.4"
                 app:height_weight="0.6" />
 
-            <ImageView
+            <com.owncloud.android.ui.SquareImageView
                 android:id="@+id/thumbnail"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"

+ 10 - 1
src/main/res/layout/grid_sync_item.xml

@@ -25,7 +25,7 @@
     android:background="@drawable/list_selector"
     android:gravity="center_horizontal">
 
-    <ImageView
+    <com.owncloud.android.ui.SquareImageView
         android:id="@+id/thumbnail"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
@@ -49,6 +49,15 @@
         android:gravity="center_horizontal"
         android:orientation="horizontal">
 
+        <TextView
+            android:id="@+id/next"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/synced_folders_plus"
+            android:textColor="#ffffff"
+            android:textSize="@dimen/grid_sync_item_layout_next_text_size"
+            android:textStyle="bold" />
+
         <TextView
             android:id="@+id/counter"
             android:layout_width="wrap_content"

+ 1 - 0
src/main/res/values/dims.xml

@@ -119,6 +119,7 @@
     <dimen name="grid_item_shared_icon_layout_top_margin">24dp</dimen>
     <dimen name="grid_item_local_file_indicator_layout_width">16dp</dimen>
     <dimen name="grid_item_local_file_indicator_layout_height">16dp</dimen>
+    <dimen name="grid_sync_item_layout_next_text_size">22sp</dimen>
     <dimen name="grid_sync_item_layout_counter_text_size">22sp</dimen>
     <dimen name="list_item_favorite_action_layout_width">16dp</dimen>
     <dimen name="list_item_favorite_action_layout_height">16dp</dimen>

+ 1 - 0
src/main/res/values/strings.xml

@@ -567,6 +567,7 @@
     <string name="synced_folders_preferences">Preferences for auto uploading</string>
     <string name="synced_folders_new_info">Instant uploading has been revamped completely. Re-configure your auto upload from within the main menu.\n\nEnjoy the new and extended auto uploading.</string>
     <string name="synced_folders_preferences_folder_path">For %1$s</string>
+    <string name="synced_folders_plus" translatable="false">+</string>
     <plurals name="items_selected_count">
         <!--
              As a developer, you should always supply "one" and "other"