Merge branch 'master' of https://github.com/matto1990/android-viewflow

Author: pakerfeldt

viewflow-example/.classpath

@@ -1,9 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
-	<classpathentry kind="src" path="viewflow_src"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="src" path="gen"/>
-	<classpathentry kind="src" path="org_taptwo_android_widget_viewflow_src"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="src" path="gen"/>
+	<classpathentry kind="src" path="org_taptwo_android_widget_viewflow_src"/>
+	<classpathentry kind="src" path="viewflow_src"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/viewflow"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>

viewflow-example/res/layout/circle_layout.xml

@@ -1,26 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:app="http://schemas.android.com/apk/res/org.taptwo.android.widget.viewflow.example"
 	android:orientation="vertical" android:layout_width="fill_parent"
 	android:layout_height="fill_parent">
 
-
-
-	<LinearLayout android:layout_height="wrap_content"
-		android:layout_width="fill_parent" android:gravity="center_horizontal"
-		android:orientation="horizontal" android:id="@+id/header_layout">
-		<org.taptwo.android.widget.CircleFlowIndicator
-			android:padding="10dip" android:layout_height="wrap_content"
-			android:layout_width="wrap_content" android:id="@+id/viewflowindic"
-			android:background="#00000000"></org.taptwo.android.widget.CircleFlowIndicator>
-	</LinearLayout>
+	<org.taptwo.android.widget.CircleFlowIndicator
+		android:padding="10dip"
+		android:layout_height="wrap_content"
+		android:layout_width="wrap_content"
+		android:id="@+id/viewflowindic"
+		android:layout_gravity="center_horizontal"
+		app:inactiveType="fill"
+		app:fadeOut="1000" />
 	<org.taptwo.android.widget.ViewFlow
 		android:id="@+id/viewflow" android:layout_width="fill_parent"
 		android:layout_height="fill_parent" app:sidebuffer="3"></org.taptwo.android.widget.ViewFlow>
 
-
-
-
-
-
-</LinearLayout>
+</FrameLayout>

viewflow/res/values/attrs.xml

@@ -19,10 +19,19 @@
         <attr name="sidebuffer" format="integer" />
     </declare-styleable>
     <declare-styleable name="CircleFlowIndicator">
-        <attr name="fillColor" format="color" />
-        <attr name="strokeColor" format="color" />
+        <attr name="activeColor" format="color" />
+        <attr name="inactiveColor" format="color" />
         <attr name="radius" format="dimension" />
 		<attr name="centered" format="boolean" />
+		<attr name="fadeOut" format="integer" />
+		<attr name="inactiveType">
+			<flag name="stroke" value="0" />
+			<flag name="fill" value="1" />
+		</attr>
+		<attr name="activeType">
+			<flag name="stroke" value="0" />
+			<flag name="fill" value="1" />
+		</attr>
     </declare-styleable>    
     <declare-styleable name="TitleFlowIndicator">
         <attr name="titlePadding" format="dimension" />