change mk_type to enum

jamesnguyenhub · Feb 16, 2017 · c043ab9 · c043ab9
1 parent f6d8c99
commit c043ab9
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 6 deletions.
diff --git a/library/src/main/java/com/tuyenmonkey/mkloader/MKLoader.java b/library/src/main/java/com/tuyenmonkey/mkloader/MKLoader.java
@@ -34,9 +34,8 @@ public MKLoader(Context context, AttributeSet attrs, int defStyleAttr) {
 
   private void initialize(Context context, AttributeSet attrs, int defStyleAttr) {
     TypedArray typedArray = context.obtainStyledAttributes(attrs, R.styleable.MKLoader);
+    int loaderType = typedArray.getInt(R.styleable.MKLoader_mk_type,-1);
 
-    String loaderType = typedArray.getString(R.styleable.MKLoader_mk_type);
-    if (loaderType == null) loaderType = "ClassicSpinner";
     loaderView = LoaderGenerator.generateLoaderView(loaderType);
     loaderView.setColor(typedArray.getColor(R.styleable.MKLoader_mk_color, Color.parseColor("#ffffff")));
     loaderView.setInvalidateListener(this);

diff --git a/library/src/main/res/values/attrs.xml b/library/src/main/res/values/attrs.xml
@@ -1,7 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-  <declare-styleable name="MKLoader">
-    <attr name="mk_color" format="color" />
-    <attr name="mk_type" format="string" />
-  </declare-styleable>
+    <declare-styleable name="MKLoader">
+        <attr name="mk_color" format="color"/>
+        <attr name="mk_type">
+            <enum name="Sharingan" value="11"/>
+            <enum name="TwinFishesSpinner" value="7"/>
+            <enum name="ClassicSpinner" value="0"/>
+
+            <enum name="LineSpinner" value="2"/>
+            <enum name="FishSpinner" value="1"/>
+            <enum name="PhoneWave" value="10"/>
+
+            <enum name="ThreePulse" value="3"/>
+            <enum name="FourPulse" value="4"/>
+            <enum name="FivePulse" value="5"/>
+
+            <enum name="Worm" value="8"/>
+            <enum name="Whirlpool" value="9"/>
+            <enum name="Radar" value="6"/>
+        </attr>
+    </declare-styleable>
 </resources>