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

Slightly fix searches

Browse source
This commit is contained in:
Victor Shcherb 2015-01-20 00:03:54 +01:00
parent d1ec5c5f7a
commit f811edf676
9 changed files with 44 additions and 54 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

54
OsmAnd/res/layout-land/dash_search_fragment.xml
View file

@ -6,14 +6,22 @@
android:background="@drawable/bg_cardui"
android:orientation="vertical" >
<TextView
android:id="@+id/search_for"
style="@style/DashboardSubHeader"
android:layout_width="wrap_content"
android:layout_height="40dp"
android:text="@string/search_for" />
<LinearLayout
android:layout_width="fill_parent"
android:layout_height="@dimen/dashHeaderHeight" >
<View
<TextView
android:id="@+id/search_for"
style="@style/DashboardSubHeader"
android:layout_width="wrap_content"
android:text="@string/search_for" />
<Button
android:id="@+id/recents"
style="@style/DashboardGeneralButton"
android:text="@string/recents" />
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="@color/dashboard_divider" />
@ -51,38 +59,6 @@
android:drawableTop="@drawable/ic_action_marker2"
android:text="@string/coordinates" />
<View
android:layout_width="1dp"
android:layout_height="match_parent"
android:background="@color/dashboard_divider" />
<Button
android:id="@+id/fav_btn"
style="@style/DashboardSearchButton"
android:drawableTop="@drawable/ic_action_fav2"
android:text="@string/my_favorites" />
<View
android:layout_width="1dp"
android:layout_height="match_parent"
android:background="@color/dashboard_divider" />
<Button
android:id="@+id/history"
style="@style/DashboardSearchButton"
android:drawableTop="@drawable/ic_action_history2"
android:text="@string/history" />
<View
android:layout_width="1dp"
android:layout_height="match_parent"
android:background="@color/dashboard_divider" />
<Button
android:id="@+id/transport"
style="@style/DashboardSearchButton"
android:drawableTop="@drawable/ic_action_bus2"
android:text="@string/rendering_category_transport" />
</LinearLayout>
</LinearLayout>

2
OsmAnd/res/layout/search_main.xml
View file

@ -46,7 +46,7 @@
android:layout_weight="1" />
<View android:id="@+id/devider"
<View android:id="@+id/divider"
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="@color/dashboard_divider"/>

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

@ -9,7 +9,7 @@
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
-->
<string name="recents">Recents</string>
<string name="recents">RECENTS</string>
<string name="navigation_over_track">Start navigation over track?</string>
<string name="avoid_roads_msg">You can change route by selecting roads to avoid</string>
<string name="rendering_value__name">Default</string>

1
OsmAnd/src/net/osmand/plus/activities/search/SearchAddressFragment.java
View file

@ -6,7 +6,6 @@ import java.util.List;
import android.support.v4.app.Fragment;
import android.support.v4.view.MenuItemCompat;
import android.support.v7.widget.Toolbar;
import android.view.Menu;
import android.view.MenuInflater;
import android.view.MenuItem;

26
OsmAnd/src/net/osmand/plus/activities/search/SearchPOIActivity.java
View file

