Fixed few bugs with content under actionbar
This commit is contained in:
parent
e28e69544a
commit
36f9c42933
5 changed files with 12 additions and 36 deletions
|
@ -21,8 +21,10 @@
|
||||||
android:padding="@dimen/dashPadding"
|
android:padding="@dimen/dashPadding"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content">
|
android:layout_height="wrap_content">
|
||||||
|
|
||||||
<LinearLayout
|
<LinearLayout
|
||||||
android:orientation="vertical"
|
android:orientation="vertical"
|
||||||
|
android:layout_marginTop="6dp"
|
||||||
android:layout_width="0dp"
|
android:layout_width="0dp"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_weight="1">
|
android:layout_weight="1">
|
||||||
|
@ -31,7 +33,12 @@
|
||||||
android:orientation="horizontal"
|
android:orientation="horizontal"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"/>
|
android:layout_height="wrap_content"/>
|
||||||
|
<fragment
|
||||||
|
android:id="@+id/SearchFragment"
|
||||||
|
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
android:name="net.osmand.plus.dashboard.DashSearchFragment"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"/>
|
||||||
|
|
||||||
<fragment
|
<fragment
|
||||||
android:id="@+id/FavoritesFragment"
|
android:id="@+id/FavoritesFragment"
|
||||||
|
@ -57,13 +64,6 @@
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_weight="1">
|
android:layout_weight="1">
|
||||||
|
|
||||||
<fragment
|
|
||||||
android:id="@+id/SearchFragment"
|
|
||||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
|
||||||
android:name="net.osmand.plus.dashboard.DashSearchFragment"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"/>
|
|
||||||
|
|
||||||
<!--<fragment-->
|
<!--<fragment-->
|
||||||
<!--android:id="@+id/DownloadMapFragment"-->
|
<!--android:id="@+id/DownloadMapFragment"-->
|
||||||
<!--xmlns:android="http://schemas.android.com/apk/res/android"-->
|
<!--xmlns:android="http://schemas.android.com/apk/res/android"-->
|
||||||
|
@ -91,32 +91,6 @@
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
|
|
||||||
|
|
||||||
<LinearLayout android:id="@+id/credentials"
|
|
||||||
android:layout_width="fill_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:orientation="horizontal"
|
|
||||||
android:visibility="gone"
|
|
||||||
android:padding="@dimen/dashPadding"
|
|
||||||
android:baselineAligned="false">
|
|
||||||
|
|
||||||
<LinearLayout
|
|
||||||
android:layout_width="fill_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_gravity="bottom"
|
|
||||||
android:layout_weight="0.5" >
|
|
||||||
|
|
||||||
<TextView
|
|
||||||
android:id="@+id/About"
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_gravity="start|bottom"
|
|
||||||
android:text="@string/about_settings"
|
|
||||||
android:textSize="@dimen/dashAboutTextSize" />
|
|
||||||
</LinearLayout>
|
|
||||||
|
|
||||||
</LinearLayout>
|
|
||||||
|
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
|
|
||||||
</net.osmand.plus.dashboard.NotifyingScrollView>
|
</net.osmand.plus.dashboard.NotifyingScrollView>
|
|
@ -2,6 +2,7 @@
|
||||||
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
android:layout_width="fill_parent"
|
android:layout_width="fill_parent"
|
||||||
android:layout_height="fill_parent"
|
android:layout_height="fill_parent"
|
||||||
|
android:layout_marginTop="?attr/actionBarSize"
|
||||||
android:orientation="vertical">
|
android:orientation="vertical">
|
||||||
|
|
||||||
<ListView
|
<ListView
|
||||||
|
|
|
@ -2,6 +2,7 @@
|
||||||
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
android:layout_width="fill_parent"
|
android:layout_width="fill_parent"
|
||||||
android:layout_height="fill_parent"
|
android:layout_height="fill_parent"
|
||||||
|
android:layout_marginTop="?attr/actionBarSize"
|
||||||
android:orientation="vertical">
|
android:orientation="vertical">
|
||||||
|
|
||||||
<LinearLayout
|
<LinearLayout
|
||||||
|
|
|
@ -23,7 +23,7 @@
|
||||||
<dimen name="dashCardMargin">6dp</dimen>
|
<dimen name="dashCardMargin">6dp</dimen>
|
||||||
|
|
||||||
<!-- TextSizes -->
|
<!-- TextSizes -->
|
||||||
<dimen name="showAllButtonTextSize">18sp</dimen>
|
<dimen name="showAllButtonTextSize">16sp</dimen>
|
||||||
<dimen name="subHeaderTextSize">21sp</dimen>
|
<dimen name="subHeaderTextSize">21sp</dimen>
|
||||||
<dimen name="dashFavNameTextSize">24sp</dimen>
|
<dimen name="dashFavNameTextSize">24sp</dimen>
|
||||||
</resources>
|
</resources>
|
|
@ -211,7 +211,7 @@ public class SearchPOIActivity extends OsmandListActivity implements OsmAndCompa
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onCreate(Bundle icicle) {
|
public void onCreate(Bundle icicle) {
|
||||||
requestWindowFeature(Window.FEATURE_INDETERMINATE_PROGRESS);
|
supportRequestWindowFeature(Window.FEATURE_INDETERMINATE_PROGRESS);
|
||||||
super.onCreate(icicle);
|
super.onCreate(icicle);
|
||||||
setContentView(R.layout.searchpoi);
|
setContentView(R.layout.searchpoi);
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue