Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'master' of github.com:osmandapp/Osmand

Browse source
This commit is contained in:
Victor Shcherb 2015-10-21 15:10:18 +02:00
commit c91e69173c
21 changed files with 110 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
OsmAnd/res/drawable-hdpi/map_favorite.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.2 KiB

BIN
OsmAnd/res/drawable-hdpi/map_white_favorite_shield.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 2.4 KiB

BIN
OsmAnd/res/drawable-mdpi/map_favorite.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
OsmAnd/res/drawable-mdpi/map_white_favorite_shield.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.9 KiB

BIN
OsmAnd/res/drawable-xhdpi/map_favorite.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.3 KiB

BIN
OsmAnd/res/drawable-xhdpi/map_white_favorite_shield.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 3.1 KiB

BIN
OsmAnd/res/drawable-xxhdpi/map_favorite.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.5 KiB

BIN
OsmAnd/res/drawable-xxhdpi/map_white_favorite_shield.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 4.4 KiB

22
OsmAnd/res/drawable/fab_background_normal.xml Normal file
View file

@ -0,0 +1,22 @@
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
<item>
<bitmap
android:gravity="fill"
android:src="@drawable/map_bt_round_1_shadow" />
</item>
<item>
<inset
android:insetBottom="@dimen/map_button_inset_shadow"
android:insetLeft="@dimen/map_button_inset_shadow"
android:insetRight="@dimen/map_button_inset_shadow"
android:insetTop="@dimen/map_button_inset_shadow" >
<shape android:shape="oval" >
<solid android:color="@color/fab_color" />
</shape>
</inset>
</item>
</layer-list>

21
OsmAnd/res/drawable/fab_background_pressed.xml Normal file
View file

@ -0,0 +1,21 @@
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
<item>
<bitmap
android:gravity="fill"
android:src="@drawable/map_bt_round_1_shadow" />
</item>
<item>
<inset
android:insetBottom="@dimen/map_button_inset_shadow"
android:insetLeft="@dimen/map_button_inset_shadow"
android:insetRight="@dimen/map_button_inset_shadow"
android:insetTop="@dimen/map_button_inset_shadow" >
<shape android:shape="oval" >
<solid android:color="@color/fab_color_pressed" />
</shape>
</inset>
</item>
</layer-list>

5
OsmAnd/res/drawable/fab_background_style.xml Normal file
View file

@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@drawable/fab_background_pressed" android:state_pressed="true"/>
<item android:drawable="@drawable/fab_background_normal"></item>
</selector>

6
OsmAnd/res/layout/map_context_menu_fragment.xml
View file

@ -190,11 +190,11 @@
<ImageView
android:id="@+id/context_menu_fab_view"
android:layout_width="@dimen/map_button_size"
android:layout_height="@dimen/map_button_size"
android:layout_width="@dimen/fab_size_with_shadow"
android:layout_height="@dimen/fab_size_with_shadow"
android:layout_gravity="right"
android:layout_marginRight="12dp"
android:background="@drawable/btn_circle_blue"
android:background="@drawable/fab_background_style"
android:scaleType="center"
android:src="@drawable/map_directions"/>

10
OsmAnd/res/values-be/strings.xml
View file

@ -608,10 +608,10 @@
<string name="index_name_europe">Эўропа</string>
<string name="index_name_france">Эўропа - Францыя</string>
<string name="index_name_germany">Эўропа - Германія</string>
<string name="index_name_russia">Эўразія - РФ</string>
<string name="index_name_russia">РФ</string>
<string name="index_name_africa">Афрыка</string>
<string name="index_name_asia">Азія</string>
<string name="index_name_oceania">Акеанія</string>
<string name="index_name_oceania">Аўстралія і Акеанія</string>
<string name="index_name_other">Сусьветныя і тэматычныя мапы</string>
<string name="index_name_wiki">Сусьветная Вікіпэдыя</string>
<string name="index_name_voice">Галасавыя падказкі (запісаныя, абмежаваныя магчымасьці)</string>
@ -2145,5 +2145,7 @@
<string name="confirm_download_roadmaps">Вы ўпэўненыя, што хочаце сьцягнуць мапу аўтадарог, нават калі ў вас ёсць поўная мапа?</string>
<string name="value_downloaded_from_max">%1$.1f з %2$.1f Мб</string>
<string name="file_size_in_mb">%.1f Мб</string>
<string name="update_all">Абнавіць усе (%1$s Мб)</string>
</resources>
<string name="update_all">Абнавіць усе (%1$s МБ)</string>
<string name="free_downloads_used">Выкарыстана бясплатных загрузак</string>
<string name="free_downloads_used_description">Вы можаце паглядзець колькі бясплатных загрузак вы выкарысталі</string>
</resources>

15
OsmAnd/res/values-ru/phrases.xml
View file

@ -2201,4 +2201,19 @@
<string name="poi_cairn">Пирамида из камней</string>
<string name="poi_memorial_fassade_decoration">Фасадная декорация</string>
<string name="poi_defibrillator">Дефибриллятор</string>
<string name="poi_defibrillator_yes">Дефибриллятор: есть</string>
<string name="poi_tomb_war_grave">Тип: братская могила</string>
<string name="poi_tomb_tumulus">Тип: тумулус</string>
<string name="poi_tomb_rock_cut">Тип: вырезанная в камне</string>
<string name="poi_tomb_hypogeum">Тип: гипогей</string>
<string name="poi_tomb_vault">Тип: усыпальница</string>
<string name="poi_tomb_columbarium">Тип: колумбарий</string>
<string name="poi_tomb_mausoleum">Тип: мавзолей</string>
<string name="poi_tomb_sarcophagus">Тип: саркофаг</string>
<string name="poi_tomb_crypt">Тип: крипта</string>
<string name="poi_tomb_pyramid">Тип: пирамида</string>
</resources>

2
OsmAnd/res/values-zh-rTW/strings.xml
View file

@ -2124,7 +2124,7 @@
<string name="osmand_running_in_background">在背景執行</string>
<string name="default_speed_system_descr">定義速度測定系統</string>
<string name="default_speed_system">測定速度</string>
<string name="si_nm">海浬</string>
<string name="si_nm">海里</string>
<string name="nm">浬</string>
<string name="si_kmh">公里每小時</string>
<string name="si_mph">英里每小時</string>

6
OsmAnd/res/values/colors.xml
View file

@ -31,8 +31,10 @@
<color name="list_item_dark_pressed">#be39464d</color>
<color name="bg_color_light">#fff</color>
<color name="bg_color_dark">#333b40</color>
<color name="fab_color">#ff8f00</color>
<color name="fab_color_pressed">#e58200</color>
<color name="map_widget_icon_color">#ff8f00</color>
<color name="map_widget_stroke">#4C000000</color>
<color name="map_widget_light">#fff</color>

15
OsmAnd/res/values/phrases.xml
View file

@ -2205,4 +2205,19 @@
<string name="poi_cairn">Cairn</string>
<string name="poi_memorial_fassade_decoration">Fassade decoration</string>
<string name="poi_defibrillator">Defibrillator</string>
<string name="poi_defibrillator_yes">Defibrillator: yes</string>
<string name="poi_tomb_war_grave">Type: war grave</string>
<string name="poi_tomb_tumulus">Type: tumulus</string>
<string name="poi_tomb_rock_cut">Type: rock-cut</string>
<string name="poi_tomb_hypogeum">Type: hypogeum</string>
<string name="poi_tomb_vault">Type: vault</string>
<string name="poi_tomb_columbarium">Type: columbarium</string>
<string name="poi_tomb_mausoleum">Type: mausoleum</string>
<string name="poi_tomb_sarcophagus">Type: sarcophagus</string>
<string name="poi_tomb_crypt">Type: crypt</string>
<string name="poi_tomb_pyramid">Type: pyramid</string>
</resources>

