Update sizes

This commit is contained in:
Victor Shcherb 2015-04-14 18:35:57 +03:00
parent ab0a84aeee
commit 1137b4e840
7 changed files with 39 additions and 31 deletions

View file

@ -4,6 +4,10 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="?attr/card_bg"
android:layout_marginTop="@dimen/dash_margin"
android:layout_marginBottom="@dimen/dash_margin"
android:layout_marginLeft="@dimen/dash_margin_h"
android:layout_marginRight="@dimen/dash_margin_h"
android:orientation="vertical" >
<LinearLayout

View file

@ -23,6 +23,7 @@
<net.osmand.plus.widgets.ButtonEx
android:id="@+id/recents"
android:layout_width="wrap_content"
style="?attr/dashboardGeneralButtonStyle"
android:text="@string/shared_string_history"
osmand:textAllCapsCompat="true"

View file

@ -125,15 +125,15 @@
<ImageButton
android:id="@+id/map_layers_button"
android:layout_width="@dimen/map_button_size"
android:layout_height="@dimen/map_button_size"
android:layout_width="@dimen/map_small_button_size"
android:layout_height="@dimen/map_small_button_size"
android:background="@drawable/btn_inset_circle"
android:src="@drawable/ic_action_test_light" />
<ImageButton
android:id="@+id/map_compass_button"
android:layout_width="@dimen/map_button_size"
android:layout_height="@dimen/map_button_size"
android:layout_width="@dimen/map_small_button_size"
android:layout_height="@dimen/map_small_button_size"
android:background="@drawable/btn_inset_circle"
android:src="@drawable/ic_action_test_light" />
</LinearLayout>
@ -226,8 +226,8 @@
<ImageButton
android:id="@+id/map_collapse_button"
android:layout_width="@dimen/map_button_size"
android:layout_height="@dimen/map_button_size"
android:layout_width="@dimen/map_small_button_size"
android:layout_height="@dimen/map_small_button_size"
android:layout_gravity="top|center_horizontal"
android:background="@drawable/btn_inset_circle"
android:src="@drawable/ic_action_test_light" />

View file

@ -9,27 +9,30 @@
<dimen name="map_route_buttons_height_land">72dp</dimen>
<dimen name="map_address_height">60dp</dimen>
<dimen name="map_button_size">75dp</dimen>
<dimen name="map_button_size">78dp</dimen>
<dimen name="map_small_button_size">66dp</dimen>
<dimen name="map_ruler_width">180dp</dimen>
<dimen name="map_ruler_bottom_margin">14dp</dimen>
<dimen name="map_button_shadow_width">80dp</dimen>
<dimen name="map_button_shadow_height">112dp</dimen>
<dimen name="map_button_shadow_margin">7dp</dimen>
<dimen name="map_button_shadow_width">84dp</dimen>
<dimen name="map_alarm_size">116dp</dimen>
<dimen name="map_alarm_text_size">35sp</dimen>
<dimen name="map_alarm_bottom_margin">140dp</dimen>
<dimen name="map_alarm_bottom_margin_land">78dp</dimen>
<dimen name="map_button_shadow_height">112dp</dimen>
<dimen name="map_alarm_bottom_margin_land">81dp</dimen>
<dimen name="map_widget_icon">32dp</dimen>
<dimen name="map_widget_height">48dp</dimen>
<dimen name="map_widget_image">120dp</dimen>
<dimen name="map_button_spacing">20dp</dimen>
<dimen name="map_button_spacing_land">12dp</dimen>
<dimen name="map_button_margin">6dp</dimen>
<dimen name="map_button_spacing">17dp</dimen>
<dimen name="map_button_spacing_land">9dp</dimen>
<dimen name="map_button_margin">9dp</dimen>
<dimen name="map_routing_progress_width">150dp</dimen>
<dimen name="map_button_shadow_margin">3dp</dimen>
<dimen name="map_button_inset_shadow">5dp</dimen>
<dimen name="map_button_inset">10dp</dimen>
<dimen name="map_button_inset_shadow">3dp</dimen>
<dimen name="map_button_inset">3dp</dimen>
<dimen name="map_button_rect_rad">4dp</dimen>
<dimen name="map_button_stroke">1px</dimen>

