FAB for variables and functions view

android-app/src/main/res/layout/history_fragment.xml

@@ -22,18 +22,18 @@
   ~ Site:  http://se.solovyev.org
   -->
 
-<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
-	xmlns:fab="http://schemas.android.com/apk/res-auto"
+<LinearLayout
 	a:id="@+id/main_fragment_layout"
 	style="?cpp_fragment_layout_style"
+	xmlns:a="http://schemas.android.com/apk/res/android"
 	a:layout_width="match_parent"
 	a:layout_height="match_parent">
 
 	<TextView
 		a:id="@+id/fragment_title"
-		a:layout_height="wrap_content"
+		style="?cpp_fragment_title_style"
 		a:layout_width="match_parent"
-		style="?cpp_fragment_title_style" />
+		a:layout_height="wrap_content" />
 
 	<include layout="@layout/ad" />
 
@@ -45,13 +45,7 @@
 
 		<com.melnykov.fab.FloatingActionButton
 			a:id="@+id/fab"
-			a:layout_width="wrap_content"
-			a:layout_height="wrap_content"
-			a:layout_gravity="bottom|right"
-			a:layout_margin="16dp"
-			a:src="@drawable/ic_delete_white_36dp"
-			fab:fab_colorNormal="@color/cpp_metro_button"
-			fab:fab_colorPressed="@color/cpp_metro_button"
-			fab:fab_colorRipple="?attr/colorControlHighlight" />
+			style="@style/Fab"
+			a:src="@drawable/ic_delete_white_36dp" />
 	</FrameLayout>
 </LinearLayout>

android-app/src/main/res/layout/math_entities_fragment.xml

@@ -22,20 +22,31 @@
   ~ Site:  http://se.solovyev.org
   -->
 
-<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
-			  a:id="@+id/main_fragment_layout"
-			  style="?cpp_fragment_layout_style"
-			  a:layout_width="match_parent"
-			  a:layout_height="match_parent">
+<LinearLayout
+	a:id="@+id/main_fragment_layout"
+	style="?cpp_fragment_layout_style"
+	xmlns:a="http://schemas.android.com/apk/res/android"
+	a:layout_width="match_parent"
+	a:layout_height="match_parent">
 
 	<TextView
-			a:id="@+id/fragment_title"
-			a:layout_height="wrap_content"
-			a:layout_width="match_parent"
-			style="?cpp_fragment_title_style"/>
+		a:id="@+id/fragment_title"
+		style="?cpp_fragment_title_style"
+		a:layout_width="match_parent"
+		a:layout_height="wrap_content" />
 
-	<include layout="@layout/ad"/>
+	<include layout="@layout/ad" />
 
-	<ListView style="@style/ListView"/>
+	<FrameLayout
+		a:layout_width="match_parent"
+		a:layout_height="match_parent">
 
+		<ListView style="@style/ListView" />
+
+		<com.melnykov.fab.FloatingActionButton
+			a:id="@+id/fab"
+			style="@style/Fab"
+			a:src="@drawable/ic_add_white_36dp"
+			a:visibility="gone" />
+	</FrameLayout>
 </LinearLayout>

android-app/src/main/res/layout/vars_fragment.xml

@@ -22,20 +22,31 @@
   ~ Site:  http://se.solovyev.org
   -->
 
-<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
-			  a:id="@+id/main_fragment_layout"
-			  style="?cpp_fragment_layout_style"
-			  a:layout_width="match_parent"
-			  a:layout_height="match_parent">
+<LinearLayout
+	a:id="@+id/main_fragment_layout"
+	style="?cpp_fragment_layout_style"
+	xmlns:a="http://schemas.android.com/apk/res/android"
+	a:layout_width="match_parent"
+	a:layout_height="match_parent">
 
 	<TextView
-			a:id="@+id/fragment_title"
-			a:layout_height="wrap_content"
-			a:layout_width="match_parent"
-			style="?cpp_fragment_title_style"/>
+		a:id="@+id/fragment_title"
+		style="?cpp_fragment_title_style"
+		a:layout_width="match_parent"
+		a:layout_height="wrap_content" />
 
-	<include layout="@layout/ad"/>
+	<include layout="@layout/ad" />
 
-	<ListView style="@style/ListView"/>
+	<FrameLayout
+		a:layout_width="match_parent"
+		a:layout_height="match_parent">
+
+		<ListView style="@style/ListView" />
+
+		<com.melnykov.fab.FloatingActionButton
+			a:id="@+id/fab"
+			style="@style/Fab"
+			a:src="@drawable/ic_add_white_36dp" />
+	</FrameLayout>
 
 </LinearLayout>

android-app/src/main/res/menu/functions_menu.xml

@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
-  ~ Copyright 2013 serso aka se.solovyev
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~    http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  ~
-  ~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-  ~ Contact details
-  ~
-  ~ Email: se.solovyev@gmail.com
-  ~ Site:  http://se.solovyev.org
-  -->
-
-<menu xmlns:a="http://schemas.android.com/apk/res/android">
-
-	<item
-			a:id="@+id/menu_functions_add_function"
-			a:title="@string/c_add"
-			a:icon="@drawable/ab_plus"
-			a:showAsAction="always"/>
-</menu>

android-app/src/main/res/menu/vars_menu.xml

@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
-  ~ Copyright 2013 serso aka se.solovyev
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~    http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  ~
-  ~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-  ~ Contact details
-  ~
-  ~ Email: se.solovyev@gmail.com
-  ~ Site:  http://se.solovyev.org
-  -->
-
-<menu xmlns:a="http://schemas.android.com/apk/res/android">
-
-	<item
-			a:id="@+id/menu_vars_add_var"
-			a:title="@string/c_add"
-			a:icon="@drawable/ab_plus"
-			a:showAsAction="always"/>
-</menu>

android-app/src/main/res/values/theme_gray.xml

@@ -58,6 +58,16 @@
 		<item name="android:gravity">center_vertical|left</item>
 	</style>
 
+	<style name="Fab">
+		<item name="android:layout_width">wrap_content</item>
+		<item name="android:layout_height">wrap_content</item>
+		<item name="android:layout_gravity">bottom|end</item>
+		<item name="android:layout_margin">16dp</item>
+		<item name="fab_colorNormal">@color/cpp_metro_button</item>
+		<item name="fab_colorPressed">@color/cpp_metro_button</item>
+		<item name="fab_colorRipple">?attr/colorControlHighlight</item>
+	</style>
+
 	<style name="ListView">
 		<item name="android:id">@android:id/list</item>
 		<item name="android:dividerHeight">1px</item>