@ -4,11 +4,6 @@
package net.osmand.plus.activities.search;
import android.content.Context;
import android.support.v4.view.MenuItemCompat;
import android.view.*;
import android.view.MenuItem.OnMenuItemClickListener;
import android.widget.*;
import gnu.trove.set.hash.TLongHashSet;
import java.util.ArrayList;
@ -53,6 +48,7 @@ import net.osmand.util.OpeningHoursParser;
import net.osmand.util.OpeningHoursParser.OpeningHours;
import android.app.AlertDialog;
import android.app.AlertDialog.Builder;
import android.content.Context;
import android.content.DialogInterface;
import android.content.Intent;
import android.hardware.Sensor;
@ -61,7 +57,7 @@ import android.os.AsyncTask;
import android.os.AsyncTask.Status;
import android.os.Bundle;
import android.os.Handler;
import android.os.Message;
import android.support.v4.view.MenuItemCompat;
import android.text.Editable;
import android.text.Spannable;
import android.text.SpannableString;
@ -69,7 +65,25 @@ import android.text.TextWatcher;
import android.text.method.LinkMovementMethod;
import android.text.style.ForegroundColorSpan;
import android.text.util.Linkify;
import android.view.Gravity;
import android.view.LayoutInflater;
import android.view.Menu;
import android.view.MenuItem;
import android.view.MenuItem.OnMenuItemClickListener;
import android.view.View;
import android.view.ViewGroup;
import android.view.ViewGroup.LayoutParams;
import android.view.Window;
import android.view.WindowManager;
import android.widget.AdapterView;
import android.widget.ArrayAdapter;
import android.widget.Button;
import android.widget.EditText;
import android.widget.Filter;
import android.widget.FrameLayout;
import android.widget.ImageView;
import android.widget.TextView;
import android.widget.Toast;
/**

4
OsmAnd/src/net/osmand/plus/dashboard/DashDownloadMapsFragment.java
View file

@ -41,7 +41,7 @@ public class DashDownloadMapsFragment extends DashBaseFragment {
public void onClick(View view) {
final Intent intent = new Intent(view.getContext(), getMyApplication().getAppCustomization().getDownloadIndexActivity());
intent.putExtra(DownloadActivity.TAB_TO_OPEN, DownloadActivity.LOCAL_TAB);
intent.putExtra(DownloadActivity.SINGLE_TAB, true);
//intent.putExtra(DownloadActivity.SINGLE_TAB, true);
getActivity().startActivity(intent);
}
});
@ -53,7 +53,7 @@ public class DashDownloadMapsFragment extends DashBaseFragment {
public void onClick(View view) {
final Intent intent = new Intent(view.getContext(), getMyApplication().getAppCustomization().getDownloadIndexActivity());
intent.putExtra(DownloadActivity.TAB_TO_OPEN, DownloadActivity.DOWNLOAD_TAB);
intent.putExtra(DownloadActivity.SINGLE_TAB, true);
//intent.putExtra(DownloadActivity.SINGLE_TAB, true);
getActivity().startActivity(intent);
}
});

2
OsmAnd/src/net/osmand/plus/dashboard/DashSearchFragment.java
View file

@ -12,6 +12,7 @@ import android.support.annotation.Nullable;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.Button;
import android.widget.TextView;
/**
@ -27,6 +28,7 @@ public class DashSearchFragment extends DashBaseFragment {
setupButtons(view);
Typeface typeface = FontCache.getRobotoMedium(getActivity());
((TextView) view.findViewById(R.id.search_for)).setTypeface(typeface);
((Button) view.findViewById(R.id.recents)).setTypeface(typeface);
return view;
}

2
OsmAnd/src/net/osmand/plus/dashboard/DashUpdatesFragment.java
View file

@ -49,7 +49,7 @@ public class DashUpdatesFragment extends DashBaseFragment {
public void onClick(View view) {
final Intent intent = new Intent(view.getContext(), getMyApplication().getAppCustomization().getDownloadIndexActivity());
intent.putExtra(DownloadActivity.TAB_TO_OPEN, DownloadActivity.UPDATES_TAB);
intent.putExtra(DownloadActivity.SINGLE_TAB, true);
//intent.putExtra(DownloadActivity.SINGLE_TAB, true);
getActivity().startActivity(intent);
}
});

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

@ -6,9 +6,6 @@ import java.util.Collection;
import java.util.List;
import java.util.Map;
import android.app.FragmentManager;
import android.view.MenuItem;
import android.view.Window;
import net.osmand.IndexConstants;
import net.osmand.plus.OsmandApplication;
import net.osmand.plus.OsmandPlugin;
@ -25,7 +22,9 @@ import android.os.AsyncTask;
import android.os.Bundle;
import android.support.v4.app.Fragment;
import android.support.v4.view.ViewPager;
import android.view.MenuItem;
import android.view.View;
import android.view.Window;
import android.widget.Button;
import android.widget.ImageView;
import android.widget.ProgressBar;