mirror of
https://github.com/nextcloud/android.git
synced 2024-11-29 02:38:58 +03:00
Merge pull request #1506 from nextcloud/fixLayoutIds
Lint: fix UnknownIdInLayout: use correct reference to an id that is in the current layout
This commit is contained in:
commit
9371d95acf
5 changed files with 9 additions and 5 deletions
|
@ -1,2 +1,2 @@
|
|||
DO NOT TOUCH; GENERATED BY DRONE
|
||||
<span class="mdl-layout-title">Lint Report: 488 warnings</span>
|
||||
<span class="mdl-layout-title">Lint Report: 484 warnings</span>
|
||||
|
|
|
@ -32,13 +32,14 @@
|
|||
android:orientation="vertical">
|
||||
|
||||
<include
|
||||
android:id="@+id/navigation_bar"
|
||||
layout="@layout/toolbar_standard"/>
|
||||
|
||||
<FrameLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:layout_above="@+id/bottom_navigation_view"
|
||||
android:layout_below="@+id/appbar">
|
||||
android:layout_below="@+id/navigation_bar">
|
||||
|
||||
<android.support.v4.widget.SwipeRefreshLayout
|
||||
android:id="@+id/swipe_containing_list"
|
||||
|
|
|
@ -34,13 +34,14 @@
|
|||
android:orientation="vertical">
|
||||
|
||||
<include
|
||||
android:id="@+id/navigation_bar"
|
||||
layout="@layout/toolbar_standard"/>
|
||||
|
||||
<FrameLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:layout_above="@+id/bottom_navigation_view"
|
||||
android:layout_below="@+id/appbar"
|
||||
android:layout_below="@+id/navigation_bar"
|
||||
android:id="@+id/frame_container">
|
||||
|
||||
</FrameLayout>
|
||||
|
|
|
@ -33,13 +33,14 @@
|
|||
android:orientation="vertical">
|
||||
|
||||
<include
|
||||
android:id="@+id/navigation_bar"
|
||||
layout="@layout/toolbar_standard"/>
|
||||
|
||||
<FrameLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:layout_above="@+id/bottom_navigation_view"
|
||||
android:layout_below="@+id/appbar">
|
||||
android:layout_below="@+id/navigation_bar">
|
||||
|
||||
<android.support.v4.widget.SwipeRefreshLayout
|
||||
android:id="@+id/swipe_containing_list"
|
||||
|
|
|
@ -31,6 +31,7 @@
|
|||
android:orientation="vertical">
|
||||
|
||||
<include
|
||||
android:id="@+id/navigation_bar"
|
||||
layout="@layout/toolbar_standard"/>
|
||||
|
||||
<FrameLayout
|
||||
|
@ -39,7 +40,7 @@
|
|||
android:layout_height="match_parent"
|
||||
android:background="@color/background_color"
|
||||
android:layout_above="@+id/bottom_navigation_view"
|
||||
android:layout_below="@+id/appbar" />
|
||||
android:layout_below="@+id/navigation_bar" />
|
||||
|
||||
<android.support.design.widget.BottomNavigationView
|
||||
android:id="@+id/bottom_navigation_view"
|
||||
|
|
Loading…
Reference in a new issue