8
OsmAnd/src/net/osmand/plus/base/FavoriteImageDrawable.java
View file

@ -5,6 +5,7 @@ import android.content.res.Resources;
import android.graphics.Bitmap;
import android.graphics.BitmapFactory;
import android.graphics.Canvas;
import android.graphics.Color;
import android.graphics.ColorFilter;
import android.graphics.Paint;
import android.graphics.PorterDuff;
@ -29,10 +30,11 @@ public class FavoriteImageDrawable extends Drawable {
this.resources = ctx.getResources();
this.color = color;
paintIcon = new Paint();
paintIcon.setColorFilter(new PorterDuffColorFilter(color, PorterDuff.Mode.SRC_IN));
int col = color == 0 || color == Color.BLACK ? getResources().getColor(R.color.color_favorite) : color;
paintIcon.setColorFilter(new PorterDuffColorFilter(col, PorterDuff.Mode.SRC_IN));
paintBackground = new Paint();
favIcon = BitmapFactory.decodeResource(ctx.getResources(), R.drawable.ic_action_fav_dark);
favBackground = BitmapFactory.decodeResource(ctx.getResources(), R.drawable.map_white_shield);
favIcon = BitmapFactory.decodeResource(ctx.getResources(), R.drawable.map_favorite);
favBackground = BitmapFactory.decodeResource(ctx.getResources(), R.drawable.map_white_favorite_shield);
}
@Override

14
OsmAnd/src/net/osmand/plus/download/DownloadActivity.java
View file

@ -71,10 +71,16 @@ public class DownloadActivity extends BaseDownloadActivity {
int currentTab = 0;
String tab = getIntent() == null || getIntent().getExtras() == null ? null : getIntent().getExtras().getString(TAB_TO_OPEN);
if (tab != null) {
if (tab.equals(DOWNLOAD_TAB)) {
currentTab = 1;
} else if (tab.equals(UPDATES_TAB)) {
currentTab = 2;
switch (tab) {
case DOWNLOAD_TAB:
currentTab = 0;
break;
case LOCAL_TAB:
currentTab = 1;
break;
case UPDATES_TAB:
currentTab = 2;
break;
}
}
visibleBanner = new BannerAndDownloadFreeVersion(findViewById(R.id.mainLayout), this);

4
OsmAnd/src/net/osmand/plus/mapcontextmenu/MapContextMenuFragment.java
View file

@ -52,7 +52,7 @@ public class MapContextMenuFragment extends Fragment {
public static final String TAG = "MapContextMenuFragment";
private static final Log LOG = PlatformUtil.getLog(MapContextMenuFragment.class);
public static final float FAB_PADDING_TOP = 10f;
public static final float FAB_PADDING_TOP_DP = 4f;
public static final float MARKER_PADDING_DP = 20f;
public static final float MARKER_PADDING_X_DP = 50f;
@ -125,7 +125,7 @@ public class MapContextMenuFragment extends Fragment {
public View onCreateView(LayoutInflater inflater, ViewGroup container,
Bundle savedInstanceState) {
fabPaddingTopPx = dpToPx(FAB_PADDING_TOP);
fabPaddingTopPx = dpToPx(FAB_PADDING_TOP_DP);
markerPaddingPx = dpToPx(MARKER_PADDING_DP);
markerPaddingXPx = dpToPx(MARKER_PADDING_X_DP);

1
eclipse-compile/design/src/main/res/values/dimens.xml
View file

@ -22,6 +22,7 @@
<dimen name="fab_size_normal">56dp</dimen>
<dimen name="fab_size_mini">40dp</dimen>
<dimen name="fab_border_width">0.5dp</dimen>
<dimen name="fab_size_with_shadow">62dp</dimen>
<dimen name="navigation_max_width">320dp</dimen>
<dimen name="navigation_elevation">12dp</dimen>