Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed #1121 - Correct spacing between my location & bike-sharing button #1122

Closed
wants to merge 7 commits into from
Closed

Fixed #1121 - Correct spacing between my location & bike-sharing button #1122

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
830b5ad
Fix #1116 Html parsing.
amrhossamdev Feb 24, 2024
4a9e4e9
Merge branch 'OneBusAway:main' into main
amrhossamdev Feb 25, 2024
08fb250
Fix #1121 Correct Spacing Between myLocation & bike-sharing button
amrhossamdev Feb 25, 2024
281a101
Merge branch 'OneBusAway:main' into main
amrhossamdev Feb 26, 2024
9ed1a43
Added localhost testing ip for the emulator.
amrhossamdev Feb 26, 2024
a8be652
Merge branch 'OneBusAway:main' into main
amrhossamdev Feb 28, 2024
faea5d7
Update main.xml
amrhossamdev Feb 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
201 changes: 101 additions & 100 deletions onebusaway-android/src/main/res/layout/main.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,130 +12,130 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
<androidx.drawerlayout.widget.DrawerLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/nav_drawer_left_pane"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".HomeActivity">

<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/mainlayout"
android:orientation="vertical"
android:layout_width="fill_parent"
android:layout_height="fill_parent">
<androidx.drawerlayout.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/nav_drawer_left_pane"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".ui.HomeActivity">

<RelativeLayout
android:id="@+id/mainlayout"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:orientation="vertical">

<com.sothree.slidinguppanel.SlidingUpPanelLayout xmlns:sothree="http://schemas.android.com/apk/res-auto"
android:id="@+id/bottom_sliding_layout"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="bottom"
sothree:umanoFadeColor="@android:color/transparent"
sothree:umanoInitialState="hidden"
sothree:umanoPanelHeight="@dimen/arrival_header_height_two_arrivals"
sothree:umanoParallaxOffset="100dp"
sothree:umanoShadowHeight="5dp">

<com.sothree.slidinguppanel.SlidingUpPanelLayout
xmlns:sothree="http://schemas.android.com/apk/res-auto"
android:id="@+id/bottom_sliding_layout"
<!-- MAIN CONTENT -->
<RelativeLayout xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/main_content"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="bottom"
sothree:umanoPanelHeight="@dimen/arrival_header_height_two_arrivals"
sothree:umanoShadowHeight="5dp"
sothree:umanoParallaxOffset="100dp"
sothree:umanoFadeColor="@android:color/transparent"
sothree:umanoInitialState="hidden">

<!-- MAIN CONTENT -->
<RelativeLayout
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/main_content"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1">
android:layout_weight="1">
<!-- Fragment is added here programmatically -->
<RelativeLayout
android:id="@+id/main_fragment_container"
android:layout_width="match_parent"
android:layout_height="match_parent"/>
android:id="@+id/main_fragment_container"
android:layout_width="match_parent"
android:layout_height="match_parent" />
<!-- Floating Action Button for My Location, overlaid on map -->
<com.google.android.material.floatingactionbutton.FloatingActionButton
android:id="@+id/btnMyLocation"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_alignParentRight="true"
android:layout_marginRight="@dimen/fab_margin_horizontal"
android:layout_marginLeft="@dimen/fab_margin_horizontal"
android:layout_marginBottom="@dimen/fab_margin_vertical"
android:src="@drawable/ic_maps_my_location"
android:contentDescription="@string/map_option_mylocation"
app:elevation="6dp"
app:pressedTranslationZ="12dp"/>
android:id="@+id/btnMyLocation"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentEnd="true"
android:layout_alignParentBottom="true"
android:layout_marginLeft="@dimen/fab_margin_horizontal"
android:layout_marginRight="@dimen/fab_margin_horizontal"
android:layout_marginBottom="@dimen/fab_margin_vertical"
android:contentDescription="@string/map_option_mylocation"
android:src="@drawable/ic_maps_my_location"
app:elevation="6dp"
app:pressedTranslationZ="12dp" />

