From 919dc87af10e01f27087be2de66f72817971d42e Mon Sep 17 00:00:00 2001
From: ESimonLeon <54182074+ESimonLeon@users.noreply.github.com>
Date: Wed, 20 Oct 2021 14:34:35 -0500
Subject: [PATCH] Se agrega mensaje den historial vacio y cambio de color theme

---
 .idea/.name                                   |  1 +
 .idea/compiler.xml                            |  6 ++++
 .idea/gradle.xml                              |  2 +-
 .idea/jarRepositories.xml                     | 25 ++++++++++++++++
 .idea/misc.xml                                | 16 +++++++++-
 .idea/runConfigurations.xml                   | 12 --------
 .../com/example/examengapsi/MainActivity.java | 17 ++++++++---
 .../example/examengapsi/MainPresenter.java    |  2 +-
 .../drawable/ic_baseline_error_outline_24.xml | 12 ++++++++
 .../res/drawable/ic_search_black_24dp.xml     | 11 +++----
 app/src/main/res/layout/content_main.xml      | 30 ++++++++++++++++---
 .../main/res/layout/item_search_history.xml   |  6 ++--
 app/src/main/res/values/strings.xml           |  3 +-
 app/src/main/res/values/styles.xml            |  4 +--
 14 files changed, 114 insertions(+), 33 deletions(-)
 create mode 100644 .idea/.name
 create mode 100644 .idea/compiler.xml
 create mode 100644 .idea/jarRepositories.xml
 delete mode 100644 .idea/runConfigurations.xml
 create mode 100644 app/src/main/res/drawable/ic_baseline_error_outline_24.xml

diff --git a/.idea/.name b/.idea/.name
new file mode 100644
index 0000000..d19a117
--- /dev/null
+++ b/.idea/.name
@@ -0,0 +1 @@
+ExamenGapsi
\ No newline at end of file
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
new file mode 100644
index 0000000..61a9130
--- /dev/null
+++ b/.idea/compiler.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="CompilerConfiguration">
+    <bytecodeTargetLevel target="1.8" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 5cd135a..526b4c2 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -4,7 +4,7 @@
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
-        <option name="testRunner" value="PLATFORM" />
+        <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
         <option name="modules">
diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
new file mode 100644
index 0000000..a5f05cd
--- /dev/null
+++ b/.idea/jarRepositories.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="RemoteRepositoriesConfiguration">
+    <remote-repository>
+      <option name="id" value="central" />
+      <option name="name" value="Maven Central repository" />
+      <option name="url" value="https://repo1.maven.org/maven2" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="jboss.community" />
+      <option name="name" value="JBoss Community repository" />
+      <option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="BintrayJCenter" />
+      <option name="name" value="BintrayJCenter" />
+      <option name="url" value="https://jcenter.bintray.com/" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="Google" />
+      <option name="name" value="Google" />
+      <option name="url" value="https://dl.google.com/dl/android/maven2/" />
+    </remote-repository>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 37a7509..f050b91 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,6 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="DesignSurface">
+    <option name="filePathToZoomLevelMap">
+      <map>
+        <entry key="..\:/Users/52735/StudioProjects/Examen/app/src/main/res/drawable/ic_baseline_error_outline_24.xml" value="0.14947916666666666" />
+        <entry key="..\:/Users/52735/StudioProjects/Examen/app/src/main/res/drawable/ic_search_black_24dp.xml" value="0.14947916666666666" />
+        <entry key="..\:/Users/52735/StudioProjects/Examen/app/src/main/res/layout/activity_main.xml" value="0.1" />
+        <entry key="..\:/Users/52735/StudioProjects/Examen/app/src/main/res/layout/content_main.xml" value="0.264" />
+        <entry key="..\:/Users/52735/StudioProjects/Examen/app/src/main/res/layout/item_producto.xml" value="0.1" />
+        <entry key="..\:/Users/52735/StudioProjects/Examen/app/src/main/res/layout/item_search_history.xml" value="0.1" />
+        <entry key="..\:/Users/52735/StudioProjects/Examen/app/src/main/res/menu-v26/menu_main.xml" value="0.1" />
+        <entry key="..\:/Users/52735/StudioProjects/Examen/app/src/main/res/menu/menu_main.xml" value="0.1" />
+      </map>
+    </option>
+  </component>
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml
deleted file mode 100644
index 7f68460..0000000
--- a/.idea/runConfigurations.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="RunConfigurationProducerService">
-    <option name="ignoredProducers">
-      <set>
-        <option value="org.jetbrains.plugins.gradle.execution.test.runner.AllInPackageGradleConfigurationProducer" />
-        <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestClassGradleConfigurationProducer" />
-        <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestMethodGradleConfigurationProducer" />
-      </set>
-    </option>
-  </component>
-</project>
\ No newline at end of file
diff --git a/app/src/main/java/com/example/examengapsi/MainActivity.java b/app/src/main/java/com/example/examengapsi/MainActivity.java
index 8132694..a41e0d9 100644
--- a/app/src/main/java/com/example/examengapsi/MainActivity.java
+++ b/app/src/main/java/com/example/examengapsi/MainActivity.java
@@ -14,6 +14,7 @@
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.widget.SearchView;
 import androidx.appcompat.widget.Toolbar;
+import androidx.recyclerview.widget.DividerItemDecoration;
 import androidx.recyclerview.widget.GridLayoutManager;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
@@ -31,6 +32,7 @@ public class MainActivity extends AppCompatActivity implements MainInterface.Mai
 
     private MainPresenter mainPresenter;
     RecyclerView recyclerView, recyclerViewHistory;
+    LinearLayout llEmpty;
     ProductsListAdapter productsListAdapter;
     SearchHistoryAdapter searchHistoryAdapter;
     SearchHistory searchHistory;
@@ -43,9 +45,12 @@ public class MainActivity extends AppCompatActivity implements MainInterface.Mai
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
+
         Toolbar toolbar = findViewById(R.id.toolbar);
         setSupportActionBar(toolbar);
 
+        llEmpty = findViewById(R.id.llEmpty);
+
         mainPresenter = new MainPresenter(this, this);
 
         searchHistory = new SearchHistory();
@@ -56,6 +61,7 @@ protected void onCreate(Bundle savedInstanceState) {
     }
 
     private void createRecyclerView(ArrayList<Producto> products) {
+        if (products.size() > 0) llEmpty.setVisibility(View.GONE);
         recyclerView = findViewById(R.id.idRvProducts);
         productsListAdapter = new ProductsListAdapter(this, products);
         recyclerView.setLayoutManager(new GridLayoutManager(this, 2));
@@ -93,7 +99,7 @@ public boolean onQueryTextChange(String newText) {
 
 
     private void searchProduct(String query) {
-        showAlert("Buscando "+ query, getString(R.string.cargando_datos));
+        showAlert("Buscando " + query, getString(R.string.cargando_datos));
         mainPresenter.searchProduct(query);
     }
 
@@ -137,29 +143,32 @@ protected Void doInBackground(SearchHistory... searchHistories) {
         }
     }
 
-    private class SearchHistoryDBTask extends AsyncTask<Void,Void, List<SearchHistory>>{
+    private class SearchHistoryDBTask extends AsyncTask<Void, Void, List<SearchHistory>> {
 
         @Override
         protected List<SearchHistory> doInBackground(Void... voids) {
             listHistory = AppDataBase.getAppDB(getApplicationContext()).searchHistoryDAO().findAllHistory();
             return listHistory;
         }
+
         @Override
-        public void  onPostExecute(List<SearchHistory> searchHistory){
+        public void onPostExecute(List<SearchHistory> searchHistory) {
             showHistory(searchHistory);
         }
 
         private void showHistory(List<SearchHistory> searchHistory) {
-           createRecyclerHistory(searchHistory);
+            createRecyclerHistory(searchHistory);
         }
     }
 
 
     private void createRecyclerHistory(List<SearchHistory> searchHistory) {
+        if (searchHistory.size() > 0) llEmpty.setVisibility(View.GONE);
         recyclerViewHistory = findViewById(R.id.idRvProducts);
         searchHistoryAdapter = new SearchHistoryAdapter(this, searchHistory);
         recyclerViewHistory.setLayoutManager(new LinearLayoutManager(this));
         recyclerViewHistory.setAdapter(searchHistoryAdapter);
+        recyclerViewHistory.addItemDecoration(new DividerItemDecoration(this, LinearLayout.VERTICAL));
         recyclerViewHistory.setHasFixedSize(true);
         recyclerViewHistory.isNestedScrollingEnabled();
         searchHistoryAdapter.setOnClickListener(this);
diff --git a/app/src/main/java/com/example/examengapsi/MainPresenter.java b/app/src/main/java/com/example/examengapsi/MainPresenter.java
index ec08970..e35d727 100644
--- a/app/src/main/java/com/example/examengapsi/MainPresenter.java
+++ b/app/src/main/java/com/example/examengapsi/MainPresenter.java
@@ -2,6 +2,7 @@
 
 import android.content.Context;
 import android.os.Build;
+import android.util.Log;
 
 import androidx.annotation.RequiresApi;
 
@@ -38,7 +39,6 @@ public void searchProduct(String text) {
             @RequiresApi(api = Build.VERSION_CODES.N)
             @Override
             public void onResponse(Call<String> call, Response<String> response) {
-
                 if (response.isSuccessful()) {
                     try {
                         if (response.body() != null) {
diff --git a/app/src/main/res/drawable/ic_baseline_error_outline_24.xml b/app/src/main/res/drawable/ic_baseline_error_outline_24.xml
new file mode 100644
index 0000000..0aba004
--- /dev/null
+++ b/app/src/main/res/drawable/ic_baseline_error_outline_24.xml
@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="@android:color/black"
+    tools:ignore="VectorRaster">
+  <path
+      android:fillColor="#ff000000"
+      android:pathData="M11,15h2v2h-2zM11,7h2v6h-2zM11.99,2C6.47,2 2,6.48 2,12s4.47,10 9.99,10C17.52,22 22,17.52 22,12S17.52,2 11.99,2zM12,20c-4.42,0 -8,-3.58 -8,-8s3.58,-8 8,-8 8,3.58 8,8 -3.58,8 -8,8z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_search_black_24dp.xml b/app/src/main/res/drawable/ic_search_black_24dp.xml
index affc7ba..52274b2 100644
--- a/app/src/main/res/drawable/ic_search_black_24dp.xml
+++ b/app/src/main/res/drawable/ic_search_black_24dp.xml
@@ -1,9 +1,10 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="@android:color/black"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
     <path
         android:fillColor="#FF000000"
-        android:pathData="M15.5,14h-0.79l-0.28,-0.27C15.41,12.59 16,11.11 16,9.5 16,5.91 13.09,3 9.5,3S3,5.91 3,9.5 5.91,16 9.5,16c1.61,0 3.09,-0.59 4.23,-1.57l0.27,0.28v0.79l5,4.99L20.49,19l-4.99,-5zM9.5,14C7.01,14 5,11.99 5,9.5S7.01,5 9.5,5 14,7.01 14,9.5 11.99,14 9.5,14z"/>
+        android:pathData="M15.5,14h-0.79l-0.28,-0.27C15.41,12.59 16,11.11 16,9.5 16,5.91 13.09,3 9.5,3S3,5.91 3,9.5 5.91,16 9.5,16c1.61,0 3.09,-0.59 4.23,-1.57l0.27,0.28v0.79l5,4.99L20.49,19l-4.99,-5zM9.5,14C7.01,14 5,11.99 5,9.5S7.01,5 9.5,5 14,7.01 14,9.5 11.99,14 9.5,14z" />
 </vector>
diff --git a/app/src/main/res/layout/content_main.xml b/app/src/main/res/layout/content_main.xml
index 4d6709f..a7b4beb 100644
--- a/app/src/main/res/layout/content_main.xml
+++ b/app/src/main/res/layout/content_main.xml
@@ -10,11 +10,33 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content" />
 
-    <androidx.recyclerview.widget.RecyclerView
-        android:id="@+id/idRvHistory"
+
+    <LinearLayout
+        android:id="@+id/llEmpty"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_gravity="center_horizontal" />
+        android:layout_height="wrap_content"
+        android:layout_centerInParent="true"
+        android:padding="10dp"
+        android:orientation="vertical">
+
+        <ImageView
+            android:layout_width="100dp"
+            android:layout_height="100dp"
+            android:layout_gravity="center"
+            android:contentDescription="@string/cargando_datos"
+            android:scaleType="centerCrop"
+            android:src="@drawable/ic_baseline_error_outline_24" />
 
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:gravity="center"
+            android:textStyle="bold"
+            android:layout_marginTop="10dp"
+            android:text="@string/empty_data"
+            android:textColor="@android:color/black"
+            android:textSize="16dp" />
+    </LinearLayout>
 
 </RelativeLayout>
diff --git a/app/src/main/res/layout/item_search_history.xml b/app/src/main/res/layout/item_search_history.xml
index e9397bf..bae25f8 100644
--- a/app/src/main/res/layout/item_search_history.xml
+++ b/app/src/main/res/layout/item_search_history.xml
@@ -3,6 +3,8 @@
     android:id="@+id/idTv"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:gravity="center_horizontal"
-    android:layout_margin="7dp"/>
+    android:layout_margin="7dp"
+    android:gravity="left"
+    android:textColor="@android:color/black"
+    android:textSize="14dp" />
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 3d1e78d..543cc81 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,5 +1,5 @@
 <resources>
-    <string name="app_name">ExamenGapsi</string>
+    <string name="app_name">Buscador Productos</string>
     <string name="action_settings">Settings</string>
     <!-- Strings used for fragments for navigation -->
     <string name="first_fragment_label">First Fragment</string>
@@ -12,4 +12,5 @@
     <string name="historial_de_busqueda">Historial de busqueda</string>
     <string name="cargando_datos">Cargando datos...</string>
     <string name="busca_producto_hint">Busca producto</string>
+    <string name="empty_data">No hay datos en el historial</string>
 </resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 545b9c6..fc8dc2a 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -3,8 +3,8 @@
     <!-- Base application theme. -->
     <style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
         <!-- Customize your theme here. -->
-        <item name="colorPrimary">@color/colorPrimary</item>
-        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
+        <item name="colorPrimary">#82B1FF</item>
+        <item name="colorPrimaryDark">#82B1FF</item>
         <item name="colorAccent">@color/colorAccent</item>
     </style>