Room list

This commit is contained in:
Benoit Marty
2019-05-29 12:21:45 +02:00
parent 25f6528049
commit 2b8bbc550c
22 changed files with 290 additions and 102 deletions

View File

@ -1,39 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android">
<!-- define an empty title else lint fails -->
<item
android:id="@+id/bottom_action_home"
android:contentDescription="@string/bottom_action_home"
android:enabled="true"
android:icon="@drawable/ic_home_black_24dp"
android:title="" />
<item
android:id="@+id/bottom_action_favourites"
android:contentDescription="@string/bottom_action_favourites"
android:enabled="true"
android:icon="@drawable/ic_star_black_24dp"
android:title="" />
<item
android:id="@+id/bottom_action_people"
android:contentDescription="@string/bottom_action_people"
android:enabled="true"
android:icon="@drawable/ic_person_black_24dp"
android:title="" />
<item
android:id="@+id/bottom_action_rooms"
android:contentDescription="@string/bottom_action_rooms"
android:enabled="true"
android:icon="@drawable/riot_tab_rooms"
android:title="" />
<item
android:id="@+id/bottom_action_groups"
android:contentDescription="@string/bottom_action_groups"
android:enabled="true"
android:icon="@drawable/riot_tab_groups"
android:title="" />
</menu>

View File

@ -1,25 +1,26 @@
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android">
<!-- TODO Design: icon -->
<item
android:id="@+id/bottom_action_home"
android:contentDescription="@string/bottom_action_home"
android:enabled="true"
android:icon="@drawable/ic_home_black_24dp"
android:icon="@drawable/ic_home_bottom_catchup"
android:title="" />
<item
android:id="@+id/bottom_action_people"
android:contentDescription="@string/bottom_action_people"
android:enabled="true"
android:icon="@drawable/ic_person_black_24dp"
android:icon="@drawable/ic_home_bottom_chat"
android:title="" />
<item
android:id="@+id/bottom_action_rooms"
android:contentDescription="@string/bottom_action_rooms"
android:enabled="true"
android:icon="@drawable/riot_tab_rooms"
android:icon="@drawable/ic_home_bottom_group"
android:title="" />
</menu>

View File

@ -4,7 +4,7 @@
<item
android:id="@+id/menu_settings"
android:icon="@drawable/ic_settings"
android:icon="@drawable/ic_settings_x"
android:title="@string/room_sliding_menu_settings"
app:showAsAction="always" />

View File

@ -9,7 +9,7 @@
<item
android:id="@+id/sliding_menu_settings"
android:icon="@drawable/ic_settings"
android:icon="@drawable/ic_settings_x"
android:title="@string/room_sliding_menu_settings" />
<item