Merge branch 'master' of github.com:natura-cosmeticos/natds-android

natura-cosmeticos · Dec 2, 2020 · 1db39ca · 1db39ca
2 parents 343890f + 133d506
commit 1db39ca
Show file tree

Hide file tree

Showing 10 changed files with 61 additions and 42 deletions.
diff --git a/designsystem/src/main/kotlin/com/natura/android/progressindicator/ProgressIndicator.kt b/designsystem/src/main/kotlin/com/natura/android/progressindicator/ProgressIndicator.kt
@@ -0,0 +1,10 @@
+package com.natura.android.progressindicator
+
+import android.content.Context
+import android.util.AttributeSet
+import android.widget.ProgressBar
+
+class ProgressIndicator @JvmOverloads constructor(
+    context: Context,
+    attrs: AttributeSet? = null
+) : ProgressBar(context)
diff --git a/doc/progress-indicator.md b/doc/progress-indicator.md
@@ -0,0 +1,17 @@
+# Progress Indicator
+
+### What is it?
+A user interface element that indicates the progress of an operation.
+
+### How to use it?
+Nat DS Android Progress Indicator is based on a android [ProgressBar](https://developer.android.com/reference/android/widget/ProgressBar) with styles provided by Nat DS Theme.
+To use it, a Nat DS Theme must be provided to the view or its parents. After that, its possible to add a ProgressIndicator component on xml layout:
+
+```android
+    <com.natura.android.progressindicator.ProgressIndicator
+        android:id="@+id/ds_loading"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"/>
+```
+
+⚠️⚠️⚠️ Nat DS Android supports for now only Circular variant of Progress Indicator ⚠️⚠️⚠️
diff --git a/sample/src/androidTest/kotlin/com/natura/android/sample/MainActivityFunctionalTests.kt b/sample/src/androidTest/kotlin/com/natura/android/sample/MainActivityFunctionalTests.kt
@@ -190,11 +190,11 @@ class MainActivityFunctionalTests {
     }
 
     @Test
-    fun shouldOpenLoadingScreenWhenTapOnItButton() {
-        onView(withId(R.id.btnLoader)).perform(scrollTo())
-        onView(withId(R.id.btnLoader)).perform(click())
+    fun shouldOpenProgressIndicatorScreenWhenTapOnItButton() {
+        onView(withId(R.id.progressIndicatorButton)).perform(scrollTo())
+        onView(withId(R.id.progressIndicatorButton)).perform(click())
 
-        onView(withText("Loading Pattern")).check(matches(isDisplayed()))
+        onView(withText("Progress Indicator")).check(matches(isDisplayed()))
     }
 
     @Test

diff --git a/sample/src/main/AndroidManifest.xml b/sample/src/main/AndroidManifest.xml
@@ -87,7 +87,7 @@
             android:name=".tokens.icons.DrawableActivity"
             android:theme="@style/Theme.Natura" />
         <activity
-            android:name=".patterns.LoadingActivity"
+            android:name=".components.ProgressIndicatorActivity"
             android:theme="@style/Theme.Natura" />
         <activity
             android:name=".components.ValueTextHighlightActivity"

diff --git a/sample/src/main/kotlin/com/natura/android/sample/MainActivity.kt b/sample/src/main/kotlin/com/natura/android/sample/MainActivity.kt
@@ -5,7 +5,7 @@ import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
 import com.natura.android.sample.components.*
 import com.natura.android.sample.patterns.ErrorActivity
-import com.natura.android.sample.patterns.LoadingActivity
+import com.natura.android.sample.components.ProgressIndicatorActivity
 import com.natura.android.sample.patterns.LogoActivity
 import com.natura.android.sample.tokens.*
 import com.natura.android.sample.tokens.icons.DrawableActivity
@@ -108,8 +108,8 @@ class MainActivity : AppCompatActivity() {
             startActivity(Intent(this, ExpandableNavigationViewActivity::class.java))
         }
 
-        btnLoader.setOnClickListener {
-            startActivity(Intent(this, LoadingActivity::class.java))
+        progressIndicatorButton.setOnClickListener {
+            startActivity(Intent(this, ProgressIndicatorActivity::class.java))
         }
 
         btnErrorDefault.setOnClickListener {

diff --git a/...ndroid/sample/patterns/LoadingActivity.kt → ...e/components/ProgressIndicatorActivity.kt b/...ndroid/sample/patterns/LoadingActivity.kt → ...e/components/ProgressIndicatorActivity.kt
@@ -1,20 +1,20 @@
-package com.natura.android.sample.patterns
+package com.natura.android.sample.components
 
 import android.os.Bundle
 import android.view.MenuItem
 import androidx.appcompat.app.AppCompatActivity
 import com.natura.android.sample.R
 import com.natura.android.sample.setChosenDefaultTheme
 
-class LoadingActivity : AppCompatActivity() {
+class ProgressIndicatorActivity : AppCompatActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         setChosenDefaultTheme()
 
         super.onCreate(savedInstanceState)
-        setContentView(R.layout.activity_loading)
+        setContentView(R.layout.activity_progress_indicator)
         supportActionBar?.setDisplayHomeAsUpEnabled(true)
-        supportActionBar?.title = "Loading Pattern"
+        supportActionBar?.title = "Progress Indicator"
     }
 
     override fun onOptionsItemSelected(item: MenuItem): Boolean {

diff --git a/sample/src/main/res/layout/activity_loading.xml b/sample/src/main/res/layout/activity_loading.xml
diff --git a/sample/src/main/res/layout/activity_main.xml b/sample/src/main/res/layout/activity_main.xml
@@ -199,6 +199,18 @@
             android:background="@color/surface"
             android:textColor="@color/highEmphasis" />
 
+        <Button
+            android:id="@+id/progressIndicatorButton"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="Progress Indicator"
+            android:drawableRight="@drawable/ds_ic_outlined_navigation_arrowleft"
+            android:textAlignment="textStart"
+            android:layout_gravity="start"
+            android:padding="16dp"
+            android:background="@color/surface"
+            android:textColor="@color/highEmphasis" />
+
         <Button
             android:id="@+id/btnSelection"
             android:layout_width="match_parent"
@@ -280,18 +292,6 @@
             android:background="@color/surface"
             android:textColor="@color/highEmphasis" />
 
-        <Button
-            android:id="@+id/btnLoader"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="Loading"
-            android:drawableRight="@drawable/ds_ic_outlined_navigation_arrowleft"
-            android:textAlignment="textStart"
-            android:layout_gravity="start"
-            android:padding="16dp"
-            android:background="@color/surface"
-            android:textColor="@color/highEmphasis" />
-
         <Button
             android:id="@+id/logoPatternButton"
             android:layout_width="match_parent"

diff --git a/...rc/main/res/layout/ds_default_loading.xml → ...es/layout/activity_progress_indicator.xml b/...rc/main/res/layout/ds_default_loading.xml → ...es/layout/activity_progress_indicator.xml
@@ -1,12 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<merge xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:parentTag="androidx.constraintlayout.widget.ConstraintLayout">
+    android:orientation="vertical">
 
-    <ProgressBar
+    <com.natura.android.progressindicator.ProgressIndicator
         android:id="@+id/ds_loading"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -15,6 +16,6 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_bias="0.5"
         tools:visibility="visible" />
-
-</merge>
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/sample/src/test/kotlin/com/natura/android/sample/MainActivityTest.kt b/sample/src/test/kotlin/com/natura/android/sample/MainActivityTest.kt
@@ -4,7 +4,7 @@ import android.widget.Button
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import com.natura.android.sample.components.*
 import com.natura.android.sample.patterns.ErrorActivity
-import com.natura.android.sample.patterns.LoadingActivity
+import com.natura.android.sample.components.ProgressIndicatorActivity
 import com.natura.android.sample.patterns.LogoActivity
 import com.natura.android.sample.tokens.*
 import com.natura.android.sample.tokens.icons.DrawableActivity
@@ -151,14 +151,14 @@ class MainActivityTest {
     }
 
     @Test
-    fun checksLoadingButtonClickStartsLoadingScreen() {
-        val button = mainActivity.findViewById<Button>(R.id.btnLoader)
+    fun checksProgressIndicatorButtonClickStartsProgressIndicatorScreen() {
+        val button = mainActivity.findViewById<Button>(R.id.progressIndicatorButton)
 
         button.performClick()
         val startedIntent = shadowActivity.peekNextStartedActivity()
         val shadowIntent = shadowOf(startedIntent)
 
-        assertEquals(LoadingActivity::class.java, shadowIntent.intentClass)
+        assertEquals(ProgressIndicatorActivity::class.java, shadowIntent.intentClass)
     }
 
     @Test