Commit 58b27f6c authored by Mudar Noufal's avatar Mudar Noufal

Filter menuFab layout and styles

drawable asset icon
parent 5c97f3e8
......@@ -70,6 +70,7 @@ dependencies {
// UI
compile 'com.roughike:bottom-bar:2.0.2'
compile('com.lsjwzh:materialloadingprogressbar:0.5.8-RELEASE')
compile 'com.github.clans:fab:1.6.4'
compile('com.mikepenz:aboutlibraries:5.8.0@aar') {
transitive = true
}
......
<?xml version="1.0" encoding="utf-8"?>
<merge xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools">
<com.github.clans.fab.FloatingActionMenu
android:id="@+id/fab_menu"
style="@style/FabMenu"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:paddingBottom="@dimen/fab_margin"
android:paddingEnd="@dimen/fab_margin"
android:visibility="gone"
app:menu_backgroundColor="@color/fab_menu_background"
app:menu_colorNormal="@color/color_primary"
app:menu_colorPressed="@color/color_primary"
app:menu_fab_label="@string/fab_menu_label_layers"
app:menu_labels_colorNormal="@color/fab_menu_item_color_normal"
app:menu_labels_colorPressed="@color/fab_menu_item_color_normal"
tools:ignore="RtlSymmetry">
<com.github.clans.fab.FloatingActionButton
android:id="@+id/fab_air_conditioning"
style="@style/FabMenuItem.WaterSupplies"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/ic_water_supplies"
app:fab_label="@string/fab_label_air_conditioning" />
<com.github.clans.fab.FloatingActionButton
android:id="@+id/fab_pools"
style="@style/FabMenuItem.WaterSupplies"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/ic_water_supplies"
app:fab_label="@string/fab_label_pools" />
<com.github.clans.fab.FloatingActionButton
android:id="@+id/fab_wading_pools"
style="@style/FabMenuItem.WaterSupplies"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/ic_water_supplies"
app:fab_label="@string/fab_label_wading_pools" />
<com.github.clans.fab.FloatingActionButton
android:id="@+id/fab_play_fountains"
style="@style/FabMenuItem.WaterSupplies"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/ic_water_supplies"
app:fab_label="@string/fab_label_play_fountains" />
<com.github.clans.fab.FloatingActionButton
android:id="@+id/fab_hospitals"
style="@style/FabMenuItem.Hospitals"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/ic_hospitals"
app:fab_label="@string/fab_label_hospitals" />
<com.github.clans.fab.FloatingActionButton
android:id="@+id/fab_clsc"
style="@style/FabMenuItem.Hospitals"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/ic_hospitals"
app:fab_label="@string/fab_label_clsc" />
</com.github.clans.fab.FloatingActionMenu>
</merge>
......@@ -40,7 +40,7 @@
<string name="btn_spvm_stations">Poste de police</string>
<string name="btn_water_supplies">Canicule</string>
<string name="btn_emergency_hostels">Hébergement</string>
<string name="btn_hospitals">Hôpitaux</string>
<string name="btn_hospitals">Santé</string>
<!--Menus-->
<string name="action_search">Recherche</string>
......@@ -51,6 +51,15 @@
<string name="action_eula">Licence</string>
<string name="action_about_libs">Librairies libres</string>
<!--FloatingActionMenu-->
<string name="fab_menu_label_layers">Sous-catégories</string>
<string name="fab_label_air_conditioning">Lieux climatisés</string>
<string name="fab_label_pools">Piscines</string>
<string name="fab_label_wading_pools">Pataugeoires</string>
<string name="fab_label_play_fountains">Jeux d’eau</string>
<string name="fab_label_hospitals">Hôpitaux</string>
<string name="fab_label_clsc">CLSC</string>
<!--Buttons-->
<string name="btn_ok">Ok</string>
<string name="btn_retry">Réessayer</string>
......
......@@ -28,6 +28,7 @@
<!--Material Colors-->
<color name="white">#ffffff</color>
<color name="white_transp_80">#d0ffffff</color>
<!--<color name="deep_orange_900">#BF360C</color>-->
<!--<color name="orange_500">#FF9800</color>-->
<!--<color name="orange_700">#F57C00</color>-->
......@@ -59,7 +60,7 @@
<!--App custom colors-->
<color name="text_primary">#ffffffff</color>
<color name="text_secondary">#d0ffffff</color>
<color name="text_secondary">@color/white_transp_80</color>
<color name="color_background">@color/yellow_700</color>
<color name="color_background_light">@color/grey_200</color>
<color name="color_background_dark">@color/grey_800</color>
......@@ -73,6 +74,10 @@
<color name="map_info_title">@color/grey_900</color>
<color name="map_info_snippet">@color/grey_600</color>
<!--FloatingActionMenu-->
<color name="fab_menu_item_color_normal">@color/grey_800</color>
<color name="fab_menu_background">@color/white_transp_80</color>
<!--Search Suggestions-->
<color name="search_suggestion_title">@color/grey_100</color>
......
......@@ -63,4 +63,7 @@
<!--FloatingActionButton-->
<dimen name="fab_margin">12dp</dimen>
<!--FloatingActionMenu-->
<dimen name="fab_menu_elevation">6dp</dimen>
</resources>
\ No newline at end of file
......@@ -40,7 +40,7 @@
<string name="btn_spvm_stations">Police Stations</string>
<string name="btn_water_supplies">Heat Wave</string>
<string name="btn_emergency_hostels">Emgcy Hostels</string>
<string name="btn_hospitals">Hospitals</string>
<string name="btn_hospitals">Health</string>
<!--Menus-->
<string name="action_search">Search</string>
......@@ -51,6 +51,15 @@
<string name="action_eula">License</string>
<string name="action_about_libs">Open source libraries</string>
<!--FloatingActionMenu-->
<string name="fab_menu_label_layers">Subcategories</string>
<string name="fab_label_air_conditioning">Air conditioning</string>
<string name="fab_label_pools">Pools</string>
<string name="fab_label_wading_pools">Wading pools</string>
<string name="fab_label_play_fountains">Play fountains</string>
<string name="fab_label_hospitals">Hospitals</string>
<string name="fab_label_clsc">CLSC</string>
<!--Buttons-->
<string name="btn_ok">OK</string>
<string name="btn_retry">Retry</string>
......
......@@ -30,6 +30,28 @@
<item name="bb_tabXmlResource">@xml/bottombar_tabs</item>
</style>
<style name="FabMenu">
<item name="android:layout_gravity">bottom|end</item>
<item name="menu_fab_hide_animation">@anim/fab_slide_out_to_right</item>
<item name="menu_fab_show_animation">@anim/fab_slide_in_from_right</item>
<item name="menu_fab_size">normal</item>
<item name="menu_icon">@drawable/ic_map_layers</item>
</style>
<style name="FabMenuItem">
<item name="android:layout_margin">@dimen/fab_margin</item>
<item name="fab_size">mini</item>
<item name="fab_colorNormal">@color/fab_menu_item_color_normal</item>
</style>
<style name="FabMenuItem.WaterSupplies">
<item name="fab_colorPressed">@color/color_water_supplies</item>
</style>
<style name="FabMenuItem.Hospitals">
<item name="fab_colorPressed">@color/color_hospitals</item>
</style>
<style name="AboutPrimaryText">
<item name="android:layout_marginLeft">@dimen/padding_large</item>
<item name="android:textSize">@dimen/about_body_text_size</item>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment