robin.thoni
/
sts-saguenay-android
Watch 1
Star 0
Fork 0
Code Issues 0 Pull Requests 0 Releases 2 Wiki Activity
Browse Source

moved fab above ads

tags/v1.0.0
Robin Thoni 8 years ago
parent
38907ccca7
commit
30cd963757
3 changed files with 58 additions and 58 deletions
Split View Show Diff Stats
  1. 1
    1
      app/build.gradle
  2. 0
    57
      app/src/main/res/layout/app_bar_main.xml
  3. 57
    0
      app/src/main/res/layout/content_main.xml

+ 1
- 1
app/build.gradle View File 

@@ -13,7 +13,7 @@ android {
13 13 
         minSdkVersion 15
14 14 
         targetSdkVersion 23
15 15 
         versionCode 1
16 
-        versionName "1.0"
16 
+        versionName "1.0.0"
17 17 
         multiDexEnabled true
18 18 
     }
19 19 
     buildTypes {

+ 0
- 57
app/src/main/res/layout/app_bar_main.xml View File 

@@ -4,7 +4,6 @@
4 4 
                                                  xmlns:tools="http://schemas.android.com/tools"
5 5 
                                                  android:layout_width="match_parent"
6 6 
                                                  android:layout_height="match_parent"
7 
-                                                 xmlns:fab="http://schemas.android.com/apk/res-auto"
8 7 
                                                  android:fitsSystemWindows="true"
9 8 
                                                  tools:context=".ui.activities.MainActivity">
10 9 
 
@@ -24,60 +23,4 @@
24 23
25 24 
     <include layout="@layout/content_main" />
26 25
27 
-    <com.github.clans.fab.FloatingActionMenu
28 
-        android:id="@+id/fab"
29 
-        android:layout_width="match_parent"
30 
-        android:layout_height="match_parent"
31 
-        android:layout_alignParentBottom="true"
32 
-        fab:menu_fab_size="normal"
33 
-        fab:menu_showShadow="true"
34 
-        fab:menu_shadowColor="#66000000"
35 
-        fab:menu_shadowRadius="4dp"
36 
-        fab:menu_shadowXOffset="1dp"
37 
-        fab:menu_shadowYOffset="3dp"
38 
-        fab:menu_colorNormal="#DA4336"
39 
-        fab:menu_colorPressed="#E75043"
40 
-        fab:menu_colorRipple="#99FFFFFF"
41 
-        fab:menu_animationDelayPerItem="50"
42 
-        fab:menu_buttonSpacing="0dp"
43 
-        fab:menu_labels_margin="0dp"
44 
-        fab:menu_labels_showAnimation="@anim/fab_slide_in_from_right"
45 
-        fab:menu_labels_hideAnimation="@anim/fab_slide_out_to_right"
46 
-        fab:menu_labels_paddingRight="8dp"
47 
-        fab:menu_labels_paddingBottom="4dp"
48 
-        fab:menu_labels_padding="8dp"
49 
-        fab:menu_labels_textColor="#FFFFFF"
50 
-        fab:menu_labels_textSize="14sp"
51 
-        fab:menu_labels_cornerRadius="3dp"
52 
-        fab:menu_labels_colorNormal="#333333"
53 
-        fab:menu_labels_colorPressed="#444444"
54 
-        fab:menu_labels_colorRipple="#66FFFFFF"
55 
-        fab:menu_labels_showShadow="true"
56 
-        fab:menu_labels_singleLine="false"
57 
-        fab:menu_labels_ellipsize="none"
58 
-        fab:menu_labels_maxLines="-1"
59 
-        fab:menu_labels_position="left"
60 
-        fab:menu_openDirection="up"
61 
-        fab:menu_backgroundColor="@android:color/transparent"
62 
-        fab:menu_fab_label="@string/stop_add"
63 
-        app:menu_icon="@drawable/ic_add_white_24dp">
64 
-
65 
-        <com.github.clans.fab.FloatingActionButton
66 
-            android:id="@+id/fab_item_add_map"
67 
-            android:layout_width="wrap_content"
68 
-            android:layout_height="wrap_content"
69 
-            android:src="@drawable/ic_map_white_24dp"
70 
-            fab:fab_size="mini"
71 
-            fab:fab_label="@string/stop_add_map" />
72 
-
73 
-        <com.github.clans.fab.FloatingActionButton
74 
-            android:id="@+id/fab_item_add_list"
75 
-            android:layout_width="wrap_content"
76 
-            android:layout_height="wrap_content"
77 
-            android:src="@drawable/ic_dehaze_white_24dp"
78 
-            fab:fab_size="mini"
79 
-            fab:fab_label="@string/stop_add_list" />
80 
-
81 
-    </com.github.clans.fab.FloatingActionMenu>
82 
-
83 26 
 </android.support.design.widget.CoordinatorLayout>

+ 57
- 0
app/src/main/res/layout/content_main.xml View File 

@@ -4,6 +4,7 @@
4 4 
     xmlns:app="http://schemas.android.com/apk/res-auto"
5 5 
     xmlns:tools="http://schemas.android.com/tools"
6 6 
     xmlns:ads="http://schemas.android.com/apk/res-auto"
7 
+    xmlns:fab="http://schemas.android.com/apk/res-auto"
7 8 
     android:layout_width="match_parent"
8 9 
     android:layout_height="match_parent"
9 10 
     android:paddingBottom="@dimen/activity_vertical_margin"
 
@@ -21,6 +22,62 @@
21 22 
         android:layout_above="@+id/adView">
22 23 
     </FrameLayout>
23 24
25 
+    <com.github.clans.fab.FloatingActionMenu
26 
+        android:id="@+id/fab"
27 
+        android:layout_width="match_parent"
28 
+        android:layout_height="match_parent"
29 
+        fab:menu_fab_size="normal"
30 
+        fab:menu_showShadow="true"
31 
+        fab:menu_shadowColor="#66000000"
32 
+        fab:menu_shadowRadius="4dp"
33 
+        fab:menu_shadowXOffset="1dp"
34 
+        fab:menu_shadowYOffset="3dp"
35 
+        fab:menu_colorNormal="#DA4336"
36 
+        fab:menu_colorPressed="#E75043"
37 
+        fab:menu_colorRipple="#99FFFFFF"
38 
+        fab:menu_animationDelayPerItem="50"
39 
+        fab:menu_buttonSpacing="0dp"
40 
+        fab:menu_labels_margin="0dp"
41 
+        fab:menu_labels_showAnimation="@anim/fab_slide_in_from_right"
42 
+        fab:menu_labels_hideAnimation="@anim/fab_slide_out_to_right"
43 
+        fab:menu_labels_paddingRight="8dp"
44 
+        fab:menu_labels_paddingBottom="4dp"
45 
+        fab:menu_labels_padding="8dp"
46 
+        fab:menu_labels_textColor="#FFFFFF"
47 
+        fab:menu_labels_textSize="14sp"
48 
+        fab:menu_labels_cornerRadius="3dp"
49 
+        fab:menu_labels_colorNormal="#333333"
50 
+        fab:menu_labels_colorPressed="#444444"
51 
+        fab:menu_labels_colorRipple="#66FFFFFF"
52 
+        fab:menu_labels_showShadow="true"
53 
+        fab:menu_labels_singleLine="false"
54 
+        fab:menu_labels_ellipsize="none"
55 
+        fab:menu_labels_maxLines="-1"
56 
+        fab:menu_labels_position="left"
57 
+        fab:menu_openDirection="up"
58 
+        fab:menu_backgroundColor="@android:color/transparent"
59 
+        fab:menu_fab_label="@string/stop_add"
60 
+        app:menu_icon="@drawable/ic_add_white_24dp"
61 
+        android:layout_above="@+id/adView">
62 
+
63 
+        <com.github.clans.fab.FloatingActionButton
64 
+            android:id="@+id/fab_item_add_map"
65 
+            android:layout_width="wrap_content"
66 
+            android:layout_height="wrap_content"
67 
+            android:src="@drawable/ic_map_white_24dp"
68 
+            fab:fab_size="mini"
69 
+            fab:fab_label="@string/stop_add_map" />
70 
+
71 
+        <com.github.clans.fab.FloatingActionButton
72 
+            android:id="@+id/fab_item_add_list"
73 
+            android:layout_width="wrap_content"
74 
+            android:layout_height="wrap_content"
75 
+            android:src="@drawable/ic_dehaze_white_24dp"
76 
+            fab:fab_size="mini"
77 
+            fab:fab_label="@string/stop_add_list" />
78 
+
79 
+    </com.github.clans.fab.FloatingActionMenu>
80 
+
24 81 
     <com.google.android.gms.ads.AdView
25 82 
         android:id="@+id/adView"
26 83 
         android:layout_width="wrap_content"

Write Preview
Loading…
Cancel
Save