diff --git a/android/res/layout/about.xml b/android/res/layout/about.xml index 6348d19b8f..21a463da2a 100644 --- a/android/res/layout/about.xml +++ b/android/res/layout/about.xml @@ -1,10 +1,20 @@ - + + - + android:layout_width="match_parent" + android:layout_height="@dimen/dialog_max_height" + android:layout_gravity="center" + android:visibility="invisible"/> + + diff --git a/android/res/values-sw600dp/dimens.xml b/android/res/values-sw600dp/dimens.xml new file mode 100644 index 0000000000..ac2393be73 --- /dev/null +++ b/android/res/values-sw600dp/dimens.xml @@ -0,0 +1,6 @@ + + + 128dp + 560dp + + diff --git a/android/res/values-sw720dp-land/dimens.xml b/android/res/values-sw720dp-land/dimens.xml index 61e3fa8fbc..410e445e7b 100644 --- a/android/res/values-sw720dp-land/dimens.xml +++ b/android/res/values-sw720dp-land/dimens.xml @@ -1,9 +1,5 @@ - 128dp diff --git a/android/res/values-sw720dp/dimens.xml b/android/res/values-sw720dp/dimens.xml new file mode 100644 index 0000000000..a822119bc7 --- /dev/null +++ b/android/res/values-sw720dp/dimens.xml @@ -0,0 +1,6 @@ + + + 128dp + 640dp + + diff --git a/android/res/values/dimens.xml b/android/res/values/dimens.xml index e8f73e41fb..67b97a374d 100644 --- a/android/res/values/dimens.xml +++ b/android/res/values/dimens.xml @@ -4,9 +4,11 @@ 24dp 16dp 16dp - + 8dp 16dp 32dp + 320dp + diff --git a/android/src/com/mapswithme/maps/ContextMenu.java b/android/src/com/mapswithme/maps/ContextMenu.java index c83bafdaba..8d8b94df37 100644 --- a/android/src/com/mapswithme/maps/ContextMenu.java +++ b/android/src/com/mapswithme/maps/ContextMenu.java @@ -4,25 +4,42 @@ import android.app.Activity; import android.app.AlertDialog; import android.content.DialogInterface; import android.content.Intent; +import android.graphics.Bitmap; import android.view.LayoutInflater; import android.view.Menu; import android.view.MenuInflater; import android.view.MenuItem; import android.view.View; +import android.view.animation.AlphaAnimation; import android.webkit.WebView; +import android.webkit.WebViewClient; import com.mapswithme.maps.settings.SettingsActivity; +import com.mapswithme.util.UiUtils; public class ContextMenu { private static void onAboutDialogClicked(Activity parent) { - LayoutInflater inflater = LayoutInflater.from(parent); + final String url = "file:///android_asset/about.html"; + LayoutInflater inflater = LayoutInflater.from(parent); View alertDialogView = inflater.inflate(R.layout.about, null); - WebView myWebView = (WebView) alertDialogView.findViewById(R.id.webview_about); - myWebView.loadUrl("file:///android_asset/about.html"); + final WebView myWebView = (WebView) alertDialogView.findViewById(R.id.webview_about); + + myWebView.setWebViewClient(new WebViewClient() { + @Override + public void onPageFinished(WebView view, String url) + { + super.onPageFinished(view, url); + UiUtils.show(myWebView); + + AlphaAnimation aAnim = new AlphaAnimation(0, 1); + aAnim.setDuration(750); + myWebView.startAnimation(aAnim); + } + }); new AlertDialog.Builder(parent) .setView(alertDialogView) @@ -32,11 +49,13 @@ public class ContextMenu @Override public void onClick(DialogInterface dialog, int which) { - dialog.cancel(); + dialog.dismiss(); } }) .create() .show(); + + myWebView.loadUrl(url); } private static void onSettingsClicked(Activity parent)