From 674576ed5de387b77184d295c8f315eb7398cebe Mon Sep 17 00:00:00 2001
From: Ahmed M Abdalla <ahmed7official@gmail.com>
Date: Sat, 11 Jan 2020 19:08:19 +0200
Subject: [PATCH] improvements

---
 statelayout/build.gradle                      |  4 +-
 .../ahmed7official/statelayout/StateLayout.kt | 37 +++++++------------
 .../src/main/res/layout/layout_error.xml      |  8 ++--
 .../src/main/res/layout/layout_loading.xml    |  7 ++--
 statelayout/src/main/res/values/strings.xml   |  1 +
 statelayout/src/main/res/values/styles.xml    | 11 +-----
 6 files changed, 25 insertions(+), 43 deletions(-)

diff --git a/statelayout/build.gradle b/statelayout/build.gradle
index 1768069..c529e4c 100644
--- a/statelayout/build.gradle
+++ b/statelayout/build.gradle
@@ -14,8 +14,8 @@ android {
     defaultConfig {
         minSdkVersion 21
         targetSdkVersion 29
-        versionCode 2
-        versionName "0.0.2"
+        versionCode 3
+        versionName "0.0.3"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles 'consumer-rules.pro'
diff --git a/statelayout/src/main/java/com/github/ahmed7official/statelayout/StateLayout.kt b/statelayout/src/main/java/com/github/ahmed7official/statelayout/StateLayout.kt
index b89b9e2..bebf3fc 100644
--- a/statelayout/src/main/java/com/github/ahmed7official/statelayout/StateLayout.kt
+++ b/statelayout/src/main/java/com/github/ahmed7official/statelayout/StateLayout.kt
@@ -2,15 +2,14 @@ package com.github.ahmed7official.statelayout
 
 import android.animation.LayoutTransition
 import android.content.Context
+import android.content.res.ColorStateList
+import android.graphics.Color
 import android.os.Parcelable
 import android.util.AttributeSet
 import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
-import android.widget.FrameLayout
-import android.widget.ImageView
-import android.widget.LinearLayout
-import android.widget.TextView
+import android.widget.*
 import androidx.constraintlayout.widget.ConstraintLayout
 import androidx.core.content.ContextCompat
 import androidx.core.view.children
@@ -34,22 +33,6 @@ class StateLayout @JvmOverloads constructor(
     }//lazy
 
 
-    // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
-    override fun onSaveInstanceState(): Parcelable? {
-        return super.onSaveInstanceState()
-        //TODO:
-    }//onSaveInstanceState()
-
-    // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
-    override fun onRestoreInstanceState(state: Parcelable?) {
-        super.onRestoreInstanceState(state)
-        //TODO:
-    }//onRestoreInstanceState()
-
-    // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
     override fun onFinishInflate() {
         super.onFinishInflate()
 
@@ -92,12 +75,18 @@ class StateLayout @JvmOverloads constructor(
     // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 
     fun stateLoading(
-        loadingMessage: String = "Loading, please wait",
-        backgroundColor: Int = R.color.colorPrimaryDark
+        message: String = "Loading, please wait",
+        messageColor: Int = android.R.color.darker_gray,
+        backgroundColor: Int = android.R.color.white
     ) {
-        Log.i("zxc", "stateLoading()")
 
-        layoutLoading.findViewById<TextView>(R.id.tvLoading).text = loadingMessage
+        layoutLoading.findViewById<TextView>(R.id.tvLoading).apply {
+            text = message
+            setTextColor(ContextCompat.getColor(context, messageColor))
+        }
+
+        layoutLoading.findViewById<ProgressBar>(R.id.progressBar).progressBackgroundTintList = ColorStateList.valueOf(Color.GRAY)
+
         layoutLoading.findViewById<LinearLayout>(R.id.layoutLoading).setBackgroundColor(ContextCompat.getColor(context, backgroundColor))
 
 
diff --git a/statelayout/src/main/res/layout/layout_error.xml b/statelayout/src/main/res/layout/layout_error.xml
index acd3fda..016b56b 100644
--- a/statelayout/src/main/res/layout/layout_error.xml
+++ b/statelayout/src/main/res/layout/layout_error.xml
@@ -5,10 +5,10 @@
     android:id="@+id/layoutError"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:padding="24dp"
     android:background="@color/colorPrimaryDark"
     android:clickable="true"
-    android:focusable="true">
+    android:focusable="true"
+    android:padding="24dp">
 
 
     <LinearLayout
@@ -31,9 +31,9 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="40dp"
-            tools:text="Internal Server Error"
             android:textColor="@android:color/white"
-            android:textSize="24sp" />
+            android:textSize="24sp"
+            tools:text="Internal Server Error" />
 
 
     </LinearLayout>
diff --git a/statelayout/src/main/res/layout/layout_loading.xml b/statelayout/src/main/res/layout/layout_loading.xml
index 05ec40c..9443715 100644
--- a/statelayout/src/main/res/layout/layout_loading.xml
+++ b/statelayout/src/main/res/layout/layout_loading.xml
@@ -10,13 +10,14 @@
 
 
     <ProgressBar
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content" />
+        android:id="@+id/progressBar"
+        android:layout_width="35dp"
+        android:layout_height="35dp" />
 
 
     <TextView
         android:layout_marginTop="8dp"
-        android:text="Loadint"
+        android:text="@string/loading"
         android:id="@+id/tvLoading"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"/>
diff --git a/statelayout/src/main/res/values/strings.xml b/statelayout/src/main/res/values/strings.xml
index dfc1b3d..221698b 100644
--- a/statelayout/src/main/res/values/strings.xml
+++ b/statelayout/src/main/res/values/strings.xml
@@ -38,5 +38,6 @@ Praesent faucibus ac mi nec tincidunt. Vivamus pulvinar mattis dui. Curabitur eu
     <string name="something_went_wrong">Something went wrong</string>
     <string name="icon">icon</string>
     <string name="retry">retry</string>
+    <string name="loading">loading</string>
 
 </resources>
diff --git a/statelayout/src/main/res/values/styles.xml b/statelayout/src/main/res/values/styles.xml
index 69126f6..0b39d22 100644
--- a/statelayout/src/main/res/values/styles.xml
+++ b/statelayout/src/main/res/values/styles.xml
@@ -1,14 +1,5 @@
 <resources>
 
-    <!-- Base application theme. -->
-    <style name="StateLayoutTheme" parent="Theme.MaterialComponents.Light.NoActionBar.Bridge">
-        <!-- Customize your theme here. -->
-        <item name="colorPrimary">@color/colorPrimary</item>
-        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
-        <item name="colorAccent">@color/colorAccent</item>
-
-
-    </style>
-
+    
 
 </resources>