[android] fix: Whats new.

This commit is contained in:
Alexander Marchuk 2016-06-17 18:54:00 +03:00 committed by Vladimir Byko-Ianko
parent 7e9ebe3541
commit 742e141d8a
31 changed files with 21 additions and 27 deletions

View file

Before

Width:  |  Height:  |  Size: 59 KiB

After

Width:  |  Height:  |  Size: 59 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 38 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 46 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 50 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 39 KiB

View file

Before

Width:  |  Height:  |  Size: 37 KiB

After

Width:  |  Height:  |  Size: 37 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 25 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 27 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 32 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 24 KiB

View file

Before

Width:  |  Height:  |  Size: 80 KiB

After

Width:  |  Height:  |  Size: 80 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 52 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 54 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 69 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 50 KiB

View file

Before

Width:  |  Height:  |  Size: 127 KiB

After

Width:  |  Height:  |  Size: 127 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 84 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 86 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 112 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 83 KiB

View file

Before

Width:  |  Height:  |  Size: 101 KiB

After

Width:  |  Height:  |  Size: 101 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 69 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 68 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 91 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 92 KiB

View file

@ -17,7 +17,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/margin_base"
android:src="@drawable/img_news_migration"
android:src="@drawable/img_migration"
android:tag="@string/tag_height_limited"/>
<TextView

View file

@ -74,7 +74,7 @@
android:id="@+id/done"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="right"
android:layout_gravity="end"
android:text="@string/done"
android:textAppearance="@style/MwmTextAppearance.Body3"
android:textColor="?colorAccent"

View file

@ -25,7 +25,7 @@
android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/margin_base"
android:layout_gravity="center_horizontal"
android:src="@drawable/img_news_editor"
android:src="@drawable/img_news_booking"
android:tag="@string/tag_height_limited"/>
<TextView

View file

@ -17,6 +17,15 @@
android:layout_height="wrap_content"
android:orientation="vertical"
android:layout_gravity="center">
<ImageView
android:id="@+id/image"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/margin_base"
android:layout_gravity="center_horizontal"
android:tag="@string/tag_height_limited"
tools:src="@drawable/img_news_booking"/>
<TextView
android:id="@+id/title"
android:layout_width="wrap_content"
@ -30,22 +39,13 @@
android:fontFamily="@string/robotoMedium"
tools:text="Whats new feature!"/>
<ImageView
android:id="@+id/image"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/margin_base"
android:layout_gravity="center_horizontal"
android:tag="@string/tag_height_limited"
tools:src="@drawable/img_news_night"/>
<TextView
android:id="@+id/subtitle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/margin_base"
android:layout_marginRight="@dimen/margin_base"
android:textAppearance="@style/MwmTextAppearance.Body1"
android:textAppearance="@style/MwmTextAppearance.Body1.Secondary"
android:layout_gravity="center_horizontal"
android:gravity="center_horizontal"
tools:text="We\'ve made some cool stuff!\nSit down and be happy now, man."/>

View file

@ -87,38 +87,32 @@
<!-- What's new -->
<integer-array name="news_images">
<item>@drawable/img_news_migration</item>
<item>@drawable/img_news_editor</item>
<item>@drawable/img_news_search</item>
<item>@drawable/img_news_booking</item>
<item>@drawable/img_news_bicycle</item>
</integer-array>
<string-array name="news_titles">
<item>@string/whatsnew_smallmwm_header</item>
<item>@string/whatsnew_editor_title</item>
<item>@string/whatsnew_search_header</item>
<item>@string/whatsnew_booking_header</item>
<item>@string/whatsnew_cycle_navigation_header</item>
</string-array>
<string-array name="news_messages_1">
<item>@string/whatsnew_smallmwm_message</item>
<item>@string/whatsnew_editor_message_1</item>
<item>@string/whatsnew_search_message</item>
<item>@string/whatsnew_booking_message</item>
<item>@string/whatsnew_cycle_navigation_message</item>
</string-array>
<string-array name="news_messages_2">
<item/>
<item>@string/whatsnew_editor_message_2</item>
<item/>
</string-array>
<string-array name="news_switch_titles">
<item/>
<item/>
<item/>
</string-array>
<string-array name="news_switch_subtitles">
<item/>
<item/>
<item/>
</string-array>
</resources>

View file

@ -51,7 +51,7 @@ import com.mapswithme.maps.editor.ViralFragment;
import com.mapswithme.maps.location.CompassData;
import com.mapswithme.maps.location.LocationHelper;
import com.mapswithme.maps.news.FirstStartFragment;
import com.mapswithme.maps.news.SinglePageNewsFragment;
import com.mapswithme.maps.news.NewsFragment;
import com.mapswithme.maps.routing.NavigationController;
import com.mapswithme.maps.routing.RoutingController;
import com.mapswithme.maps.routing.RoutingInfo;
@ -779,7 +779,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
}
});
}
else if (!SinglePageNewsFragment.showOn(this))
else if (!NewsFragment.showOn(this))
{
if (ViralFragment.shouldDisplay())
new ViralFragment().show(getSupportFragmentManager(), "");