Merge pull request #6 from kareemradwan/number-stepper-view

Create Number stepper view
kareemradwan · Jul 4, 2020 · c74bdcc · c74bdcc
2 parents 22d7e09 + c82ff2b
commit c74bdcc
Show file tree

Hide file tree

Showing 22 changed files with 589 additions and 38 deletions.
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/README.md b/README.md
@@ -43,6 +43,7 @@ You can Register The Activity as Controller to Notifiy When `SteeoerView` Finish
   - [X] Save State of View When Device Rotate.
   - [X] Custmaize Color for `unChecked` and `Checked` status (Indicator)
   - [X] Custmaize Image Drawable for `unChecked` and `Checked` status (Step Icon)
+  - [X] Create Number Stepper View
   - [ ] Add Animation for `CheckBox` When be Selected
 
 

diff --git a/app/src/main/java/com/kareemradwan/stepeer/MainActivity.kt b/app/src/main/java/com/kareemradwan/stepeer/MainActivity.kt
@@ -4,7 +4,7 @@ import android.annotation.SuppressLint
 import android.os.Bundle
 import android.widget.Toast
 import androidx.appcompat.app.AppCompatActivity
-import com.kradwan.stepeer.view.SteeperView
+import com.kradwan.stepeer.view.verticalStepper.SteeperView
 import kotlinx.android.synthetic.main.activity_main.*
 
 
@@ -15,7 +15,7 @@ class MainActivity : AppCompatActivity(), SteeperView.SteeperHandler {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_main)
 
-        val order1 = Order(1, "Step1" , true)
+        val order1 = Order(1, "Step1", true)
         order1.setChecked(true)
         val adapter = OrderAdapter(
             this, listOf(
@@ -26,9 +26,13 @@ class MainActivity : AppCompatActivity(), SteeperView.SteeperHandler {
             )
         )
         steeper.setAdapter(adapter)
+        steeper2.setAdapter(adapter)
         // Assign Controller
-        steeper.setController(this)
-        nextStep.setOnClickListener { steeper.nextStep() }
+//        steeper.setController(this)
+        nextStep.setOnClickListener {
+            steeper.nextStep()
+            steeper2.nextStep()
+        }
 
     }
 

diff --git a/app/src/main/res/drawable/ic_signal_wifi_0_bar_black_24dp.xml b/app/src/main/res/drawable/ic_signal_wifi_0_bar_black_24dp.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#E92C3C"
+    android:viewportHeight="24.0" android:viewportWidth="24.0"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillAlpha=".3" android:fillColor="#FF000000" android:pathData="M12.01,21.49L23.64,7c-0.45,-0.34 -4.93,-4 -11.64,-4C5.28,3 0.81,6.66 0.36,7l11.63,14.49 0.01,0.01 0.01,-0.01z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_signal_wifi_4_bar_black_24dp.xml b/app/src/main/res/drawable/ic_signal_wifi_4_bar_black_24dp.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#E92C3C"
+    android:viewportHeight="24.0" android:viewportWidth="24.0"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF000000" android:pathData="M12.01,21.49L23.64,7c-0.45,-0.34 -4.93,-4 -11.64,-4C5.28,3 0.81,6.66 0.36,7l11.63,14.49 0.01,0.01 0.01,-0.01z"/>
+</vector>
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
@@ -15,10 +15,25 @@
         tools:context=".MainActivity">
 
 
-        <com.kradwan.stepeer.view.SteeperView
+        <com.kradwan.stepeer.view.numberStepper.NumberStepperView
             android:id="@+id/steeper"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+
+            app:divider_color_checked="@color/colorAccent"
+            app:divider_color_unchecked="@android:color/black"
+            app:num_text_color_checked="#fffff2"
+            app:num_text_color_unchecked="@android:color/black"
+            android:padding="20dp"
+            />
+
+
+
+        <com.kradwan.stepeer.view.verticalStepper.SteeperView
+            android:id="@+id/steeper2"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:checked_color="@android:color/white"
             android:padding="20dp"
             />
 

diff --git a/app/src/main/res/layout/order_step.xml b/app/src/main/res/layout/order_step.xml
@@ -4,8 +4,10 @@
     android:layout_height="match_parent"
     android:layout_marginStart="20dp"
     android:layout_marginLeft="20dp"
