Add application mode slider
14
OsmAnd/res/anim/grow_from_bottom.xml
Normal file
|
@ -0,0 +1,14 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<set xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<scale
|
||||
android:fromXScale="0.3" android:toXScale="1.0"
|
||||
android:fromYScale="0.3" android:toYScale="1.0"
|
||||
android:pivotX="50%" android:pivotY="100%"
|
||||
android:duration="@android:integer/config_shortAnimTime"
|
||||
/>
|
||||
<alpha
|
||||
android:interpolator="@android:anim/decelerate_interpolator"
|
||||
android:fromAlpha="0.0" android:toAlpha="1.0"
|
||||
android:duration="@android:integer/config_shortAnimTime"
|
||||
/>
|
||||
</set>
|
14
OsmAnd/res/anim/grow_from_bottomleft_to_topright.xml
Normal file
|
@ -0,0 +1,14 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<set xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<scale
|
||||
android:fromXScale="0.3" android:toXScale="1.0"
|
||||
android:fromYScale="0.3" android:toYScale="1.0"
|
||||
android:pivotX="0%" android:pivotY="50%"
|
||||
android:duration="@android:integer/config_shortAnimTime"
|
||||
/>
|
||||
<alpha
|
||||
android:interpolator="@android:anim/decelerate_interpolator"
|
||||
android:fromAlpha="0.0" android:toAlpha="1.0"
|
||||
android:duration="@android:integer/config_shortAnimTime"
|
||||
/>
|
||||
</set>
|
14
OsmAnd/res/anim/grow_from_bottomright_to_topleft.xml
Normal file
|
@ -0,0 +1,14 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<set xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<scale
|
||||
android:fromXScale="0.3" android:toXScale="1.0"
|
||||
android:fromYScale="0.3" android:toYScale="1.0"
|
||||
android:pivotX="100%" android:pivotY="50%"
|
||||
android:duration="@android:integer/config_shortAnimTime"
|
||||
/>
|
||||
<alpha
|
||||
android:interpolator="@android:anim/decelerate_interpolator"
|
||||
android:fromAlpha="0.0" android:toAlpha="1.0"
|
||||
android:duration="@android:integer/config_shortAnimTime"
|
||||
/>
|
||||
</set>
|
14
OsmAnd/res/anim/grow_from_top.xml
Normal file
|
@ -0,0 +1,14 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<set xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<scale
|
||||
android:fromXScale="0.3" android:toXScale="1.0"
|
||||
android:fromYScale="0.3" android:toYScale="1.0"
|
||||
android:pivotX="50%" android:pivotY="0%"
|
||||
android:duration="@android:integer/config_shortAnimTime"
|
||||
/>
|
||||
<alpha
|
||||
android:interpolator="@android:anim/decelerate_interpolator"
|
||||
android:fromAlpha="0.0" android:toAlpha="1.0"
|
||||
android:duration="@android:integer/config_shortAnimTime"
|
||||
/>
|
||||
</set>
|
14
OsmAnd/res/anim/grow_from_topleft_to_bottomright.xml
Normal file
|
@ -0,0 +1,14 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<set xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<scale
|
||||
android:fromXScale="0.3" android:toXScale="1.0"
|
||||
android:fromYScale="0.3" android:toYScale="1.0"
|
||||
android:pivotX="0%" android:pivotY="0%"
|
||||
android:duration="@android:integer/config_shortAnimTime"
|
||||
/>
|
||||
<alpha
|
||||
android:interpolator="@android:anim/decelerate_interpolator"
|
||||
android:fromAlpha="0.0" android:toAlpha="1.0"
|
||||
android:duration="@android:integer/config_shortAnimTime"
|
||||
/>
|
||||
</set>
|
14
OsmAnd/res/anim/grow_from_topright_to_bottomleft.xml
Normal file
|
@ -0,0 +1,14 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<set xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<scale
|
||||
android:fromXScale="0.3" android:toXScale="1.0"
|
||||
android:fromYScale="0.3" android:toYScale="1.0"
|
||||
android:pivotX="100%" android:pivotY="0%"
|
||||
android:duration="@android:integer/config_shortAnimTime"
|
||||
/>
|
||||
<alpha
|
||||
android:interpolator="@android:anim/decelerate_interpolator"
|
||||
android:fromAlpha="0.0" android:toAlpha="1.0"
|
||||
android:duration="@android:integer/config_shortAnimTime"
|
||||
/>
|
||||
</set>
|
7
OsmAnd/res/anim/rail.xml
Normal file
|
@ -0,0 +1,7 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
|
||||
<translate
|
||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:fromXDelta="100%p"
|
||||
android:toXDelta="0"
|
||||
android:duration="325" />
|
14
OsmAnd/res/anim/shrink_from_bottom.xml
Normal file
|
@ -0,0 +1,14 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<set xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<scale
|
||||
android:fromXScale="1.0" android:toXScale="0.3"
|
||||
android:fromYScale="1.0" android:toYScale="0.3"
|
||||
android:pivotX="50%" android:pivotY="0%"
|
||||
android:duration="@android:integer/config_shortAnimTime"
|
||||
/>
|
||||
<alpha
|
||||
android:interpolator="@android:anim/accelerate_interpolator"
|
||||
android:fromAlpha="1.0" android:toAlpha="0.0"
|
||||
android:duration="@android:integer/config_shortAnimTime"
|
||||
/>
|
||||
</set>
|
14
OsmAnd/res/anim/shrink_from_bottomleft_to_topright.xml
Normal file
|
@ -0,0 +1,14 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<set xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<scale
|
||||
android:fromXScale="1.0" android:toXScale="0.3"
|
||||
android:fromYScale="1.0" android:toYScale="0.3"
|
||||
android:pivotX="100%" android:pivotY="0%"
|
||||
android:duration="@android:integer/config_shortAnimTime"
|
||||
/>
|
||||
<alpha
|
||||
android:interpolator="@android:anim/accelerate_interpolator"
|
||||
android:fromAlpha="1.0" android:toAlpha="0.0"
|
||||
android:duration="@android:integer/config_shortAnimTime"
|
||||
/>
|
||||
</set>
|
14
OsmAnd/res/anim/shrink_from_bottomright_to_topleft.xml
Normal file
|
@ -0,0 +1,14 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<set xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<scale
|
||||
android:fromXScale="1.0" android:toXScale="0.3"
|
||||
android:fromYScale="1.0" android:toYScale="0.3"
|
||||
android:pivotX="0%" android:pivotY="0%"
|
||||
android:duration="@android:integer/config_shortAnimTime"
|
||||
/>
|
||||
<alpha
|
||||
android:interpolator="@android:anim/accelerate_interpolator"
|
||||
android:fromAlpha="1.0" android:toAlpha="0.0"
|
||||
android:duration="@android:integer/config_shortAnimTime"
|
||||
/>
|
||||
</set>
|
14
OsmAnd/res/anim/shrink_from_top.xml
Normal file
|
@ -0,0 +1,14 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<set xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<scale
|
||||
android:fromXScale="1.0" android:toXScale="0.3"
|
||||
android:fromYScale="1.0" android:toYScale="0.3"
|
||||
android:pivotX="50%" android:pivotY="100%"
|
||||
android:duration="@android:integer/config_shortAnimTime"
|
||||
/>
|
||||
<alpha
|
||||
android:interpolator="@android:anim/accelerate_interpolator"
|
||||
android:fromAlpha="1.0" android:toAlpha="0.0"
|
||||
android:duration="@android:integer/config_shortAnimTime"
|
||||
/>
|
||||
</set>
|
14
OsmAnd/res/anim/shrink_from_topleft_to_bottomright.xml
Normal file
|
@ -0,0 +1,14 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<set xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<scale
|
||||
android:fromXScale="1.0" android:toXScale="0.3"
|
||||
android:fromYScale="1.0" android:toYScale="0.3"
|
||||
android:pivotX="100%" android:pivotY="100%"
|
||||
android:duration="@android:integer/config_shortAnimTime"
|
||||
/>
|
||||
<alpha
|
||||
android:interpolator="@android:anim/accelerate_interpolator"
|
||||
android:fromAlpha="1.0" android:toAlpha="0.0"
|
||||
android:duration="@android:integer/config_shortAnimTime"
|
||||
/>
|
||||
</set>
|
14
OsmAnd/res/anim/shrink_from_topright_to_bottomleft.xml
Normal file
|
@ -0,0 +1,14 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<set xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<scale
|
||||
android:fromXScale="1.0" android:toXScale="0.3"
|
||||
android:fromYScale="1.0" android:toYScale="0.3"
|
||||
android:pivotX="0%" android:pivotY="100%"
|
||||
android:duration="@android:integer/config_shortAnimTime"
|
||||
/>
|
||||
<alpha
|
||||
android:interpolator="@android:anim/accelerate_interpolator"
|
||||
android:fromAlpha="1.0" android:toAlpha="0.0"
|
||||
android:duration="@android:integer/config_shortAnimTime"
|
||||
/>
|
||||
</set>
|
BIN
OsmAnd/res/drawable-hdpi/ic_accept.png
Normal file
After Width: | Height: | Size: 4.2 KiB |
BIN
OsmAnd/res/drawable-hdpi/ic_add.png
Normal file
After Width: | Height: | Size: 3.7 KiB |
BIN
OsmAnd/res/drawable-hdpi/ic_list_more.png
Normal file
After Width: | Height: | Size: 432 B |
BIN
OsmAnd/res/drawable-hdpi/ic_list_more_selected.png
Normal file
After Width: | Height: | Size: 410 B |
BIN
OsmAnd/res/drawable-hdpi/ic_up.png
Normal file
After Width: | Height: | Size: 4 KiB |
BIN
OsmAnd/res/drawable-hdpi/quickaction_arrow_down.png
Normal file
After Width: | Height: | Size: 383 B |
BIN
OsmAnd/res/drawable-hdpi/quickaction_arrow_up.png
Normal file
After Width: | Height: | Size: 466 B |
BIN
OsmAnd/res/drawable-hdpi/quickaction_background.png
Normal file
After Width: | Height: | Size: 1.2 KiB |
BIN
OsmAnd/res/drawable-hdpi/quickaction_bottom_frame.9.png
Normal file
After Width: | Height: | Size: 318 B |
BIN
OsmAnd/res/drawable-hdpi/quickaction_slider_btn_normal.9.png
Normal file
After Width: | Height: | Size: 493 B |
BIN
OsmAnd/res/drawable-hdpi/quickaction_slider_btn_on.9.png
Normal file
After Width: | Height: | Size: 1.1 KiB |
BIN
OsmAnd/res/drawable-hdpi/quickaction_slider_btn_pressed.9.png
Normal file
After Width: | Height: | Size: 323 B |
BIN
OsmAnd/res/drawable-hdpi/quickaction_slider_btn_selected.9.png
Normal file
After Width: | Height: | Size: 356 B |
BIN
OsmAnd/res/drawable-hdpi/quickaction_slider_grip_left.png
Normal file
After Width: | Height: | Size: 752 B |
BIN
OsmAnd/res/drawable-hdpi/quickaction_slider_grip_right.png
Normal file
After Width: | Height: | Size: 763 B |
BIN
OsmAnd/res/drawable-hdpi/quickaction_top_frame.9.png
Normal file
After Width: | Height: | Size: 313 B |
BIN
OsmAnd/res/drawable-hdpi/textfield_default.9.png
Normal file
After Width: | Height: | Size: 3.6 KiB |
BIN
OsmAnd/res/drawable/ic_accept.png
Normal file
After Width: | Height: | Size: 2.6 KiB |
BIN
OsmAnd/res/drawable/ic_add.png
Normal file
After Width: | Height: | Size: 2.3 KiB |
BIN
OsmAnd/res/drawable/ic_list_more.png
Normal file
After Width: | Height: | Size: 328 B |
BIN
OsmAnd/res/drawable/ic_list_more_selected.png
Normal file
After Width: | Height: | Size: 318 B |
BIN
OsmAnd/res/drawable/ic_up.png
Normal file
After Width: | Height: | Size: 2.4 KiB |
BIN
OsmAnd/res/drawable/quickaction_arrow_down.png
Normal file
After Width: | Height: | Size: 326 B |
BIN
OsmAnd/res/drawable/quickaction_arrow_up.png
Normal file
After Width: | Height: | Size: 320 B |
BIN
OsmAnd/res/drawable/quickaction_bottom_frame.9.png
Normal file
After Width: | Height: | Size: 247 B |
BIN
OsmAnd/res/drawable/quickaction_slider_background.png
Normal file
After Width: | Height: | Size: 968 B |
31
OsmAnd/res/drawable/quickaction_slider_btn.xml
Normal file
|
@ -0,0 +1,31 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!-- Copyright (C) 2009 The Android Open Source Project
|
||||
|
||||
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.
|
||||
-->
|
||||
|
||||
<selector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:dither="true">
|
||||
|
||||
<item android:state_checked="true"
|
||||
android:drawable="@drawable/quickaction_slider_btn_on" />
|
||||
<item android:state_window_focused="false"
|
||||
android:drawable="@drawable/quickaction_slider_btn_normal" />
|
||||
<item android:state_pressed="true"
|
||||
android:drawable="@drawable/quickaction_slider_btn_pressed" />
|
||||
<item android:state_focused="true"
|
||||
android:drawable="@drawable/quickaction_slider_btn_selected" />
|
||||
<item
|
||||
android:drawable="@drawable/quickaction_slider_btn_normal" />
|
||||
|
||||
</selector>
|
BIN
OsmAnd/res/drawable/quickaction_slider_btn_normal.9.png
Normal file
After Width: | Height: | Size: 420 B |
BIN
OsmAnd/res/drawable/quickaction_slider_btn_on.9.png
Normal file
After Width: | Height: | Size: 927 B |
BIN
OsmAnd/res/drawable/quickaction_slider_btn_pressed.9.png
Normal file
After Width: | Height: | Size: 273 B |
BIN
OsmAnd/res/drawable/quickaction_slider_btn_selected.9.png
Normal file
After Width: | Height: | Size: 292 B |
BIN
OsmAnd/res/drawable/quickaction_slider_grip_left.png
Normal file
After Width: | Height: | Size: 752 B |
BIN
OsmAnd/res/drawable/quickaction_slider_grip_right.png
Normal file
After Width: | Height: | Size: 779 B |
BIN
OsmAnd/res/drawable/quickaction_top_frame.9.png
Normal file
After Width: | Height: | Size: 260 B |
BIN
OsmAnd/res/drawable/textfield_default.9.png
Normal file
After Width: | Height: | Size: 758 B |
28
OsmAnd/res/layout/action_item.xml
Normal file
|
@ -0,0 +1,28 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<LinearLayout
|
||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:orientation="vertical"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:gravity="center_vertical|center_horizontal"
|
||||
android:paddingTop="0dip"
|
||||
android:paddingBottom="0dip"
|
||||
android:paddingLeft="20dip"
|
||||
android:paddingRight="20dip"
|
||||
android:clickable="true"
|
||||
android:background="@drawable/quickaction_slider_btn">
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/icon"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"/>
|
||||
|
||||
<TextView
|
||||
android:id="@+id/title"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="fill_parent"
|
||||
android:gravity="center_vertical|center_horizontal"
|
||||
android:textSize="12sp"
|
||||
android:textColor="#666"/>
|
||||
|
||||
</LinearLayout>
|
66
OsmAnd/res/layout/quickaction.xml
Normal file
|
@ -0,0 +1,66 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content">
|
||||
|
||||
<FrameLayout
|
||||
android:layout_marginTop="10dip"
|
||||
android:id="@+id/header2"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:background="@drawable/quickaction_top_frame"/>
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/arrow_up"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:src="@drawable/quickaction_arrow_up" />
|
||||
|
||||
<HorizontalScrollView
|
||||
android:id="@+id/scroll"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:fadingEdgeLength="0dip"
|
||||
android:layout_below="@id/header2"
|
||||
android:paddingLeft="1dip"
|
||||
android:background="@drawable/quickaction_slider_background"
|
||||
android:scrollbars="none">
|
||||
|
||||
<LinearLayout
|
||||
android:id="@+id/tracks"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:paddingTop="4dip"
|
||||
android:paddingBottom="4dip"
|
||||
android:orientation="horizontal">
|
||||
|
||||
<ImageView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:src="@drawable/quickaction_slider_grip_left" />
|
||||
|
||||
<ImageView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:src="@drawable/quickaction_slider_grip_right" />
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
</HorizontalScrollView>
|
||||
|
||||
<FrameLayout
|
||||
android:id="@+id/footer"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_below="@id/scroll"
|
||||
android:background="@drawable/quickaction_bottom_frame" />
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/arrow_down"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="-1dip"
|
||||
android:layout_below="@id/footer"
|
||||
android:src="@drawable/quickaction_arrow_down" />
|
||||
|
||||
</RelativeLayout>
|
|
@ -554,7 +554,7 @@
|
|||
<string name="choose_available_region">Choose region from list</string>
|
||||
<string name="choose_intersected_street">Choose intersecting street</string>
|
||||
<string name="Closest_Amenities">Closest amenities</string>
|
||||
<string name="app_mode_default">Default (also sets default values)</string>
|
||||
<string name="app_mode_default">Default</string>
|
||||
<string name="app_mode_car">Car</string>
|
||||
<string name="app_mode_bicycle">Bicycle</string>
|
||||
<string name="app_mode_pedestrian">Pedestrian</string>
|
||||
|
|
|
@ -6,5 +6,42 @@
|
|||
<item name="android:windowBackground">@color/color_transparent</item>
|
||||
<item name="android:windowContentOverlay">@null</item>
|
||||
<item name="android:backgroundDimEnabled">false</item>
|
||||
</style>
|
||||
</resources>
|
||||
</style>
|
||||
<style name="Animations" />
|
||||
|
||||
<!-- PopDownMenu -->
|
||||
<style name="Animations.PopDownMenu" />
|
||||
|
||||
<style name="Animations.PopDownMenu.Left">
|
||||
<item name="@android:windowEnterAnimation">@anim/grow_from_topleft_to_bottomright</item>
|
||||
<item name="@android:windowExitAnimation">@anim/shrink_from_bottomright_to_topleft</item>
|
||||
</style>
|
||||
|
||||
<style name="Animations.PopDownMenu.Right">
|
||||
<item name="@android:windowEnterAnimation">@anim/grow_from_topright_to_bottomleft</item>
|
||||
<item name="@android:windowExitAnimation">@anim/shrink_from_bottomleft_to_topright</item>
|
||||
</style>
|
||||
|
||||
<style name="Animations.PopDownMenu.Center">
|
||||
<item name="@android:windowEnterAnimation">@anim/grow_from_top</item>
|
||||
<item name="@android:windowExitAnimation">@anim/shrink_from_bottom</item>
|
||||
</style>
|
||||
|
||||
<!-- PopUpMenu -->
|
||||
<style name="Animations.PopUpMenu" />
|
||||
|
||||
<style name="Animations.PopUpMenu.Left">
|
||||
<item name="@android:windowEnterAnimation">@anim/grow_from_bottomleft_to_topright</item>
|
||||
<item name="@android:windowExitAnimation">@anim/shrink_from_topright_to_bottomleft</item>
|
||||
</style>
|
||||
|
||||
<style name="Animations.PopUpMenu.Right">
|
||||
<item name="@android:windowEnterAnimation">@anim/grow_from_bottomright_to_topleft</item>
|
||||
<item name="@android:windowExitAnimation">@anim/shrink_from_topleft_to_bottomright</item>
|
||||
</style>
|
||||
|
||||
<style name="Animations.PopUpMenu.Center">
|
||||
<item name="@android:windowEnterAnimation">@anim/grow_from_bottom</item>
|
||||
<item name="@android:windowExitAnimation">@anim/shrink_from_top</item>
|
||||
</style>
|
||||
</resources>
|
||||
|
|
131
OsmAnd/src/net/londatiga/android/ActionItem.java
Normal file
|
@ -0,0 +1,131 @@
|
|||
/**
|
||||
* Lorensius W. L. T
|
||||
*
|
||||
* http://www.londatiga.net
|
||||
*
|
||||
* lorenz@londatiga.net
|
||||
*/
|
||||
|
||||
package net.londatiga.android;
|
||||
|
||||
import android.graphics.drawable.Drawable;
|
||||
import android.graphics.Bitmap;
|
||||
|
||||
import android.view.View.OnClickListener;
|
||||
|
||||
/**
|
||||
* Action item, displayed as menu with icon and text.
|
||||
*
|
||||
* @author Lorensius. W. L. T
|
||||
*
|
||||
*/
|
||||
public class ActionItem {
|
||||
private Drawable icon;
|
||||
private Bitmap thumb;
|
||||
private String title;
|
||||
private boolean selected;
|
||||
private OnClickListener listener;
|
||||
|
||||
/**
|
||||
* Constructor
|
||||
*/
|
||||
public ActionItem() {}
|
||||
|
||||
/**
|
||||
* Constructor
|
||||
*
|
||||
* @param icon {@link Drawable} action icon
|
||||
*/
|
||||
public ActionItem(Drawable icon) {
|
||||
this.icon = icon;
|
||||
}
|
||||
|
||||
/**
|
||||
* Set action title
|
||||
*
|
||||
* @param title action title
|
||||
*/
|
||||
public void setTitle(String title) {
|
||||
this.title = title;
|
||||
}
|
||||
|
||||
/**
|
||||
* Get action title
|
||||
*
|
||||
* @return action title
|
||||
*/
|
||||
public String getTitle() {
|
||||
return this.title;
|
||||
}
|
||||
|
||||
/**
|
||||
* Set action icon
|
||||
*
|
||||
* @param icon {@link Drawable} action icon
|
||||
*/
|
||||
public void setIcon(Drawable icon) {
|
||||
this.icon = icon;
|
||||
}
|
||||
|
||||
/**
|
||||
* Get action icon
|
||||
* @return {@link Drawable} action icon
|
||||
*/
|
||||
public Drawable getIcon() {
|
||||
return this.icon;
|
||||
}
|
||||
|
||||
/**
|
||||
* Set on click listener
|
||||
*
|
||||
* @param listener on click listener {@link View.OnClickListener}
|
||||
*/
|
||||
public void setOnClickListener(OnClickListener listener) {
|
||||
this.listener = listener;
|
||||
}
|
||||
|
||||
/**
|
||||
* Get on click listener
|
||||
*
|
||||
* @return on click listener {@link View.OnClickListener}
|
||||
*/
|
||||
public OnClickListener getListener() {
|
||||
return this.listener;
|
||||
}
|
||||
|
||||
/**
|
||||
* Set selected flag;
|
||||
*
|
||||
* @param selected Flag to indicate the item is selected
|
||||
*/
|
||||
public void setSelected(boolean selected) {
|
||||
this.selected = selected;
|
||||
}
|
||||
|
||||
/**
|
||||
* Check if item is selected
|
||||
*
|
||||
* @return true or false
|
||||
*/
|
||||
public boolean isSelected() {
|
||||
return this.selected;
|
||||
}
|
||||
|
||||
/**
|
||||
* Set thumb
|
||||
*
|
||||
* @param thumb Thumb image
|
||||
*/
|
||||
public void setThumb(Bitmap thumb) {
|
||||
this.thumb = thumb;
|
||||
}
|
||||
|
||||
/**
|
||||
* Get thumb image
|
||||
*
|
||||
* @return Thumb image
|
||||
*/
|
||||
public Bitmap getThumb() {
|
||||
return this.thumb;
|
||||
}
|
||||
}
|
222
OsmAnd/src/net/londatiga/android/CustomPopupWindow.java
Normal file
|
@ -0,0 +1,222 @@
|
|||
/**
|
||||
* Lorensius W. L. T
|
||||
*
|
||||
* http://www.londatiga.net
|
||||
*
|
||||
* lorenz@londatiga.net
|
||||
*/
|
||||
|
||||
|
||||
package net.londatiga.android;
|
||||
|
||||
import net.osmand.plus.R;
|
||||
import android.content.Context;
|
||||
|
||||
import android.graphics.Rect;
|
||||
import android.graphics.drawable.BitmapDrawable;
|
||||
import android.graphics.drawable.Drawable;
|
||||
|
||||
import android.view.Gravity;
|
||||
import android.view.LayoutInflater;
|
||||
import android.view.MotionEvent;
|
||||
import android.view.View;
|
||||
import android.view.View.OnTouchListener;
|
||||
import android.view.ViewGroup.LayoutParams;
|
||||
import android.view.WindowManager;
|
||||
|
||||
import android.widget.PopupWindow;
|
||||
|
||||
/**
|
||||
* This class does most of the work of wrapping the {@link PopupWindow} so it's simpler to use.
|
||||
* Edited by Lorensius. W. L. T
|
||||
*
|
||||
* @author qberticus
|
||||
*
|
||||
*/
|
||||
public class CustomPopupWindow {
|
||||
protected final View anchor;
|
||||
protected final PopupWindow window;
|
||||
private View root;
|
||||
private Drawable background = null;
|
||||
protected final WindowManager windowManager;
|
||||
|
||||
/**
|
||||
* Create a QuickAction
|
||||
*
|
||||
* @param anchor
|
||||
* the view that the QuickAction will be displaying 'from'
|
||||
*/
|
||||
public CustomPopupWindow(View anchor) {
|
||||
this.anchor = anchor;
|
||||
this.window = new PopupWindow(anchor.getContext());
|
||||
|
||||
// when a touch even happens outside of the window
|
||||
// make the window go away
|
||||
window.setTouchInterceptor(new OnTouchListener() {
|
||||
@Override
|
||||
public boolean onTouch(View v, MotionEvent event) {
|
||||
if (event.getAction() == MotionEvent.ACTION_OUTSIDE) {
|
||||
CustomPopupWindow.this.window.dismiss();
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
});
|
||||
|
||||
windowManager = (WindowManager) anchor.getContext().getSystemService(Context.WINDOW_SERVICE);
|
||||
|
||||
onCreate();
|
||||
}
|
||||
|
||||
/**
|
||||
* Anything you want to have happen when created. Probably should create a view and setup the event listeners on
|
||||
* child views.
|
||||
*/
|
||||
protected void onCreate() {}
|
||||
|
||||
/**
|
||||
* In case there is stuff to do right before displaying.
|
||||
*/
|
||||
protected void onShow() {}
|
||||
|
||||
protected void preShow() {
|
||||
if (root == null) {
|
||||
throw new IllegalStateException("setContentView was not called with a view to display.");
|
||||
}
|
||||
|
||||
onShow();
|
||||
|
||||
if (background == null) {
|
||||
window.setBackgroundDrawable(new BitmapDrawable());
|
||||
} else {
|
||||
window.setBackgroundDrawable(background);
|
||||
}
|
||||
|
||||
// if using PopupWindow#setBackgroundDrawable this is the only values of the width and hight that make it work
|
||||
// otherwise you need to set the background of the root viewgroup
|
||||
// and set the popupwindow background to an empty BitmapDrawable
|
||||
|
||||
window.setWidth(WindowManager.LayoutParams.WRAP_CONTENT);
|
||||
window.setHeight(WindowManager.LayoutParams.WRAP_CONTENT);
|
||||
window.setTouchable(true);
|
||||
window.setFocusable(true);
|
||||
window.setOutsideTouchable(true);
|
||||
|
||||
window.setContentView(root);
|
||||
}
|
||||
|
||||
public void setBackgroundDrawable(Drawable background) {
|
||||
this.background = background;
|
||||
}
|
||||
|
||||
/**
|
||||
* Sets the content view. Probably should be called from {@link onCreate}
|
||||
*
|
||||
* @param root
|
||||
* the view the popup will display
|
||||
*/
|
||||
public void setContentView(View root) {
|
||||
this.root = root;
|
||||
|
||||
window.setContentView(root);
|
||||
}
|
||||
|
||||
/**
|
||||
* Will inflate and set the view from a resource id
|
||||
*
|
||||
* @param layoutResID
|
||||
*/
|
||||
public void setContentView(int layoutResID) {
|
||||
LayoutInflater inflator =
|
||||
(LayoutInflater) anchor.getContext().getSystemService(Context.LAYOUT_INFLATER_SERVICE);
|
||||
|
||||
setContentView(inflator.inflate(layoutResID, null));
|
||||
}
|
||||
|
||||
/**
|
||||
* If you want to do anything when {@link dismiss} is called
|
||||
*
|
||||
* @param listener
|
||||
*/
|
||||
public void setOnDismissListener(PopupWindow.OnDismissListener listener) {
|
||||
window.setOnDismissListener(listener);
|
||||
}
|
||||
|
||||
/**
|
||||
* Displays like a popdown menu from the anchor view
|
||||
*/
|
||||
public void showDropDown() {
|
||||
showDropDown(0, 0);
|
||||
}
|
||||
|
||||
/**
|
||||
* Displays like a popdown menu from the anchor view.
|
||||
*
|
||||
* @param xOffset
|
||||
* offset in X direction
|
||||
* @param yOffset
|
||||
* offset in Y direction
|
||||
*/
|
||||
public void showDropDown(int xOffset, int yOffset) {
|
||||
preShow();
|
||||
|
||||
window.setAnimationStyle(R.style.Animations_PopDownMenu_Left);
|
||||
|
||||
window.showAsDropDown(anchor, xOffset, yOffset);
|
||||
}
|
||||
|
||||
/**
|
||||
* Displays like a QuickAction from the anchor view.
|
||||
*/
|
||||
public void showLikeQuickAction() {
|
||||
showLikeQuickAction(0, 0);
|
||||
}
|
||||
|
||||
/**
|
||||
* Displays like a QuickAction from the anchor view.
|
||||
*
|
||||
* @param xOffset
|
||||
* offset in the X direction
|
||||
* @param yOffset
|
||||
* offset in the Y direction
|
||||
*/
|
||||
public void showLikeQuickAction(int xOffset, int yOffset) {
|
||||
preShow();
|
||||
|
||||
window.setAnimationStyle(R.style.Animations_PopUpMenu_Center);
|
||||
|
||||
int[] location = new int[2];
|
||||
anchor.getLocationOnScreen(location);
|
||||
|
||||
Rect anchorRect =
|
||||
new Rect(location[0], location[1], location[0] + anchor.getWidth(), location[1]
|
||||
+ anchor.getHeight());
|
||||
|
||||
root.setLayoutParams(new LayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT));
|
||||
root.measure(LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT);
|
||||
|
||||
int rootWidth = root.getMeasuredWidth();
|
||||
int rootHeight = root.getMeasuredHeight();
|
||||
|
||||
int screenWidth = windowManager.getDefaultDisplay().getWidth();
|
||||
//int screenHeight = windowManager.getDefaultDisplay().getHeight();
|
||||
|
||||
int xPos = ((screenWidth - rootWidth) / 2) + xOffset;
|
||||
int yPos = anchorRect.top - rootHeight + yOffset;
|
||||
|
||||
// display on bottom
|
||||
if (rootHeight > anchor.getTop()) {
|
||||
yPos = anchorRect.bottom + yOffset;
|
||||
|
||||
window.setAnimationStyle(R.style.Animations_PopDownMenu_Center);
|
||||
}
|
||||
|
||||
window.showAtLocation(anchor, Gravity.NO_GRAVITY, xPos, yPos);
|
||||
}
|
||||
|
||||
public void dismiss() {
|
||||
window.dismiss();
|
||||
}
|
||||
}
|
278
OsmAnd/src/net/londatiga/android/QuickAction.java
Normal file
|
@ -0,0 +1,278 @@
|
|||
/**
|
||||
* Lorensius W. L. T
|
||||
*
|
||||
* http://www.londatiga.net
|
||||
*
|
||||
* lorenz@londatiga.net
|
||||
*/
|
||||
package net.londatiga.android;
|
||||
|
||||
import android.content.Context;
|
||||
|
||||
import android.graphics.Rect;
|
||||
import android.graphics.drawable.Drawable;
|
||||
|
||||
import android.widget.ImageView;
|
||||
import android.widget.TextView;
|
||||
import android.widget.LinearLayout;
|
||||
|
||||
import android.view.Gravity;
|
||||
import android.view.LayoutInflater;
|
||||
import android.view.View;
|
||||
import android.view.View.OnClickListener;
|
||||
import android.view.ViewGroup.LayoutParams;
|
||||
import android.view.animation.Animation;
|
||||
import android.view.animation.AnimationUtils;
|
||||
import android.view.animation.Interpolator;
|
||||
import android.view.ViewGroup;
|
||||
|
||||
import java.util.ArrayList;
|
||||
|
||||
import net.osmand.plus.R;
|
||||
|
||||
/**
|
||||
* Popup window, shows action list as icon and text (QuickContact / Twitter app).
|
||||
*
|
||||
* @author Lorensius. W. T
|
||||
*/
|
||||
public class QuickAction extends CustomPopupWindow {
|
||||
private final View root;
|
||||
private final ImageView mArrowUp;
|
||||
private final ImageView mArrowDown;
|
||||
private final Animation mTrackAnim;
|
||||
private final LayoutInflater inflater;
|
||||
private final Context context;
|
||||
|
||||
public static final int ANIM_GROW_FROM_LEFT = 1;
|
||||
public static final int ANIM_GROW_FROM_RIGHT = 2;
|
||||
public static final int ANIM_GROW_FROM_CENTER = 3;
|
||||
public static final int ANIM_AUTO = 4;
|
||||
|
||||
private int animStyle;
|
||||
private boolean animateTrack;
|
||||
private ViewGroup mTrack;
|
||||
private ArrayList<ActionItem> actionList;
|
||||
|
||||
/**
|
||||
* Constructor
|
||||
*
|
||||
* @param anchor {@link View} on where the popup should be displayed
|
||||
*/
|
||||
public QuickAction(View anchor) {
|
||||
super(anchor);
|
||||
|
||||
actionList = new ArrayList<ActionItem>();
|
||||
context = anchor.getContext();
|
||||
inflater = (LayoutInflater) context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
|
||||
|
||||
root = (ViewGroup) inflater.inflate(R.layout.quickaction, null);
|
||||
|
||||
mArrowDown = (ImageView) root.findViewById(R.id.arrow_down);
|
||||
mArrowUp = (ImageView) root.findViewById(R.id.arrow_up);
|
||||
|
||||
setContentView(root);
|
||||
|
||||
mTrackAnim = AnimationUtils.loadAnimation(anchor.getContext(), R.anim.rail);
|
||||
|
||||
mTrackAnim.setInterpolator(new Interpolator() {
|
||||
public float getInterpolation(float t) {
|
||||
// Pushes past the target area, then snaps back into place.
|
||||
// Equation for graphing: 1.2-((x*1.6)-1.1)^2
|
||||
final float inner = (t * 1.55f) - 1.1f;
|
||||
|
||||
return 1.2f - inner * inner;
|
||||
}
|
||||
});
|
||||
|
||||
mTrack = (ViewGroup) root.findViewById(R.id.tracks);
|
||||
animStyle = ANIM_AUTO;
|
||||
animateTrack = true;
|
||||
}
|
||||
|
||||
/**
|
||||
* Animate track
|
||||
*
|
||||
* @param animateTrack flag to animate track
|
||||
*/
|
||||
public void animateTrack(boolean animateTrack) {
|
||||
this.animateTrack = animateTrack;
|
||||
}
|
||||
|
||||
/**
|
||||
* Set animation style
|
||||
*
|
||||
* @param animStyle animation style, default is set to ANIM_AUTO
|
||||
*/
|
||||
public void setAnimStyle(int animStyle) {
|
||||
this.animStyle = animStyle;
|
||||
}
|
||||
|
||||
/**
|
||||
* Add action item
|
||||
*
|
||||
* @param action {@link ActionItem}
|
||||
*/
|
||||
public void addActionItem(ActionItem action) {
|
||||
actionList.add(action);
|
||||
}
|
||||
|
||||
/**
|
||||
* Show popup window
|
||||
*/
|
||||
public void show () {
|
||||
preShow();
|
||||
|
||||
int[] location = new int[2];
|
||||
|
||||
anchor.getLocationOnScreen(location);
|
||||
|
||||
Rect anchorRect = new Rect(location[0], location[1], location[0] + anchor.getWidth(), location[1]
|
||||
+ anchor.getHeight());
|
||||
|
||||
root.setLayoutParams(new LayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT));
|
||||
root.measure(LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT);
|
||||
|
||||
int rootWidth = root.getMeasuredWidth();
|
||||
int rootHeight = root.getMeasuredHeight();
|
||||
|
||||
int screenWidth = windowManager.getDefaultDisplay().getWidth();
|
||||
//int screenHeight = windowManager.getDefaultDisplay().getHeight();
|
||||
|
||||
int xPos = (screenWidth - rootWidth) / 2;
|
||||
int yPos = anchorRect.top - rootHeight;
|
||||
|
||||
boolean onTop = true;
|
||||
|
||||
// display on bottom
|
||||
if (rootHeight > anchor.getTop()) {
|
||||
yPos = anchorRect.bottom;
|
||||
onTop = false;
|
||||
}
|
||||
|
||||
showArrow(((onTop) ? R.id.arrow_down : R.id.arrow_up), anchorRect.centerX());
|
||||
|
||||
setAnimationStyle(screenWidth, anchorRect.centerX(), onTop);
|
||||
|
||||
createActionList();
|
||||
|
||||
window.showAtLocation(this.anchor, Gravity.NO_GRAVITY, xPos, yPos);
|
||||
|
||||
if (animateTrack) mTrack.startAnimation(mTrackAnim);
|
||||
}
|
||||
|
||||
/**
|
||||
* Set animation style
|
||||
*
|
||||
* @param screenWidth Screen width
|
||||
* @param requestedX distance from left screen
|
||||
* @param onTop flag to indicate where the popup should be displayed. Set TRUE if displayed on top of anchor and vice versa
|
||||
*/
|
||||
private void setAnimationStyle(int screenWidth, int requestedX, boolean onTop) {
|
||||
int arrowPos = requestedX - mArrowUp.getMeasuredWidth()/2;
|
||||
|
||||
switch (animStyle) {
|
||||
case ANIM_GROW_FROM_LEFT:
|
||||
window.setAnimationStyle((onTop) ? R.style.Animations_PopUpMenu_Left : R.style.Animations_PopDownMenu_Left);
|
||||
break;
|
||||
|
||||
case ANIM_GROW_FROM_RIGHT:
|
||||
window.setAnimationStyle((onTop) ? R.style.Animations_PopUpMenu_Right : R.style.Animations_PopDownMenu_Right);
|
||||
break;
|
||||
|
||||
case ANIM_GROW_FROM_CENTER:
|
||||
window.setAnimationStyle((onTop) ? R.style.Animations_PopUpMenu_Center : R.style.Animations_PopDownMenu_Center);
|
||||
break;
|
||||
|
||||
case ANIM_AUTO:
|
||||
if (arrowPos <= screenWidth/4) {
|
||||
window.setAnimationStyle((onTop) ? R.style.Animations_PopUpMenu_Left : R.style.Animations_PopDownMenu_Left);
|
||||
} else if (arrowPos > screenWidth/4 && arrowPos < 3 * (screenWidth/4)) {
|
||||
window.setAnimationStyle((onTop) ? R.style.Animations_PopUpMenu_Center : R.style.Animations_PopDownMenu_Center);
|
||||
} else {
|
||||
window.setAnimationStyle((onTop) ? R.style.Animations_PopDownMenu_Right : R.style.Animations_PopDownMenu_Right);
|
||||
}
|
||||
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Create action list
|
||||
*
|
||||
*/
|
||||
private void createActionList() {
|
||||
View view;
|
||||
String title;
|
||||
Drawable icon;
|
||||
OnClickListener listener;
|
||||
int index = 1;
|
||||
|
||||
for (int i = 0; i < actionList.size(); i++) {
|
||||
title = actionList.get(i).getTitle();
|
||||
icon = actionList.get(i).getIcon();
|
||||
listener = actionList.get(i).getListener();
|
||||
|
||||
view = getActionItem(title, icon, listener);
|
||||
|
||||
view.setFocusable(true);
|
||||
view.setClickable(true);
|
||||
|
||||
mTrack.addView(view, index);
|
||||
|
||||
index++;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Get action item {@link View}
|
||||
*
|
||||
* @param title action item title
|
||||
* @param icon {@link Drawable} action item icon
|
||||
* @param listener {@link View.OnClickListener} action item listener
|
||||
* @return action item {@link View}
|
||||
*/
|
||||
private View getActionItem(String title, Drawable icon, OnClickListener listener) {
|
||||
LinearLayout container = (LinearLayout) inflater.inflate(R.layout.action_item, null);
|
||||
ImageView img = (ImageView) container.findViewById(R.id.icon);
|
||||
TextView text = (TextView) container.findViewById(R.id.title);
|
||||
|
||||
if (icon != null) {
|
||||
img.setImageDrawable(icon);
|
||||
} else {
|
||||
img.setVisibility(View.GONE);
|
||||
}
|
||||
|
||||
if (title != null) {
|
||||
text.setText(title);
|
||||
} else {
|
||||
text.setVisibility(View.GONE);
|
||||
}
|
||||
|
||||
if (listener != null) {
|
||||
container.setOnClickListener(listener);
|
||||
}
|
||||
|
||||
return container;
|
||||
}
|
||||
|
||||
/**
|
||||
* Show arrow
|
||||
*
|
||||
* @param whichArrow arrow type resource id
|
||||
* @param requestedX distance from left screen
|
||||
*/
|
||||
private void showArrow(int whichArrow, int requestedX) {
|
||||
final View showArrow = (whichArrow == R.id.arrow_up) ? mArrowUp : mArrowDown;
|
||||
final View hideArrow = (whichArrow == R.id.arrow_up) ? mArrowDown : mArrowUp;
|
||||
|
||||
final int arrowWidth = mArrowUp.getMeasuredWidth();
|
||||
|
||||
showArrow.setVisibility(View.VISIBLE);
|
||||
|
||||
ViewGroup.MarginLayoutParams param = (ViewGroup.MarginLayoutParams)showArrow.getLayoutParams();
|
||||
|
||||
param.leftMargin = requestedX - arrowWidth / 2;
|
||||
|
||||
hideArrow.setVisibility(View.INVISIBLE);
|
||||
}
|
||||
}
|
|
@ -289,23 +289,25 @@ public class MapActivity extends Activity implements IMapLocationListener, Senso
|
|||
}
|
||||
|
||||
|
||||
public void backToMainMenu(){
|
||||
final Dialog dlg = new Dialog(this, R.style.Dialog_Fullscreen);
|
||||
final View view = (View) getLayoutInflater().inflate(R.layout.menu, null);
|
||||
view.setBackgroundColor(Color.argb(200, 150, 150, 150));
|
||||
dlg.setContentView(view);
|
||||
MainMenuActivity.onCreateMainMenu(dlg.getWindow(), this);
|
||||
|
||||
|
||||
public void backToMainMenu() {
|
||||
final Dialog dlg = new Dialog(this, R.style.Dialog_Fullscreen);
|
||||
final View menuView = (View) getLayoutInflater().inflate(R.layout.menu, null);
|
||||
menuView.setBackgroundColor(Color.argb(200, 150, 150, 150));
|
||||
dlg.setContentView(menuView);
|
||||
MainMenuActivity.onCreateMainMenu(dlg.getWindow(), this);
|
||||
Animation anim = new Animation() {
|
||||
@Override
|
||||
protected void applyTransformation(float interpolatedTime, Transformation t) {
|
||||
ColorDrawable colorDraw = ((ColorDrawable) view.getBackground());
|
||||
ColorDrawable colorDraw = ((ColorDrawable) menuView.getBackground());
|
||||
colorDraw.setAlpha((int) (interpolatedTime * 200));
|
||||
}
|
||||
};
|
||||
anim.setDuration(700);
|
||||
anim.setInterpolator(new AccelerateInterpolator());
|
||||
view.setAnimation(anim);
|
||||
|
||||
menuView.setAnimation(anim);
|
||||
|
||||
View showMap = dlg.findViewById(R.id.MapButton);
|
||||
showMap.setOnClickListener(new OnClickListener() {
|
||||
@Override
|
||||
|
@ -322,7 +324,7 @@ public class MapActivity extends Activity implements IMapLocationListener, Senso
|
|||
dlg.dismiss();
|
||||
}
|
||||
});
|
||||
|
||||
|
||||
View favouritesButton = dlg.findViewById(R.id.FavoritesButton);
|
||||
favouritesButton.setOnClickListener(new OnClickListener() {
|
||||
@Override
|
||||
|
@ -333,13 +335,13 @@ public class MapActivity extends Activity implements IMapLocationListener, Senso
|
|||
dlg.dismiss();
|
||||
}
|
||||
});
|
||||
|
||||
|
||||
View closeButton = dlg.findViewById(R.id.CloseButton);
|
||||
closeButton.setOnClickListener(new OnClickListener() {
|
||||
@Override
|
||||
public void onClick(View v) {
|
||||
dlg.dismiss();
|
||||
|
||||
|
||||
getMyApplication().closeApplication();
|
||||
// 1. Work for almost all cases when user open apps from main menu
|
||||
Intent newIntent = new Intent(MapActivity.this, MainMenuActivity.class);
|
||||
|
@ -347,14 +349,14 @@ public class MapActivity extends Activity implements IMapLocationListener, Senso
|
|||
newIntent.putExtra(MainMenuActivity.APP_EXIT_KEY, MainMenuActivity.APP_EXIT_CODE);
|
||||
startActivity(newIntent);
|
||||
// 2. good analogue but user will come back to the current activity onResume()
|
||||
// so application is not reloaded !!!
|
||||
// so application is not reloaded !!!
|
||||
// moveTaskToBack(true);
|
||||
// 3. bad results if user comes from favorites
|
||||
//MapActivity.this.setResult(MainMenuActivity.APP_EXIT_CODE);
|
||||
//MapActivity.this.finish();
|
||||
// MapActivity.this.setResult(MainMenuActivity.APP_EXIT_CODE);
|
||||
// MapActivity.this.finish();
|
||||
}
|
||||
});
|
||||
|
||||
|
||||
View searchButton = dlg.findViewById(R.id.SearchButton);
|
||||
searchButton.setOnClickListener(new OnClickListener() {
|
||||
@Override
|
||||
|
@ -365,19 +367,19 @@ public class MapActivity extends Activity implements IMapLocationListener, Senso
|
|||
dlg.dismiss();
|
||||
}
|
||||
});
|
||||
view.setOnClickListener(new OnClickListener() {
|
||||
|
||||
menuView.setOnClickListener(new OnClickListener() {
|
||||
|
||||
@Override
|
||||
public void onClick(View v) {
|
||||
dlg.dismiss();
|
||||
}
|
||||
});
|
||||
|
||||
|
||||
dlg.show();
|
||||
// Intent newIntent = new Intent(MapActivity.this, MainMenuActivity.class);
|
||||
//newIntent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
|
||||
// startActivity(newIntent);
|
||||
}
|
||||
// newIntent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
|
||||
// startActivity(newIntent);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean onKeyDown(int keyCode, KeyEvent event) {
|
||||
|
@ -726,7 +728,7 @@ public class MapActivity extends Activity implements IMapLocationListener, Senso
|
|||
getMyApplication().getResourceManager().setBusyIndicator(null);
|
||||
}
|
||||
|
||||
private void updateApplicationModeSettings(){
|
||||
public void updateApplicationModeSettings(){
|
||||
boolean currentShowingAngle = settings.SHOW_VIEW_ANGLE.get();
|
||||
int currentMapRotation = settings.ROTATE_MAP.get();
|
||||
if(currentMapRotation == OsmandSettings.ROTATE_MAP_NONE){
|
||||
|
|
|
@ -1,5 +1,7 @@
|
|||
package net.osmand.plus.views;
|
||||
|
||||
import net.londatiga.android.ActionItem;
|
||||
import net.londatiga.android.QuickAction;
|
||||
import net.osmand.OsmAndFormatter;
|
||||
import net.osmand.osm.MapUtils;
|
||||
import net.osmand.plus.R;
|
||||
|
@ -19,6 +21,7 @@ import android.util.DisplayMetrics;
|
|||
import android.view.Gravity;
|
||||
import android.view.View;
|
||||
import android.view.WindowManager;
|
||||
import android.view.View.OnClickListener;
|
||||
import android.view.ViewGroup.LayoutParams;
|
||||
import android.widget.Button;
|
||||
import android.widget.FrameLayout;
|
||||
|
@ -148,13 +151,40 @@ public class MapControlsLayer implements OsmandMapLayer {
|
|||
|
||||
}
|
||||
|
||||
private void onApplicationModePress() {
|
||||
final QuickAction mQuickAction = new QuickAction(backToMenuButton);
|
||||
int[] icons = new int[] { R.drawable.pedestrian_small, R.drawable.bicycle_small, R.drawable.car_small, R.drawable.pedestrian_small };
|
||||
int[] values = new int[] { R.string.app_mode_default, R.string.app_mode_bicycle, R.string.app_mode_car,
|
||||
R.string.app_mode_pedestrian };
|
||||
final ApplicationMode[] modes = new ApplicationMode[] { ApplicationMode.DEFAULT, ApplicationMode.BICYCLE, ApplicationMode.CAR,
|
||||
ApplicationMode.PEDESTRIAN };
|
||||
for (int i = 0; i < 4; i++) {
|
||||
final ActionItem action = new ActionItem();
|
||||
action.setTitle(view.getResources().getString(values[i]));
|
||||
action.setIcon(view.getResources().getDrawable(icons[i]));
|
||||
final int j = i;
|
||||
action.setOnClickListener(new OnClickListener() {
|
||||
@Override
|
||||
public void onClick(View v) {
|
||||
view.getSettings().APPLICATION_MODE.set(modes[j]);
|
||||
activity.updateApplicationModeSettings();
|
||||
view.refreshMap();
|
||||
mQuickAction.dismiss();
|
||||
}
|
||||
});
|
||||
mQuickAction.addActionItem(action);
|
||||
}
|
||||
mQuickAction.setAnimStyle(QuickAction.ANIM_AUTO);
|
||||
mQuickAction.show();
|
||||
}
|
||||
|
||||
|
||||
private void drawZoomLevel(Canvas canvas) {
|
||||
String zoomText = view.getZoom() + "";
|
||||
float length = zoomTextPaint.measureText(zoomText);
|
||||
if (zoomShadow.getBounds().width() == 0) {
|
||||
zoomShadow.setBounds(zoomInButton.getLeft() - 2, zoomInButton.getTop() - (int) (18 * dm.density), zoomInButton.getRight()
|
||||
, zoomInButton.getBottom());
|
||||
zoomShadow.setBounds(zoomInButton.getLeft() - 2, zoomInButton.getTop() - (int) (18 * dm.density), zoomInButton.getRight(),
|
||||
zoomInButton.getBottom());
|
||||
}
|
||||
zoomShadow.draw(canvas);
|
||||
|
||||
|
@ -184,6 +214,10 @@ public class MapControlsLayer implements OsmandMapLayer {
|
|||
|
||||
@Override
|
||||
public boolean onTouchEvent(PointF point) {
|
||||
if (modeShadow.getBounds().contains((int) point.x, (int) point.y)) {
|
||||
onApplicationModePress();
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
|
|