mirror of
https://github.com/nextcloud/android.git
synced 2024-11-23 05:35:39 +03:00
initial layout changes for in drawer quota display
This commit is contained in:
parent
c2f3519648
commit
e790d4a520
3 changed files with 48 additions and 2 deletions
|
@ -24,9 +24,43 @@
|
|||
android:layout_width="wrap_content"
|
||||
android:layout_height="match_parent"
|
||||
android:layout_gravity="start"
|
||||
android:layout_weight="1"
|
||||
android:fitsSystemWindows="true"
|
||||
app:theme="@style/NavigationView_ItemTextAppearance"
|
||||
app:headerLayout="@layout/drawer_header"
|
||||
app:menu="@menu/drawer_menu"/>
|
||||
app:menu="@menu/drawer_menu"
|
||||
app:theme="@style/NavigationView_ItemTextAppearance">
|
||||
|
||||
<LinearLayout
|
||||
android:id="@+id/drawer_quota"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="bottom"
|
||||
android:background="#F5F5F5"
|
||||
android:clickable="false"
|
||||
android:orientation="vertical"
|
||||
android:paddingBottom="@dimen/standard_half_padding"
|
||||
android:paddingLeft="@dimen/standard_padding"
|
||||
android:paddingRight="@dimen/standard_padding"
|
||||
android:paddingTop="@dimen/standard_half_padding"
|
||||
android:visibility="gone">
|
||||
|
||||
<ProgressBar
|
||||
android:id="@+id/drawer_quota_ProgressBar"
|
||||
style="?android:attr/progressBarStyleHorizontal"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:indeterminate="false"
|
||||
android:indeterminateOnly="false"
|
||||
android:text="@string/drawer_quota"
|
||||
/>
|
||||
|
||||
<TextView
|
||||
android:id="@+id/drawer_quota_text"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@string/drawer_quota"/>
|
||||
</LinearLayout>
|
||||
|
||||
</android.support.design.widget.NavigationView>
|
||||
|
||||
</merge>
|
|
@ -67,4 +67,15 @@
|
|||
android:icon="@drawable/ic_settings"
|
||||
android:title="@string/actionbar_settings"/>
|
||||
</group>
|
||||
|
||||
<!--
|
||||
dummy group/element as a workaround to see
|
||||
the whole menu in case of quota being displayed
|
||||
-->
|
||||
<group>
|
||||
<item
|
||||
android:enabled="false"
|
||||
android:orderInCategory="200"
|
||||
android:title=""/>
|
||||
</group>
|
||||
</menu>
|
|
@ -23,6 +23,7 @@
|
|||
<string name="drawer_item_on_device">On device</string>
|
||||
<string name="drawer_item_settings">Settings</string>
|
||||
<string name="drawer_item_uploads_list">Uploads</string>
|
||||
<string name="drawer_quota">%1$s%2$s of %3$s%4$s used</string>
|
||||
<string name="drawer_close">Close</string>
|
||||
<string name="drawer_open">Open</string>
|
||||
<string name="prefs_category_general">General</string>
|
||||
|
|
Loading…
Reference in a new issue