Merge pull request #2525 from dkanada/pieview

add PieFractionview to android client

Author: bmarty

CHANGES.rst

@@ -9,6 +9,7 @@ Improvements:
 
 Other changes:
  - Upgrade olm-sdk.aar from version 2.2.2 to version 2.3.0
+ - move PieFractionView from the SDK to the client (#2525)
 
 Bugfix:
  -

vector/src/main/java/im/vector/adapters/VectorMediasViewerAdapter.java

@@ -51,7 +51,6 @@
 import org.matrix.androidsdk.util.ImageUtils;
 import org.matrix.androidsdk.util.JsonUtils;
 import org.matrix.androidsdk.util.Log;
-import org.matrix.androidsdk.view.PieFractionView;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -62,6 +61,7 @@
 import im.vector.R;
 import im.vector.activity.CommonActivityUtils;
 import im.vector.util.SlidableMediaInfo;
+import im.vector.view.PieFractionView;
 
 /**
  * An images slider

vector/src/main/java/im/vector/view/PieFractionView.java

@@ -0,0 +1,89 @@
+/* 
+ * Copyright 2014 OpenMarket Ltd
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package im.vector.view;
+
+import android.content.Context;
+import android.content.res.TypedArray;
+import android.graphics.Canvas;
+import android.graphics.Paint;
+import android.graphics.RectF;
+import android.util.AttributeSet;
+import android.view.View;
+
+import im.vector.R;
+
+/**
+ * View that displays a disc representing a percentage.
+ */
+public class PieFractionView extends View {
+
+    private static final int START_ANGLE = -90;
+
+    // fraction between 0 and 100
+    private int fraction = 0;
+
+    private final RectF rectF;
+    private final Paint paint;
+
+    private int fillColor;
+    private int restColor;
+
+    public int getFillColor() {
+        return getResources().getColor(R.color.vector_green_color);
+    }
+
+    public int getRestColor() {
+        return getResources().getColor(R.color.vector_dark_grey_color);
+    }
+
+    @SuppressWarnings("ResourceType")
+    public PieFractionView(Context context, AttributeSet attrs) {
+        super(context, attrs);
+
+        int[] attrArray = new int[] {android.R.attr.layout_width, android.R.attr.layout_height};
+        TypedArray typedArray = context.obtainStyledAttributes(attrs, attrArray);
+        int width = typedArray.getDimensionPixelSize(0, 0);
+        int height = typedArray.getDimensionPixelSize(1, 0);
+        typedArray.recycle();
+
+        rectF = new RectF(0, 0, width, height);
+        paint = new Paint();
+
+        fillColor = getFillColor();
+        restColor = getRestColor();
+    }
+
+    public void setFraction(int fraction) {
+        // check bounds and avoid useless refresh
+        if ((0 <= fraction) && (fraction <= 100) && (this.fraction != fraction)) {
+            this.fraction = fraction;
+            invalidate();
+        }
+    }
+
+    @Override
+    protected void onDraw(Canvas canvas) {
+        int angle = fraction * 360 / 100;
+
+        // draw the fill section
+        paint.setColor(fillColor);
+        canvas.drawArc(rectF, START_ANGLE, angle, true, paint);
+
+        // draw the rest of the circle
+        paint.setColor(restColor);
+        canvas.drawArc(rectF, START_ANGLE + angle, 360 - angle, true, paint);
+    }
+}

vector/src/main/res/layout/adapter_vector_medias_viewer.xml

@@ -35,11 +35,11 @@
     </RelativeLayout>
 
 
-    <org.matrix.androidsdk.view.PieFractionView
+    <im.vector.view.PieFractionView
         android:id="@+id/media_slider_piechart"
         android:layout_centerHorizontal="true"
         android:layout_centerVertical="true"
-        android:alpha="0.2"
+        android:alpha="0.4"
         android:layout_width="160dp"
         android:layout_height="160dp"/>