diff options
| author | Stefan Niedermann <info@niedermann.it> | 2020-05-11 14:29:54 +0300 |
|---|---|---|
| committer | Stefan Niedermann <info@niedermann.it> | 2020-05-11 14:29:54 +0300 |
| commit | 8eea6da76571140463da0b3567c88661a8958f63 (patch) | |
| tree | ccf2d41f9794d1a1f2fb67457cad8ec0c5906be8 /app/src/main/res/layout | |
| parent | 96ee09e790e88a5a78f1f9cec35562847213adfb (diff) | |
| parent | 9f0521619796bd3952385c37d644559a1882dcae (diff) | |
Merge branch 'master' into 345-clear-storage-action
# Conflicts:
# app/src/main/java/it/niedermann/nextcloud/deck/ui/MainActivity.java
# app/src/main/java/it/niedermann/nextcloud/deck/ui/board/accesscontrol/AccessControlDialogFragment.java
# app/src/main/java/it/niedermann/nextcloud/deck/ui/card/details/CardDetailsFragment.java
# app/src/main/res/values/strings.xml
Diffstat (limited to 'app/src/main/res/layout')
| -rw-r--r-- | app/src/main/res/layout/activity_main.xml | 30 |
1 files changed, 29 insertions, 1 deletions
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 329f3710b..527fd34aa 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -44,13 +44,41 @@ android:paddingLeft="@dimen/spacer_1hx" android:paddingEnd="@dimen/spacer_1hx" android:paddingRight="@dimen/spacer_1hx" - android:text="@string/maintenance_mode" + android:text="@string/info_box_maintenance_mode" android:textColor="@color/grey600" app:drawableLeftCompat="@drawable/ic_info_outline_grey600_24dp" app:drawableStartCompat="@drawable/ic_info_outline_grey600_24dp" /> </LinearLayout> + <LinearLayout + android:id="@+id/info_box_version_not_supported" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_gravity="center_horizontal|bottom" + android:background="@color/danger" + android:gravity="center" + android:padding="@dimen/spacer_1hx" + android:visibility="gone" + tools:visibility="visible"> + + <TextView + android:id="@+id/info_box_version_not_supported_text" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:drawablePadding="@dimen/spacer_1hx" + android:gravity="center" + android:paddingStart="@dimen/spacer_1hx" + android:paddingLeft="@dimen/spacer_1hx" + android:paddingEnd="@dimen/spacer_1hx" + android:paddingRight="@dimen/spacer_1hx" + android:text="@string/info_box_version_not_supported" + android:textColor="@android:color/white" + app:drawableLeftCompat="@drawable/ic_warning_white_24dp" + app:drawableStartCompat="@drawable/ic_warning_white_24dp" /> + + </LinearLayout> + <it.niedermann.nextcloud.deck.ui.view.EmptyContentView android:id="@+id/empty_content_view_boards" android:layout_width="match_parent" |