mirror of
https://github.com/commons-app/apps-android-commons.git
synced 2025-10-28 13:23:58 +01:00
05e98307be
* Fixes #3303 * Refactor Nearby to alig lifecycle methods * Pass updated place list to listfragment * Added default zoom rate to mapbox * Removed NearbyListFragmet and added the ui login to handle the same in NearbyParentFragment * More code refactor * Make BottomSheetList hideable * onFragmentHide, hide the bottom sheets * BigFix, Fragmet visibility, register/un-register camera move based on fragments lifecycke * More code refactor * Let the ExecutorUtil have non-ui thread * Add Location Marker on non-ui thread (the non-ui stuffs) * BugFixes * Removed configchanges "orientation" from MainActivity in Manifest (That was messing with the fragment lifecycle) * Some null checks * Initialise lastknown location in onMapReady * UI Fixes * Adjusted UI to support dark and no-dark themes both (in nearby) * Do not update map on Location Slightly changed * Fix failing test case, let TestCommonsApplication extend Application instead of CommonsApplication * start map view when nearby is visible * start the map when NearbyFragmet is visible * More bugfixes * Added DUMMY view for NearbyPresenter's onDetach State * Added a wrapper frame layout parent for MapView to preven it from drawing above other views * More bugfixes (Fixes #3287) * Gray out the un-selected markers from the nearby filter list * BugFix, search this area should search the nearby places for the current camera position * More BugFixes * Handle null primitives with proxy * Current location marker flow via permission flow * onCameraMove should have null-check on NearbyController.latestSearchLocation instead of currentLocation * Search for places around last focus location * Handle location updates * If the user is browsing the map, donot update the map with current location
171 lines
No EOL
6.5 KiB
XML
171 lines
No EOL
6.5 KiB
XML
<?xml version="1.0" encoding="utf-8"?>
|
|
<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
|
xmlns:app="http://schemas.android.com/apk/res-auto"
|
|
android:id="@+id/coordinator_layout"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="match_parent">
|
|
|
|
<RelativeLayout
|
|
android:layout_width="match_parent"
|
|
android:layout_height="match_parent"
|
|
android:background="@color/status_bar_blue"
|
|
android:id="@+id/map_layout">
|
|
|
|
<include
|
|
layout="@layout/nearby_filter_all_items"
|
|
android:id="@+id/nearby_filter"/>
|
|
|
|
<include layout="@layout/nearby_filter_list"
|
|
android:id="@+id/nearby_filter_list"
|
|
android:layout_below="@id/nearby_filter"
|
|
android:layout_height="160dp"
|
|
android:layout_width="160dp"
|
|
android:layout_alignParentEnd="true"/>
|
|
|
|
|
|
<!-- I have done this intentionally, the mapview because of some elevation or something,
|
|
sometimes hangs over the drawer layout and sometimes draws its onPaused state over the contributions, this seems to be the probable fix -->
|
|
<FrameLayout
|
|
android:layout_width="match_parent"
|
|
android:layout_height="match_parent"
|
|
android:layout_below="@id/nearby_filter">
|
|
|
|
<com.mapbox.mapboxsdk.maps.MapView
|
|
android:id="@+id/map_view"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="match_parent" />
|
|
|
|
<View
|
|
android:layout_width="match_parent"
|
|
android:layout_height="match_parent"
|
|
android:background="@android:color/transparent" />
|
|
|
|
</FrameLayout>
|
|
|
|
|
|
<Button
|
|
android:id="@+id/search_this_area_button"
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
android:layout_centerHorizontal="true"
|
|
android:layout_gravity="center_horizontal"
|
|
android:layout_margin="8dp"
|
|
android:background="@color/white"
|
|
android:padding="8dp"
|
|
android:singleLine="true"
|
|
android:text="@string/search_this_area"
|
|
android:textColor="@color/status_bar_blue"
|
|
android:visibility="gone"
|
|
app:elevation="6dp"
|
|
android:layout_below="@id/nearby_filter"/>
|
|
|
|
<View
|
|
android:id="@+id/transparentView"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="match_parent"
|
|
android:layout_alignParentLeft="true"
|
|
android:background="#aa969696"
|
|
android:visibility="gone"
|
|
android:elevation="6dp">
|
|
|
|
</View>
|
|
|
|
<com.google.android.material.floatingactionbutton.FloatingActionButton
|
|
android:id="@+id/fab_recenter"
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
android:layout_alignParentEnd="true"
|
|
android:layout_alignParentRight="true"
|
|
android:layout_below="@id/nearby_filter"
|
|
android:clickable="true"
|
|
android:visibility="visible"
|
|
app:backgroundTint="@color/main_background_light"
|
|
app:elevation="6dp"
|
|
app:fabSize="normal"
|
|
app:layout_anchorGravity="top|right|end"
|
|
app:srcCompat="@drawable/ic_my_location_black_24dp"
|
|
app:useCompatPadding="true" />
|
|
|
|
</RelativeLayout>
|
|
|
|
<include layout="@layout/bottom_sheet_nearby" />
|
|
|
|
<include
|
|
android:id="@+id/bottom_sheet_details"
|
|
layout="@layout/bottom_sheet_details" />
|
|
|
|
<ProgressBar
|
|
android:id="@+id/map_progress_bar"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
android:layout_gravity="center"
|
|
app:elevation="6dp"
|
|
android:visibility="gone" />
|
|
|
|
<com.google.android.material.floatingactionbutton.FloatingActionButton
|
|
android:id="@+id/fab_plus"
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
android:layout_alignParentEnd="true"
|
|
android:layout_alignParentRight="true"
|
|
android:layout_alignParentBottom="true"
|
|
android:layout_marginEnd="12dp"
|
|
android:layout_marginRight="12dp"
|
|
android:clickable="true"
|
|
android:visibility="invisible"
|
|
app:backgroundTint="@color/button_blue"
|
|
app:elevation="8dp"
|
|
app:fabSize="normal"
|
|
app:layout_anchor="@id/bottom_sheet_details"
|
|
app:layout_anchorGravity="top|right|end"
|
|
app:pressedTranslationZ="12dp"
|
|
app:srcCompat="@drawable/ic_add_white_24dp"
|
|
app:useCompatPadding="true" />
|
|
|
|
<View
|
|
android:id="@+id/empty_view1"
|
|
android:layout_width="56dp"
|
|
android:layout_height="174dp"
|
|
android:visibility="invisible"
|
|
app:layout_anchor="@id/fab_plus"
|
|
app:layout_anchorGravity="center_horizontal" />
|
|
|
|
<View
|
|
android:id="@+id/empty_view"
|
|
android:layout_width="56dp"
|
|
android:layout_height="46dp"
|
|
android:visibility="invisible"
|
|
app:layout_anchor="@id/fab_plus"
|
|
app:layout_anchorGravity="center_horizontal" />
|
|
|
|
<com.google.android.material.floatingactionbutton.FloatingActionButton
|
|
android:id="@+id/fab_camera"
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
android:scaleType="center"
|
|
android:tint="@color/button_blue"
|
|
android:visibility="invisible"
|
|
app:backgroundTint="@color/main_background_light"
|
|
app:elevation="6dp"
|
|
app:fabSize="mini"
|
|
app:layout_anchor="@id/empty_view1"
|
|
app:layout_anchorGravity="center_horizontal"
|
|
app:pressedTranslationZ="12dp"
|
|
app:srcCompat="@drawable/ic_photo_camera_white_24dp" />
|
|
|
|
<com.google.android.material.floatingactionbutton.FloatingActionButton
|
|
android:id="@+id/fab_gallery"
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
android:scaleType="center"
|
|
android:tint="@color/button_blue"
|
|
android:visibility="invisible"
|
|
app:backgroundTint="@color/main_background_light"
|
|
app:elevation="6dp"
|
|
app:fabSize="mini"
|
|
app:layout_anchor="@id/empty_view"
|
|
app:layout_anchorGravity="center_horizontal"
|
|
app:pressedTranslationZ="12dp"
|
|
app:srcCompat="@drawable/ic_photo_white_24dp" />
|
|
|
|
</androidx.coordinatorlayout.widget.CoordinatorLayout> |