diff options
| author | stefan-niedermann <info@niedermann.it> | 2019-12-11 21:25:37 +0300 |
|---|---|---|
| committer | Niedermann IT-Dienstleistungen <stefan-niedermann@users.noreply.github.com> | 2019-12-12 19:54:19 +0300 |
| commit | e139fe6186e84b4bd65861812efd04a67eb4f99e (patch) | |
| tree | b716db0ad3522c06dffd2702762167d0f56199f9 /app/src | |
| parent | b3f43ab8053793e18ffbfe5658bb4ea1a0e2b325 (diff) | |
#224 Make reusable component for empty content views
Rename color_chooser to widget_color_chooser
Diffstat (limited to 'app/src')
| -rw-r--r-- | app/src/main/java/it/niedermann/nextcloud/deck/ui/helper/colorchooser/ColorChooser.java | 2 | ||||
| -rw-r--r-- | app/src/main/res/layout/fragment_card_edit_tab_attachments.xml | 37 | ||||
| -rw-r--r-- | app/src/main/res/layout/widget_color_chooser.xml (renamed from app/src/main/res/layout/color_chooser.xml) | 0 |
3 files changed, 6 insertions, 33 deletions
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/helper/colorchooser/ColorChooser.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/helper/colorchooser/ColorChooser.java index c80bb127f..bd966681d 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/helper/colorchooser/ColorChooser.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/helper/colorchooser/ColorChooser.java @@ -40,7 +40,7 @@ public class ColorChooser extends LinearLayout { LayoutInflater inflater = (LayoutInflater) context .getSystemService(Context.LAYOUT_INFLATER_SERVICE); - inflater.inflate(R.layout.color_chooser, this, true); + inflater.inflate(R.layout.widget_color_chooser, this, true); ButterKnife.bind(this); initDefaultColors(); } diff --git a/app/src/main/res/layout/fragment_card_edit_tab_attachments.xml b/app/src/main/res/layout/fragment_card_edit_tab_attachments.xml index a92f933be..42b21612a 100644 --- a/app/src/main/res/layout/fragment_card_edit_tab_attachments.xml +++ b/app/src/main/res/layout/fragment_card_edit_tab_attachments.xml @@ -17,41 +17,14 @@ tools:listitem="@layout/item_attachment" tools:visibility="visible" /> - <RelativeLayout + <it.niedermann.nextcloud.deck.ui.helper.emptycontentview.EmptyContentView android:id="@+id/no_attachments" android:layout_width="match_parent" android:layout_height="match_parent" - android:visibility="visible" - tools:visibility="gone"> - - <ImageView - android:layout_width="match_parent" - android:layout_height="72dp" - android:layout_above="@+id/no_attachments_text" - android:layout_gravity="center" - android:contentDescription="@null" - android:tint="@color/fg_secondary" - app:srcCompat="@drawable/ic_attach_file_grey600_24dp" /> - - <TextView - android:id="@+id/no_attachments_text" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_centerVertical="true" - android:gravity="center" - android:paddingTop="16dp" - android:paddingBottom="16dp" - android:text="@string/attachments" - android:textAlignment="center" - android:textSize="@dimen/empty_content_font_size" /> - - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_below="@id/no_attachments_text" - android:layout_centerHorizontal="true" - android:text="@string/no_files_attached_to_this_card" /> - </RelativeLayout> + android:visibility="gone" + app:description="@string/no_files_attached_to_this_card" + app:image="@drawable/ic_attach_file_grey600_24dp" + app:title="@string/attachments" /> <com.google.android.material.floatingactionbutton.FloatingActionButton android:id="@+id/fab" diff --git a/app/src/main/res/layout/color_chooser.xml b/app/src/main/res/layout/widget_color_chooser.xml index 26b28d737..26b28d737 100644 --- a/app/src/main/res/layout/color_chooser.xml +++ b/app/src/main/res/layout/widget_color_chooser.xml |