Merge pull request #91 from kosiara/feature/add.max.width.percentage.…

…support .maxWidthPercentage(float width) method
nispok · Mar 6, 2015 · 03c6df6 · 03c6df6
2 parents f1e24ec + d03bd78
commit 03c6df6
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 1 deletion.
diff --git a/lib/src/main/java/com/nispok/snackbar/DisplayCompat.java b/lib/src/main/java/com/nispok/snackbar/DisplayCompat.java
@@ -1,5 +1,6 @@
 package com.nispok.snackbar;
 
+import android.app.Activity;
 import android.graphics.Point;
 import android.os.Build;
 import android.view.Display;
@@ -30,4 +31,12 @@ public static void getSize(Display display, Point outSize) {
     public static void getRealSize(Display display, Point outSize) {
         IMPL.getRealSize(display, outSize);
     }
+
+    public static int getWidthFromPercentage(Activity targetActivity, Float mMaxWidthPercentage) {
+        Display display = targetActivity.getWindowManager().getDefaultDisplay();
+        Point dispSize = new Point();
+        getRealSize(display, dispSize);
+
+        return (int) (dispSize.x * mMaxWidthPercentage);
+    }
 }
diff --git a/lib/src/main/java/com/nispok/snackbar/Snackbar.java b/lib/src/main/java/com/nispok/snackbar/Snackbar.java
@@ -111,6 +111,7 @@ public int getLayoutGravity() {
     private Point mDisplaySize = new Point();
     private Point mRealDisplaySize = new Point();
     private Activity mTargetActivity;
+    private Float mMaxWidthPercentage = null;
     private boolean mUsePhoneLayout;
     private Runnable mDismissRunnable = new Runnable() {
         @Override
@@ -546,7 +547,10 @@ private MarginLayoutParams init(Context context, Activity targetActivity, ViewGr
             // Tablet/desktop
             mType = SnackbarType.SINGLE_LINE; // Force single-line
             layout.setMinimumWidth(res.getDimensionPixelSize(R.dimen.sb__min_width));
-            layout.setMaxWidth(res.getDimensionPixelSize(R.dimen.sb__max_width));
+            layout.setMaxWidth(
+                    mMaxWidthPercentage == null
+                    ? res.getDimensionPixelSize(R.dimen.sb__max_width)
+                    : DisplayCompat.getWidthFromPercentage(targetActivity , mMaxWidthPercentage));
             layout.setBackgroundResource(R.drawable.sb__bg);
             GradientDrawable bg = (GradientDrawable) layout.getBackground();
             bg.setColor(mColor);
@@ -740,6 +744,11 @@ public void show(ViewGroup parent, boolean usePhoneLayout) {
         showInternal(null, params, parent);
     }
 
+    public Snackbar maxWidthPercentage(float maxWidthPercentage) {
+        mMaxWidthPercentage = maxWidthPercentage;
+        return this;
+    }
+
     private void showInternal(Activity targetActivity, MarginLayoutParams params, ViewGroup parent) {
         parent.removeView(this);