<!-- Zoom Buttons, overlaid on map -->
<LinearLayout
android:id="@+id/zoom_buttons_layout"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="horizontal" android:layout_centerHorizontal="true"
android:layout_alignBottom="@+id/btnMyLocation">
android:id="@+id/zoom_buttons_layout"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignBottom="@+id/btnMyLocation"
android:layout_centerHorizontal="true"
android:orientation="horizontal">

<ImageButton
android:id="@+id/btnZoomOut"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/zoom_btn_drop_shadow_left"
android:src="@drawable/zoom_out_button"/>
android:id="@+id/btnZoomOut"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/zoom_btn_drop_shadow_left"
android:src="@drawable/zoom_out_button" />

<ImageButton
android:id="@+id/btnZoomIn"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/zoom_btn_drop_shadow_right"
android:src="@drawable/zoom_in_button"/>
android:id="@+id/btnZoomIn"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/zoom_btn_drop_shadow_right"
android:src="@drawable/zoom_in_button" />

</LinearLayout>

<uk.co.markormesher.android_fab.FloatingActionButton
android:id="@+id/layersSpeedDial"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="bottom|end"
android:layout_marginBottom="72dp"
android:layout_alignParentBottom="true"
android:layout_alignParentRight="true"
android:drawable="@drawable/ic_layers_white_24dp"/>
android:id="@+id/layersSpeedDial"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentEnd="true"
android:layout_alignParentBottom="true"
android:layout_gravity="bottom|end"
android:layout_marginBottom="80dp"
android:drawable="@drawable/ic_layers_white_24dp" />

<!-- ROUTE MODE HEADER -->
<include android:id="@+id/route_info"
layout="@layout/route_info_head"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_alignParentTop="true"
android:layout_alignParentLeft="true"
android:visibility="gone"/>
<include
android:id="@+id/route_info"
layout="@layout/route_info_head"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_alignParentStart="true"
android:layout_alignParentTop="true"
android:visibility="gone" />

<ProgressBar
android:id="@+id/progress_horizontal"
style="@style/Base.Widget.AppCompat.ProgressBar.Horizontal"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="-7dp"
android:layout_below="@+id/route_info"
android:indeterminate="true"/>
android:id="@+id/progress_horizontal"
style="@style/Base.Widget.AppCompat.ProgressBar.Horizontal"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@+id/route_info"
android:layout_marginTop="-7dp"
android:indeterminate="true" />
</RelativeLayout>

<!-- BOTTOM SLIDING PANEL (FOR ROUTE AND STOP-RELATED LISTS) -->
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="#eeeeee"
android:orientation="vertical"
android:clickable="true"
android:focusable="false"
android:id="@+id/slidingPanel">
android:id="@+id/slidingPanel"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="#eeeeee"
android:clickable="true"
android:focusable="true"
android:orientation="vertical">

<!-- Header for bottom sliding panel -->
<include layout="@layout/arrivals_list_header"/>
<include layout="@layout/arrivals_list_header" />

<!-- Content of bottom sliding panel -->
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:id="@+id/slidingFragment"
android:orientation="horizontal">
android:id="@+id/slidingFragment"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="horizontal">
<!-- Fragment is added here programmatically -->
</LinearLayout>

Expand All @@ -145,11 +145,12 @@

<!-- The drawer is given a fixed width in dp and extends the full height of
the container. -->
<fragment android:id="@+id/navigation_drawer"
android:layout_width="@dimen/navigation_drawer_width"
android:layout_height="match_parent"
android:layout_gravity="start"
android:name="org.onebusaway.android.ui.NavigationDrawerFragment"
tools:layout="@layout/navigation_drawer"/>
<fragment
android:id="@+id/navigation_drawer"
android:name="org.onebusaway.android.ui.NavigationDrawerFragment"
android:layout_width="@dimen/navigation_drawer_width"
android:layout_height="match_parent"
android:layout_gravity="start"
tools:layout="@layout/navigation_drawer" />
</androidx.drawerlayout.widget.DrawerLayout>

4 changes: 2 additions & 2 deletions onebusaway-android/src/main/res/xml/network_security_config.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<network-security-config>
<domain-config cleartextTrafficPermitted="true">
<domain includeSubdomains="true">localhost</domain>
<domain includeSubdomains="true">10.0.2.2</domain>
</domain-config>
</network-security-config>
</network-security-config>
Loading