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

Update osmo layout

Browse source
This commit is contained in:
Victor Shcherb 2015-05-26 01:00:54 +02:00
parent ee69e3f4c6
commit 69e23fd28c
10 changed files with 99 additions and 110 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
OsmAnd-java/src/net/osmand/binary/BinaryInspector.java
View file

@ -75,6 +75,7 @@ public class BinaryInspector {
// "-vstats", // "-vstats",
// "/Users/victorshcherb/osmand/maps/Netherlands_europe_2.obf" // "/Users/victorshcherb/osmand/maps/Netherlands_europe_2.obf"
// "/Users/victorshcherb/osmand/maps/World_basemap_2.obf" // "/Users/victorshcherb/osmand/maps/World_basemap_2.obf"
}); });
} else { } else {
in.inspector(args); in.inspector(args);

1
OsmAnd-java/src/net/osmand/osm/MapRenderingTypes.java
View file

@ -579,7 +579,6 @@ public class MapRenderingTypes {
// creation of only section // creation of only section
protected boolean onlyMap; protected boolean onlyMap;
protected boolean onlyPoi; protected boolean onlyPoi;
protected boolean lang;
// Needed only for map rules // Needed only for map rules
protected int minzoom; protected int minzoom;

7
OsmAnd/res/layout-v14/check_item.xml Normal file
View file

@ -0,0 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Switch xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:focusable="false"
android:textColor="@color/color_white"
android:gravity="center_vertical" />

56
OsmAnd/res/layout-v14/osmo_groups_list_header.xml
View file

@ -1,56 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<LinearLayout
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:background="?attr/osmo_header_background"
android:minHeight="@dimen/osmo_header_height"
android:orientation="horizontal"
android:paddingLeft="@dimen/dashboard_parking_left_margin"
android:paddingRight="@dimen/dashboard_parking_left_margin">
<ImageView
android:id="@+id/osmo_status"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:paddingLeft="4dp"
android:paddingRight="4dp"
android:src="@drawable/mon_osmo_conn_small"/>
<Switch
android:id="@+id/enable_service"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:focusable="false"
android:textColor="@color/color_white"
android:text="@string/osmo_start_service"/>
</LinearLayout>
<Switch
android:id="@+id/enable_tracker"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dashboard_parking_left_margin"
android:layout_marginRight="@dimen/dashboard_parking_left_margin"
android:focusable="false"
android:gravity="center_vertical"
android:minHeight="@dimen/osmo_header_height"
android:text="@string/osmo_enable_tracker"/>
<TextView
android:id="@+id/motd"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="8dip"
android:autoLink="web"
android:gravity="center"
android:textSize="@dimen/default_desc_text_size"/>
</LinearLayout>

7
OsmAnd/res/layout/check_item.xml Normal file
View file

@ -0,0 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<CheckBox xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:focusable="false"
android:textColor="@color/color_white"
android:gravity="center_vertical" />

115
OsmAnd/res/layout/osmo_groups_list_header.xml
View file

@ -1,56 +1,77 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical"> android:background="?attr/osmo_header_background"
android:orientation="vertical"
android:paddingLeft="@dimen/list_content_padding"
android:paddingRight="@dimen/list_content_padding" >
<LinearLayout <LinearLayout
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="?attr/osmo_header_background" android:minHeight="@dimen/list_header_height"
android:minHeight="@dimen/osmo_header_height" android:orientation="horizontal" >
android:orientation="horizontal"
android:paddingLeft="@dimen/dashboard_parking_left_margin"
android:paddingRight="@dimen/dashboard_parking_left_margin">
<ImageView <ImageView
android:id="@+id/osmo_status" android:id="@+id/osmo_status"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:paddingLeft="4dp" android:layout_marginLeft="4dp"
android:paddingRight="4dp" android:layout_marginRight="4dp"
android:src="@drawable/mon_osmo_conn_small"/> android:src="@drawable/mon_osmo_conn_small" />
<CheckBox <include
android:id="@+id/enable_service" android:id="@+id/enable_service"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:focusable="false" layout="@layout/check_item"
android:textColor="@color/color_white" android:focusable="false"
android:text="@string/osmo_start_service"/> android:text="@string/osmo_start_service"
</LinearLayout> android:textColor="@color/color_white" />
</LinearLayout>
<CheckBox <LinearLayout
android:id="@+id/enable_tracker" android:layout_width="fill_parent"
android:layout_width="fill_parent" android:layout_height="wrap_content"
android:layout_height="wrap_content" android:minHeight="@dimen/list_item_height"
android:layout_marginLeft="@dimen/dashboard_parking_left_margin" android:id="@+id/share_my_location_layout"
android:layout_marginRight="@dimen/dashboard_parking_left_margin" android:orientation="horizontal" >
android:checked="false"
android:focusable="false"
android:gravity="center_vertical"
android:minHeight="@dimen/osmo_header_height"
android:text="@string/osmo_enable_tracker"/>
<TextView <ImageView
android:id="@+id/motd" android:id="@+id/share_my_location"
android:layout_width="fill_parent" android:layout_width="@dimen/list_item_height"
android:layout_height="wrap_content" android:layout_height="@dimen/list_item_height"
android:autoLink="web" android:layout_gravity="center_vertical"
android:gravity="center" android:background="?attr/dashboard_button"
android:textSize="@dimen/default_list_text_size"/> android:paddingLeft="4dp"
android:paddingRight="4dp"
android:src="@drawable/ic_action_gshare_dark" />
<include
layout="@layout/check_item"
android:id="@+id/enable_tracker"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:checked="false"
android:focusable="false"
android:layout_gravity="center_vertical"
android:text="@string/osmo_enable_tracker"
/>
</LinearLayout>
<TextView
android:id="@+id/motd"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:autoLink="web"
android:gravity="center"
android:textColor="@color/color_white"
android:textSize="@dimen/default_desc_text_size"
android:visibility="gone" />
</LinearLayout> </LinearLayout>

1
OsmAnd/res/values/sizes.xml
View file

@ -49,7 +49,6 @@
<dimen name="dashboard_parking_left_margin">16dp</dimen> <dimen name="dashboard_parking_left_margin">16dp</dimen>
<dimen name="dashboard_parking_icon_size">48dp</dimen> <dimen name="dashboard_parking_icon_size">48dp</dimen>
<dimen name="osmo_header_height">56dp</dimen>
<!-- map buttons --> <!-- map buttons -->
<dimen name="map_trans_seek_size">80dp</dimen> <dimen name="map_trans_seek_size">80dp</dimen>
<dimen name="map_route_buttons_width">60dp</dimen> <dimen name="map_route_buttons_width">60dp</dimen>

1
OsmAnd/res/values/strings.xml
View file

@ -9,6 +9,7 @@
3. All your modified/created strings are in the top of the file (to make easier find what\'s translated). 3. All your modified/created strings are in the top of the file (to make easier find what\'s translated).
PLEASE: Have a look at http://code.google.com/p/osmand/wiki/UIConsistency, it may really improve your and our work :-) Thx - Hardy PLEASE: Have a look at http://code.google.com/p/osmand/wiki/UIConsistency, it may really improve your and our work :-) Thx - Hardy
--> -->
<string name="osmo_share_my_location">Share my location</string>
<string name="shared_string_logoff">Log Off</string> <string name="shared_string_logoff">Log Off</string>
<string name="rendering_attr_hideHouseNumbers_name">Hide house numbers</string> <string name="rendering_attr_hideHouseNumbers_name">Hide house numbers</string>
<string name="application_dir_change_warning3">Do you want OsmAnd to also copy its data files to the new destination?</string> <string name="application_dir_change_warning3">Do you want OsmAnd to also copy its data files to the new destination?</string>

18
OsmAnd/src/net/osmand/plus/osmo/OsMoGroupsActivity.java
View file

@ -85,7 +85,6 @@ import android.view.ViewGroup;
import android.view.WindowManager; import android.view.WindowManager;
import android.webkit.WebView; import android.webkit.WebView;
import android.webkit.WebViewClient; import android.webkit.WebViewClient;
import android.widget.Button;
import android.widget.CheckBox; import android.widget.CheckBox;
import android.widget.CompoundButton; import android.widget.CompoundButton;
import android.widget.CompoundButton.OnCheckedChangeListener; import android.widget.CompoundButton.OnCheckedChangeListener;
@ -204,7 +203,16 @@ public class OsMoGroupsActivity extends OsmandExpandableListActivity implements
private void setupHeader() { private void setupHeader() {
header = getLayoutInflater().inflate(R.layout.osmo_groups_list_header, null); header = getLayoutInflater().inflate(R.layout.osmo_groups_list_header, null);
getExpandableListView().addHeaderView(header); getExpandableListView().addHeaderView(header);
ImageView iv = (ImageView) header.findViewById(R.id.share_my_location);
iv.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
shareSession();
}
});
CompoundButton trackr = (CompoundButton) header.findViewById(R.id.enable_tracker); CompoundButton trackr = (CompoundButton) header.findViewById(R.id.enable_tracker);
trackr.setText(R.string.osmo_share_my_location);
if(osMoPlugin != null && osMoPlugin.getTracker() != null){ if(osMoPlugin != null && osMoPlugin.getTracker() != null){
trackr.setChecked(osMoPlugin.getTracker().isEnabledTracker()); trackr.setChecked(osMoPlugin.getTracker().isEnabledTracker());
} }
@ -233,6 +241,7 @@ public class OsMoGroupsActivity extends OsmandExpandableListActivity implements
CompoundButton srvc = (CompoundButton) header.findViewById(R.id.enable_service); CompoundButton srvc = (CompoundButton) header.findViewById(R.id.enable_service);
srvc.setChecked(osMoPlugin.getService().isEnabled()); srvc.setChecked(osMoPlugin.getService().isEnabled());
srvc.setText(R.string.osmo_start_service);
srvc.setOnCheckedChangeListener(new OnCheckedChangeListener() { srvc.setOnCheckedChangeListener(new OnCheckedChangeListener() {
@Override @Override
@ -271,7 +280,7 @@ public class OsMoGroupsActivity extends OsmandExpandableListActivity implements
TextView mtd = (TextView) header.findViewById(R.id.motd); TextView mtd = (TextView) header.findViewById(R.id.motd);
SessionInfo si = osMoPlugin.getService().getCurrentSessionInfo(); SessionInfo si = osMoPlugin.getService().getCurrentSessionInfo();
boolean visible = si != null && si.motd != null && si.motd.length() > 0; boolean visible = si != null && si.motd != null && si.motd.length() > 0;
mtd.setVisibility(visible? View.VISIBLE:View.GONE); mtd.setVisibility(visible ? View.VISIBLE : View.GONE);
if(visible) { if(visible) {
mtd.setText(si.motd); mtd.setText(si.motd);
mtd.setLinksClickable(true); mtd.setLinksClickable(true);
@ -330,7 +339,8 @@ public class OsMoGroupsActivity extends OsmandExpandableListActivity implements
supportInvalidateOptionsMenu(); supportInvalidateOptionsMenu();
if(service.isConnected()) { if(service.isConnected()) {
header.findViewById(R.id.motd).setVisibility(View.VISIBLE); header.findViewById(R.id.motd).setVisibility(View.VISIBLE);
header.findViewById(R.id.enable_tracker).setVisibility(View.VISIBLE); header.findViewById(R.id.share_my_location_layout).setVisibility(View.VISIBLE);
header.findViewById(R.id.share_my_location).setVisibility(tracker.isEnabledTracker() ? View.VISIBLE : View.GONE);
if (service.isLoggedIn()) { if (service.isLoggedIn()) {
getSupportActionBar().setTitle(app.getSettings().OSMO_USER_NAME.get()); getSupportActionBar().setTitle(app.getSettings().OSMO_USER_NAME.get());
} else { } else {
@ -338,7 +348,7 @@ public class OsMoGroupsActivity extends OsmandExpandableListActivity implements
} }
} else { } else {
header.findViewById(R.id.motd).setVisibility(View.GONE); header.findViewById(R.id.motd).setVisibility(View.GONE);
header.findViewById(R.id.enable_tracker).setVisibility(View.GONE); header.findViewById(R.id.share_my_location_layout).setVisibility(View.GONE);
getSupportActionBar().setTitle(R.string.osmo); getSupportActionBar().setTitle(R.string.osmo);
} }
} }

2
eclipse-compile/appcompat/res/values/dimens.xml
View file

@ -83,6 +83,6 @@
<!-- Dialog button bar height --> <!-- Dialog button bar height -->
<dimen name="abc_alert_dialog_button_bar_height">48dp</dimen> <dimen name="abc_alert_dialog_button_bar_height">48dp</dimen>
<dimen name="checkbox_padding">12dp</dimen> <dimen name="checkbox_padding">24dp</dimen>
<dimen name="radio_padding">30dp</dimen> <dimen name="radio_padding">30dp</dimen>
</resources> </resources>