From c40d4085973f0e1fcf6c0ae44b376013affc6bb4 Mon Sep 17 00:00:00 2001 From: Alexey Pelykh Date: Mon, 2 Feb 2015 14:17:46 +0200 Subject: [PATCH] A/V notes dark --- .../layout/dash_audio_video_notes_item.xml | 70 +++++++++++++++++++ .../layout/dash_download_maps_fragment.xml | 4 +- OsmAnd/res/layout/dash_error_fragment.xml | 4 +- OsmAnd/res/layout/dash_favorites_item.xml | 2 +- OsmAnd/res/layout/dash_note_item.xml | 54 -------------- OsmAnd/res/layout/dash_parking_fragment.xml | 2 +- .../DashAudioVideoNotesActivity.java | 4 +- .../DashAudioVideoNotesFragment.java | 5 +- 8 files changed, 80 insertions(+), 65 deletions(-) create mode 100644 OsmAnd/res/layout/dash_audio_video_notes_item.xml delete mode 100644 OsmAnd/res/layout/dash_note_item.xml diff --git a/OsmAnd/res/layout/dash_audio_video_notes_item.xml b/OsmAnd/res/layout/dash_audio_video_notes_item.xml new file mode 100644 index 0000000000..daea278a69 --- /dev/null +++ b/OsmAnd/res/layout/dash_audio_video_notes_item.xml @@ -0,0 +1,70 @@ + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/OsmAnd/res/layout/dash_download_maps_fragment.xml b/OsmAnd/res/layout/dash_download_maps_fragment.xml index ca574145d0..2276fcf7a4 100644 --- a/OsmAnd/res/layout/dash_download_maps_fragment.xml +++ b/OsmAnd/res/layout/dash_download_maps_fragment.xml @@ -22,7 +22,7 @@ android:layout_width="0dp" android:layout_weight="1" android:text="@string/dash_download_manage" - style="@style/DashboardGeneralButton"/> + style="?attr/dashboardGeneralButtonStyle"/> @@ -31,7 +31,7 @@ android:layout_weight="1" android:layout_height="wrap_content" android:text="@string/dash_download_new_one" - style="@style/DashboardGeneralButton"/> + style="?attr/dashboardGeneralButtonStyle"/> \ No newline at end of file diff --git a/OsmAnd/res/layout/dash_error_fragment.xml b/OsmAnd/res/layout/dash_error_fragment.xml index 2212560093..157ba44f79 100644 --- a/OsmAnd/res/layout/dash_error_fragment.xml +++ b/OsmAnd/res/layout/dash_error_fragment.xml @@ -35,7 +35,7 @@ android:layout_width="0dp" android:layout_weight="1" android:text="@string/send_report" - style="@style/DashboardGeneralButton"/> + style="?attr/dashboardGeneralButtonStyle"/> @@ -44,7 +44,7 @@ android:layout_weight="1" android:layout_height="wrap_content" android:text="@string/dismiss" - style="@style/DashboardGeneralButton"/> + style="?attr/dashboardGeneralButtonStyle"/> \ No newline at end of file diff --git a/OsmAnd/res/layout/dash_favorites_item.xml b/OsmAnd/res/layout/dash_favorites_item.xml index 0e40fafb65..6ee62d152f 100644 --- a/OsmAnd/res/layout/dash_favorites_item.xml +++ b/OsmAnd/res/layout/dash_favorites_item.xml @@ -58,7 +58,7 @@ android:id="@+id/distance" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:textColor="@color/dashboard_blue" + android:textColor="?android:textColorSecondary" android:textSize="@dimen/showAllButtonTextSize" tools:text="100500 km"/> diff --git a/OsmAnd/res/layout/dash_note_item.xml b/OsmAnd/res/layout/dash_note_item.xml deleted file mode 100644 index 97a3c0f5f9..0000000000 --- a/OsmAnd/res/layout/dash_note_item.xml +++ /dev/null @@ -1,54 +0,0 @@ - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/OsmAnd/res/layout/dash_parking_fragment.xml b/OsmAnd/res/layout/dash_parking_fragment.xml index ff1fb18f2b..111443dbdb 100644 --- a/OsmAnd/res/layout/dash_parking_fragment.xml +++ b/OsmAnd/res/layout/dash_parking_fragment.xml @@ -48,6 +48,6 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/remove_the_tag" - style="@style/DashboardGeneralButton"/> + style="?attr/dashboardGeneralButtonStyle"/> \ No newline at end of file diff --git a/OsmAnd/src/net/osmand/plus/dashboard/DashAudioVideoNotesActivity.java b/OsmAnd/src/net/osmand/plus/dashboard/DashAudioVideoNotesActivity.java index 84e8e1eabc..855a377971 100644 --- a/OsmAnd/src/net/osmand/plus/dashboard/DashAudioVideoNotesActivity.java +++ b/OsmAnd/src/net/osmand/plus/dashboard/DashAudioVideoNotesActivity.java @@ -103,7 +103,7 @@ public class DashAudioVideoNotesActivity extends OsmandActionBarActivity { class NotesAdapter extends ArrayAdapter { NotesAdapter(List recordingList) { - super(DashAudioVideoNotesActivity.this, R.layout.dash_note_item, recordingList); + super(DashAudioVideoNotesActivity.this, R.layout.dash_audio_video_notes_item, recordingList); } @Override @@ -111,7 +111,7 @@ public class DashAudioVideoNotesActivity extends OsmandActionBarActivity { LayoutInflater inflater = getLayoutInflater(); View row = convertView; if (row == null){ - row = inflater.inflate(R.layout.dash_note_item, parent, false); + row = inflater.inflate(R.layout.dash_audio_video_notes_item, parent, false); row.findViewById(R.id.divider).setVisibility(View.GONE); } final AudioVideoNotesPlugin.Recording recording = getItem(position); diff --git a/OsmAnd/src/net/osmand/plus/dashboard/DashAudioVideoNotesFragment.java b/OsmAnd/src/net/osmand/plus/dashboard/DashAudioVideoNotesFragment.java index ec1be67d20..3ad5699d9f 100644 --- a/OsmAnd/src/net/osmand/plus/dashboard/DashAudioVideoNotesFragment.java +++ b/OsmAnd/src/net/osmand/plus/dashboard/DashAudioVideoNotesFragment.java @@ -6,7 +6,6 @@ import android.content.Intent; import android.graphics.Typeface; import android.os.Bundle; import android.support.annotation.Nullable; -import android.util.TypedValue; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -14,7 +13,7 @@ import android.widget.Button; import android.widget.ImageView; import android.widget.LinearLayout; import android.widget.TextView; -import net.osmand.plus.OsmAndAppCustomization; + import net.osmand.plus.OsmandPlugin; import net.osmand.plus.R; import net.osmand.plus.activities.MapActivity; @@ -91,7 +90,7 @@ public class DashAudioVideoNotesFragment extends DashBaseFragment { for (final AudioVideoNotesPlugin.Recording recording : notes){ LayoutInflater inflater = getActivity().getLayoutInflater(); - View view = inflater.inflate(R.layout.dash_note_item, null, false); + View view = inflater.inflate(R.layout.dash_audio_video_notes_item, null, false); getNoteView(recording, view, getActivity(), plugin); view.setOnClickListener(new View.OnClickListener() {