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

Fixes: live updates + select storage

Browse source
This commit is contained in:
Alexey Kulish 2016-03-17 15:34:08 +03:00
parent ab1b25524c
commit 718fcec2e8
5 changed files with 43 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
OsmAnd/res/drawable/btn_round_shade.xml
View file

@ -1,13 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_pressed="true"><shape android:shape="rectangle">
<solid android:color="@color/map_widget_dark_pressed" />
<corners android:radius="@dimen/map_button_rect_rad" />
</shape></item>
<item><shape android:shape="rectangle">
<solid android:color="@color/fab_color_pressed" />
<corners android:radius="@dimen/map_button_rect_rad" />
</shape></item>
<item android:drawable="@drawable/btn_round_shade_p" android:state_pressed="true"/>
<item android:drawable="@drawable/btn_round_shade_n"/>
</selector>

13
OsmAnd/res/drawable/btn_round_shade_n.xml Normal file
View file

@ -0,0 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item>
<nine-patch android:src="@drawable/bg_card_shadow"/>
</item>
<item>
<shape android:shape="rectangle">
<solid android:color="@color/fab_color_pressed"/>
<corners android:radius="@dimen/map_button_rect_rad"/>
</shape>
</item>
</layer-list>

13
OsmAnd/res/drawable/btn_round_shade_p.xml Normal file
View file

@ -0,0 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item>
<nine-patch android:src="@drawable/bg_card_shadow"/>
</item>
<item>
<shape android:shape="rectangle">
<solid android:color="@color/map_widget_dark_pressed"/>
<corners android:radius="@dimen/map_button_rect_rad"/>
</shape>
</item>
</layer-list>

23
OsmAnd/res/layout/live_updates_header.xml
View file

@ -5,8 +5,8 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:paddingLeft="8dp"
android:paddingRight="8dp"
android:paddingLeft="6dp"
android:paddingRight="6dp"
android:paddingTop="16dp">
<LinearLayout
@ -15,9 +15,9 @@
android:layout_height="wrap_content"
android:background="@drawable/bg_card_orange"
android:orientation="vertical"
android:paddingBottom="8dp"
android:paddingBottom="12dp"
android:paddingLeft="24dp"
android:paddingRight="8dp"
android:paddingRight="12dp"
android:paddingTop="16dp">
<LinearLayout
@ -63,6 +63,8 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/btn_round_shade"
android:paddingLeft="12dp"
android:paddingRight="12dp"
android:text="@string/shared_string_read_more"
android:textColor="@color/color_white"/>
@ -70,7 +72,9 @@
android:id="@+id/subscription_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="32dp"
android:paddingLeft="12dp"
android:paddingRight="12dp"
android:layout_marginLeft="12dp"
android:background="@drawable/btn_round_shade"
android:text="@string/osm_live_subscribe_btn"
android:textColor="@color/color_white"/>
@ -146,13 +150,14 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:gravity="center_vertical"
android:minHeight="48dp">
<net.osmand.plus.widgets.TextViewEx
android:layout_width="120dp"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="0.5"
android:layout_marginLeft="16dp"
android:layout_marginRight="16dp"
android:text="@string/osm_live_support_region"
@ -162,10 +167,10 @@
<net.osmand.plus.widgets.TextViewEx
android:id="@+id/regionTextView"
android:layout_width="match_parent"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="0.5"
android:layout_marginBottom="4dp"
android:layout_marginLeft="16dp"
android:layout_marginRight="16dp"
android:layout_marginTop="4dp"
android:gravity="right"

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

@ -614,9 +614,7 @@ public class DownloadActivity extends AbstractDownloadActivity implements Downlo
}
private void chooseDataStorage() {
if (getMyApplication().getSettings().getSecondaryStorage() != null) {
DataStoragePlaceDialogFragment.showInstance(getSupportFragmentManager(), false);
}
DataStoragePlaceDialogFragment.showInstance(getSupportFragmentManager(), false);
}
public static boolean hasPermissionToWriteExternalStorage(Context ctx) {