From c44ce77e955513b9120ce8f364fa49cdedaf4cc5 Mon Sep 17 00:00:00 2001 From: dvdandroid Date: Fri, 26 Aug 2016 13:01:12 +0200 Subject: [PATCH] Updated UI for tablets --- app/src/main/AndroidManifest.xml | 4 +++- .../com/topjohnwu/magisk/AboutActivity.java | 17 +++++++++++++++++ app/src/main/res/drawable/ic_file_download.xml | 2 +- app/src/main/res/values-sw600dp-v21/styles.xml | 12 ++++++++++++ app/src/main/res/values-sw600dp/bools.xml | 4 ++++ app/src/main/res/values/bools.xml | 4 ++++ app/src/main/res/values/dimens.xml | 5 +++++ app/src/main/res/values/styles.xml | 3 +++ 8 files changed, 49 insertions(+), 2 deletions(-) create mode 100644 app/src/main/res/values-sw600dp-v21/styles.xml create mode 100644 app/src/main/res/values-sw600dp/bools.xml create mode 100644 app/src/main/res/values/bools.xml create mode 100644 app/src/main/res/values/dimens.xml diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 47fb5507e..c74ce0f47 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -23,7 +23,9 @@ - + \ No newline at end of file diff --git a/app/src/main/java/com/topjohnwu/magisk/AboutActivity.java b/app/src/main/java/com/topjohnwu/magisk/AboutActivity.java index 68f10f609..acb96537e 100644 --- a/app/src/main/java/com/topjohnwu/magisk/AboutActivity.java +++ b/app/src/main/java/com/topjohnwu/magisk/AboutActivity.java @@ -13,6 +13,7 @@ import android.text.Html; import android.text.TextUtils; import android.text.method.LinkMovementMethod; import android.view.View; +import android.view.WindowManager; import android.widget.TextView; import com.topjohnwu.magisk.utils.RowItem; @@ -135,6 +136,22 @@ public class AboutActivity extends AppCompatActivity { startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(XDA_THREAD))); } }); + + setFloating(); + } + + public void setFloating() { + boolean isTablet = getResources().getBoolean(R.bool.isTablet); + if (isTablet) { + WindowManager.LayoutParams params = getWindow().getAttributes(); + params.height = getResources().getDimensionPixelSize(R.dimen.floating_height); + params.width = getResources().getDimensionPixelSize(R.dimen.floating_width); + params.alpha = 1.0f; + params.dimAmount = 0.6f; + params.flags |= 2; + getWindow().setAttributes(params); + setFinishOnTouchOutside(true); + } } @Override diff --git a/app/src/main/res/drawable/ic_file_download.xml b/app/src/main/res/drawable/ic_file_download.xml index 0db3296cd..e28a21acb 100644 --- a/app/src/main/res/drawable/ic_file_download.xml +++ b/app/src/main/res/drawable/ic_file_download.xml @@ -4,6 +4,6 @@ android:viewportHeight="24.0" android:viewportWidth="24.0"> diff --git a/app/src/main/res/values-sw600dp-v21/styles.xml b/app/src/main/res/values-sw600dp-v21/styles.xml new file mode 100644 index 000000000..354aba462 --- /dev/null +++ b/app/src/main/res/values-sw600dp-v21/styles.xml @@ -0,0 +1,12 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/values-sw600dp/bools.xml b/app/src/main/res/values-sw600dp/bools.xml new file mode 100644 index 000000000..d3a0e92c9 --- /dev/null +++ b/app/src/main/res/values-sw600dp/bools.xml @@ -0,0 +1,4 @@ + + + true + \ No newline at end of file diff --git a/app/src/main/res/values/bools.xml b/app/src/main/res/values/bools.xml new file mode 100644 index 000000000..f855de6a2 --- /dev/null +++ b/app/src/main/res/values/bools.xml @@ -0,0 +1,4 @@ + + + false + \ No newline at end of file diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml new file mode 100644 index 000000000..8eb8263ae --- /dev/null +++ b/app/src/main/res/values/dimens.xml @@ -0,0 +1,5 @@ + + + 650dp + 500dp + \ No newline at end of file diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 9e0353ff7..786d3bc0e 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -21,4 +21,7 @@ @color/icons + +