View file

@ -57,27 +57,30 @@
<dimen name="map_route_buttons_height_land">48dp</dimen>
<dimen name="map_address_height">40dp</dimen>
<dimen name="map_button_size">50dp</dimen>
<dimen name="map_button_size">52dp</dimen>
<dimen name="map_small_button_size">44dp</dimen>
<dimen name="map_ruler_width">120dp</dimen>
<dimen name="map_ruler_bottom_margin">7dp</dimen>
<dimen name="map_button_shadow_width">54dp</dimen>
<dimen name="map_alarm_size">78dp</dimen>
<dimen name="map_alarm_bottom_margin">87dp</dimen>
<dimen name="map_alarm_bottom_margin_land">55dp</dimen>
<dimen name="map_alarm_bottom_margin_land">57dp</dimen>
<dimen name="map_button_shadow_height">85dp</dimen>
<dimen name="map_button_shadow_width">56dp</dimen>
<dimen name="map_button_shadow_margin">5dp</dimen>
<dimen name="map_widget_icon">24dp</dimen>
<dimen name="map_widget_height">32dp</dimen>
<dimen name="map_widget_image">80dp</dimen>
<dimen name="map_button_spacing">13dp</dimen>
<dimen name="map_button_spacing_land">8dp</dimen>
<dimen name="map_button_margin">4dp</dimen>
<dimen name="map_button_spacing">11dp</dimen>
<dimen name="map_button_spacing_land">6dp</dimen>
<dimen name="map_button_margin">6dp</dimen>
<dimen name="map_routing_progress_width">100dp</dimen>
<dimen name="map_button_shadow_margin">2dp</dimen>
<dimen name="map_button_inset_shadow">1dp</dimen>
<dimen name="map_button_inset">4dp</dimen>
<dimen name="map_button_inset_shadow">2dp</dimen>
<dimen name="map_button_inset">2dp</dimen>
<dimen name="map_button_rect_rad">3dp</dimen>
<dimen name="map_button_stroke">1px</dimen>

View file

@ -38,6 +38,7 @@
<style name="DashboardGeneralButton">
<item name="android:layout_width">wrap_content</item>
<item name="android:gravity">center_vertical|right</item>
<item name="android:layout_height">@dimen/showAllButtonHeight</item>
<item name="android:layout_gravity">center_vertical</item>
<item name="android:textSize">@dimen/showAllButtonTextSize</item>

View file

@ -4,24 +4,18 @@ import java.util.ArrayList;
import java.util.List;
import net.osmand.data.PointDescription;
import net.osmand.plus.OsmAndAppCustomization;
import net.osmand.plus.OsmandApplication;
import net.osmand.plus.OsmandPlugin;
import net.osmand.plus.R;
import net.osmand.plus.activities.MapActivity;
import net.osmand.plus.dashboard.DashBaseFragment;
import net.osmand.plus.helpers.FontCache;
import net.osmand.plus.myplaces.FavoritesActivity;
import android.app.Activity;
import android.content.Intent;
import android.graphics.Typeface;
import android.graphics.drawable.Drawable;
import android.os.Bundle;
import android.support.annotation.Nullable;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.Button;
import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.TextView;
@ -86,6 +80,8 @@ public class DashAudioVideoNotesFragment extends DashBaseFragment {
View view = inflater.inflate(R.layout.note, null, false);
getNoteView(recording, view, getMyApplication());
((ImageView) view.findViewById(R.id.play)).setImageDrawable(getMyApplication().getIconsCache()
.getContentIcon(R.drawable.ic_play_dark));
view.findViewById(R.id.play).setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {