Skip to content

Commit 02ad3b2

Browse files
madhurgupta10neslihanturan
madhurgupta10
authored and
neslihanturan
committed
Fixed Padding for FAB in nearby commons-app#2779 (commons-app#2780)
* Fixed Padding for FAB in nearby commons-app#2779 * Fixed Padding for Location FAB in nearby * Fixed Extra Padding
1 parent 0289ae1 commit 02ad3b2

File tree

1 file changed

+135
-159
lines changed

1 file changed

+135
-159
lines changed

‎app/src/main/res/layout/fragment_nearby.xml

+135-159
Original file line numberDiff line numberDiff line change
@@ -1,182 +1,158 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<androidx.coordinatorlayout.widget.CoordinatorLayout
3-
xmlns:android="http://schemas.android.com/apk/res/android"
4-
xmlns:app="http://schemas.android.com/apk/res-auto"
5-
android:id="@+id/coordinator_layout"
2+
<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
3+
xmlns:app="http://schemas.android.com/apk/res-auto"
4+
android:id="@+id/coordinator_layout"
5+
android:layout_width="match_parent"
6+
android:layout_height="match_parent">
7+
8+
<RelativeLayout
69
android:layout_width="match_parent"
7-
android:layout_height="match_parent">
10+
android:layout_height="match_parent"
11+
android:background="@color/status_bar_blue">
812

9-
<RelativeLayout
13+
<LinearLayout
1014
android:layout_width="match_parent"
1115
android:layout_height="match_parent"
12-
android:background="@color/status_bar_blue"
13-
>
16+
android:layout_below="@id/toolbar"
17+
android:gravity="center_vertical"
18+
android:orientation="horizontal">
1419

15-
<LinearLayout
16-
android:layout_width="match_parent"
17-
android:layout_height="match_parent"
18-
android:layout_below="@id/toolbar"
19-
android:gravity="center_vertical"
20-
android:orientation="horizontal">
21-
22-
<ProgressBar
23-
android:id="@+id/progressBar"
24-
android:layout_width="match_parent"
25-
android:layout_height="wrap_content"
26-
27-
/>
28-
29-
<FrameLayout
30-
android:id="@+id/container"
31-
android:layout_width="match_parent"
32-
android:layout_height="match_parent" />
33-
</LinearLayout>
34-
35-
<View
36-
android:id="@+id/transparentView"
20+
<ProgressBar
21+
android:id="@+id/progressBar"
3722
android:layout_width="match_parent"
38-
android:layout_height="match_parent"
39-
android:layout_alignParentLeft="true"
40-
android:layout_below="@id/toolbar"
41-
android:background="#aa969696"
42-
android:elevation="6dp">
23+
android:layout_height="wrap_content"
4324

44-
</View>
25+
/>
4526

46-
<com.google.android.material.floatingactionbutton.FloatingActionButton
47-
android:id="@+id/fab_recenter"
48-
android:layout_width="wrap_content"
49-
android:layout_height="wrap_content"
50-
android:layout_alignParentEnd="true"
51-
android:layout_alignParentRight="true"
52-
android:layout_below="@+id/toolbar"
53-
android:layout_marginRight="12dp"
54-
android:layout_marginTop="6dp"
55-
android:clickable="true"
56-
android:visibility="invisible"
57-
app:backgroundTint="@color/main_background_light"
58-
app:elevation="6dp"
59-
app:fabSize="normal"
60-
app:layout_anchorGravity="top|right|end"
61-
app:srcCompat="@drawable/ic_my_location_black_24dp" />
62-
63-
64-
</RelativeLayout>
65-
66-
<include layout="@layout/bottom_sheet_nearby" />
67-
68-
<include
69-
android:id="@+id/bottom_sheet_details"
70-
layout="@layout/bottom_sheet_details" />
71-
72-
<Button
73-
android:id="@+id/search_this_area_button"
74-
android:layout_width="wrap_content"
75-
android:layout_height="wrap_content"
76-
android:layout_centerHorizontal="true"
77-
android:layout_gravity="center_horizontal"
78-
android:background="@color/white"
79-
android:singleLine="true"
80-
android:visibility="gone"
81-
app:elevation="6dp"
82-
android:layout_margin="8dp"
83-
android:padding="8dp"
84-
android:textColor="@color/status_bar_blue"
85-
android:text="@string/search_this_area" />
27+
<FrameLayout
28+
android:id="@+id/container"
29+
android:layout_width="match_parent"
30+
android:layout_height="match_parent" />
31+
</LinearLayout>
8632

87-
<ProgressBar
88-
android:id="@+id/search_this_area_button_progress_bar"
33+
<View
34+
android:id="@+id/transparentView"
8935
android:layout_width="match_parent"
90-
android:layout_height="wrap_content"
91-
android:layout_gravity="center"
92-
android:visibility="gone"
93-
/>
36+
android:layout_height="match_parent"
37+
android:layout_below="@id/toolbar"
38+
android:layout_alignParentLeft="true"
39+
android:background="#aa969696"
40+
android:elevation="6dp">
41+
42+
</View>
9443

9544
<com.google.android.material.floatingactionbutton.FloatingActionButton
96-
android:id="@+id/fab_plus"
45+
android:id="@+id/fab_recenter"
9746
android:layout_width="wrap_content"
9847
android:layout_height="wrap_content"
99-
android:layout_alignParentBottom="true"
48+
android:layout_below="@+id/toolbar"
10049
android:layout_alignParentEnd="true"
10150
android:layout_alignParentRight="true"
102-
android:layout_marginEnd="12dp"
103-
android:layout_marginRight="12dp"
10451
android:clickable="true"
10552
android:visibility="invisible"
106-
app:backgroundTint="@color/button_blue"
53+
app:backgroundTint="@color/main_background_light"
10754
app:elevation="6dp"
10855
app:fabSize="normal"
109-
app:layout_anchor="@id/bottom_sheet_details"
11056
app:layout_anchorGravity="top|right|end"
111-
app:pressedTranslationZ="12dp"
112-
app:srcCompat="@drawable/ic_add_white_24dp" />
113-
114-
<View
115-
android:id="@+id/empty_view2"
116-
android:layout_width="56dp"
117-
android:layout_height="306dip"
118-
android:visibility="invisible"
119-
app:layout_anchor="@id/fab_plus"
120-
app:layout_anchorGravity="center_horizontal" />
121-
122-
<View
123-
android:id="@+id/empty_view1"
124-
android:layout_width="56dp"
125-
android:layout_height="186dip"
126-
android:visibility="invisible"
127-
app:layout_anchor="@id/fab_plus"
128-
app:layout_anchorGravity="center_horizontal" />
129-
130-
<View
131-
android:id="@+id/empty_view"
132-
android:layout_width="56dp"
133-
android:layout_height="66dip"
134-
android:visibility="invisible"
135-
app:layout_anchor="@id/fab_plus"
136-
app:layout_anchorGravity="center_horizontal" />
137-
138-
<com.google.android.material.floatingactionbutton.FloatingActionButton
139-
android:id="@+id/fab_camera"
140-
android:layout_width="wrap_content"
141-
android:layout_height="wrap_content"
142-
android:scaleType="center"
143-
android:tint="@color/button_blue"
144-
android:visibility="invisible"
145-
app:backgroundTint="@color/main_background_light"
146-
app:elevation="6dp"
147-
app:fabSize="mini"
148-
app:layout_anchor="@id/empty_view1"
149-
app:layout_anchorGravity="center_horizontal"
150-
app:pressedTranslationZ="12dp"
151-
app:srcCompat="@drawable/ic_photo_camera_white_24dp" />
152-
153-
<com.google.android.material.floatingactionbutton.FloatingActionButton
154-
android:id="@+id/fab_gallery"
155-
android:layout_width="wrap_content"
156-
android:layout_height="wrap_content"
157-
android:scaleType="center"
158-
android:tint="@color/button_blue"
159-
android:visibility="invisible"
160-
app:backgroundTint="@color/main_background_light"
161-
app:elevation="6dp"
162-
app:fabSize="mini"
163-
app:layout_anchor="@id/empty_view"
164-
app:layout_anchorGravity="center_horizontal"
165-
app:pressedTranslationZ="12dp"
166-
app:srcCompat="@drawable/ic_photo_white_24dp" />
167-
168-
<com.google.android.material.floatingactionbutton.FloatingActionButton
169-
android:id="@+id/fab_commons_page"
170-
android:layout_width="wrap_content"
171-
android:layout_height="wrap_content"
172-
android:scaleType="center"
173-
android:visibility="invisible"
174-
app:backgroundTint="@color/main_background_light"
175-
app:elevation="6dp"
176-
app:fabSize="mini"
177-
app:layout_anchor="@id/empty_view2"
178-
app:layout_anchorGravity="center_horizontal"
179-
app:pressedTranslationZ="12dp"
180-
app:srcCompat="@drawable/ic_commons_icon_vector" />
181-
</androidx.coordinatorlayout.widget.CoordinatorLayout>
57+
app:srcCompat="@drawable/ic_my_location_black_24dp"
58+
app:useCompatPadding="true" />
59+
60+
61+
</RelativeLayout>
62+
63+
<include layout="@layout/bottom_sheet_nearby" />
64+
65+
<include
66+
android:id="@+id/bottom_sheet_details"
67+
layout="@layout/bottom_sheet_details" />
68+
69+
<Button
70+
android:id="@+id/search_this_area_button"
71+
android:layout_width="wrap_content"
72+
android:layout_height="wrap_content"
73+
android:layout_centerHorizontal="true"
74+
android:layout_gravity="center_horizontal"
75+
android:layout_margin="8dp"
76+
android:background="@color/white"
77+
android:padding="8dp"
78+
android:singleLine="true"
79+
android:text="@string/search_this_area"
80+
android:textColor="@color/status_bar_blue"
81+
android:visibility="gone"
82+
app:elevation="6dp" />
83+
84+
<ProgressBar
85+
android:id="@+id/search_this_area_button_progress_bar"
86+
android:layout_width="match_parent"
87+
android:layout_height="wrap_content"
88+
android:layout_gravity="center"
89+
android:visibility="gone" />
90+
91+
<com.google.android.material.floatingactionbutton.FloatingActionButton
92+
android:id="@+id/fab_plus"
93+
android:layout_width="wrap_content"
94+
android:layout_height="wrap_content"
95+
android:layout_alignParentEnd="true"
96+
android:layout_alignParentRight="true"
97+
android:layout_alignParentBottom="true"
98+
android:layout_marginEnd="12dp"
99+
android:layout_marginRight="12dp"
100+
android:clickable="true"
101+
android:visibility="invisible"
102+
app:backgroundTint="@color/button_blue"
103+
app:elevation="6dp"
104+
app:fabSize="normal"
105+
app:layout_anchor="@id/bottom_sheet_details"
106+
app:layout_anchorGravity="top|right|end"
107+
app:pressedTranslationZ="12dp"
108+
app:srcCompat="@drawable/ic_add_white_24dp"
109+
app:useCompatPadding="true" />
110+
111+
<View
112+
android:id="@+id/empty_view1"
113+
android:layout_width="56dp"
114+
android:layout_height="174dp"
115+
android:visibility="invisible"
116+
app:layout_anchor="@id/fab_plus"
117+
app:layout_anchorGravity="center_horizontal" />
118+
119+
<View
120+
android:id="@+id/empty_view"
121+
android:layout_width="56dp"
122+
android:layout_height="46dp"
123+
android:visibility="invisible"
124+
app:layout_anchor="@id/fab_plus"
125+
app:layout_anchorGravity="center_horizontal" />
126+
127+
<com.google.android.material.floatingactionbutton.FloatingActionButton
128+
android:id="@+id/fab_camera"
129+
android:layout_width="wrap_content"
130+
android:layout_height="wrap_content"
131+
android:scaleType="center"
132+
android:tint="@color/button_blue"
133+
android:visibility="invisible"
134+
app:backgroundTint="@color/main_background_light"
135+
app:elevation="6dp"
136+
app:fabSize="mini"
137+
app:layout_anchor="@id/empty_view1"
138+
app:layout_anchorGravity="center_horizontal"
139+
app:pressedTranslationZ="12dp"
140+
app:srcCompat="@drawable/ic_photo_camera_white_24dp" />
141+
142+
<com.google.android.material.floatingactionbutton.FloatingActionButton
143+
android:id="@+id/fab_gallery"
144+
android:layout_width="wrap_content"
145+
android:layout_height="wrap_content"
146+
android:scaleType="center"
147+
android:tint="@color/button_blue"
148+
android:visibility="invisible"
149+
app:backgroundTint="@color/main_background_light"
150+
app:elevation="6dp"
151+
app:fabSize="mini"
152+
app:layout_anchor="@id/empty_view"
153+
app:layout_anchorGravity="center_horizontal"
154+
app:pressedTranslationZ="12dp"
155+
app:srcCompat="@drawable/ic_photo_white_24dp" />
156+
157+
</androidx.coordinatorlayout.widget.CoordinatorLayout>
182158

0 commit comments

Comments
 (0)