+    android:paddingStart="20dp"
     android:orientation="vertical"
-    android:paddingBottom="4dp">
+    android:paddingBottom="4dp"
+    android:paddingLeft="20dp">
 
     <LinearLayout
         android:layout_width="match_parent"

diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
@@ -3,4 +3,5 @@
     <color name="colorPrimary">#6200EE</color>
     <color name="colorPrimaryDark">#3700B3</color>
     <color name="colorAccent">#03DAC5</color>
+    <color name="ww">#ffffff</color>
 </resources>
diff --git a/stepeer/build.gradle b/stepeer/build.gradle
@@ -7,7 +7,7 @@ android {
     buildToolsVersion "29.0.3"
 
     defaultConfig {
-        minSdkVersion  15
+        minSdkVersion  16
         targetSdkVersion 29
         versionCode 1
         versionName "1.0"
@@ -22,6 +22,13 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+    kotlinOptions {
+        jvmTarget = "1.8"
+    }
 
 }
 

diff --git a/stepeer/src/main/AndroidManifest.xml b/stepeer/src/main/AndroidManifest.xml
@@ -1,2 +1,2 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.kradwan.stepeer" />
+    package="com.kradwan.stepeer"  />
diff --git a/stepeer/src/main/java/com/kradwan/stepeer/model/Constants.kt b/stepeer/src/main/java/com/kradwan/stepeer/model/Constants.kt
@@ -0,0 +1,21 @@
+package com.kradwan.stepeer.model
+
+
+class Constants {
+    companion object {
+        const val COLOR_CHECKED = "checked_color"
+        const val COLOR_UNCHECKED = "unchecked_color"
+
+// For Number Step View
+
+        const val NUM_TEXT_COLOR_CHECKED = "NUM_TEXt_COLOR_CHECKED"
+        const val NUM_TEXT_COLOR_UNCHECKED = "NUM_TEXt_COLOR_UNCHECKED"
+
+        const val STEP_ICON_CHECKED = "STEP_ICON_CHECKED"
+        const val STEP_ICON_UNCHECKED = "STEP_ICON_UNCHECKED"
+
+        const val DIVIDER_COLOR_CHECKED = "DIVIDER_COLOR_CHECKED"
+        const val DIVIDER_COLOR_UNCHECKED = "DIVIDER_COLOR_UNCHECKED"
+
+    }
+}
diff --git a/stepeer/src/main/java/com/kradwan/stepeer/model/StepColor.kt b/stepeer/src/main/java/com/kradwan/stepeer/model/StepColor.kt
@@ -12,15 +12,14 @@ import android.graphics.Color
 data class StepColor(var color: Int) {
 
     companion object {
-        const val COLOR_CHECKED = "checked_color"
-        const val COLOR_UNCHECKED = "unchecked_color"
+
 
         val defaultColor = Color.parseColor("#1C8AFF")
 
         fun default(): HashMap<String, StepColor> {
             return hashMapOf(
-                Pair(COLOR_CHECKED, StepColor(defaultColor)),
-                Pair(COLOR_CHECKED, StepColor(defaultColor))
+                Pair(Constants.COLOR_CHECKED, StepColor(defaultColor)),
+                Pair(Constants.COLOR_CHECKED, StepColor(defaultColor))
             )
         }
     }

diff --git a/stepeer/src/main/java/com/kradwan/stepeer/model/StepDrawable.kt b/stepeer/src/main/java/com/kradwan/stepeer/model/StepDrawable.kt
@@ -8,9 +8,11 @@ import com.kradwan.stepeer.R
 class StepDrawable(var drawable: Drawable) {
 
     companion object {
+
         const val DRAWABLE_CHECKED = "checked_drawable"
         const val DRAWABLE_UNCHECKED = "unchecked_drawable"
 
+
         private val defaultIconId = R.drawable.ic_star_black_24dp
 
         fun default(context: Context): HashMap<String, StepDrawable> {
@@ -20,5 +22,11 @@ class StepDrawable(var drawable: Drawable) {
                 Pair(DRAWABLE_UNCHECKED, StepDrawable(drawable))
             )
         }
+
+        fun  fromId(context: Context , id: Int)  : StepDrawable{
+            return StepDrawable(ContextCompat.getDrawable(context , id)!!)
+        }
     }
-}
+}
+
+class StepResource(var id: Int)