Merge pull request #107 from danishjamal104/fix106

danishjamal104 · web-flow · commit 2053364b029b · 2021-06-26T19:53:25.000+05:30
search component enhanced
diff --git a/app/build.gradle b/app/build.gradle
@@ -11,13 +11,13 @@ properties.load(project.rootProject.file('apikey.properties').newDataInputStream
 def apiKey = properties.getProperty('API_KEY')
 
 android {
-    compileSdkVersion 29
-    buildToolsVersion "30.0.2"
+    compileSdkVersion 30
+    buildToolsVersion "30.0.3"
 
     defaultConfig {
         applicationId "com.github.code.gambit"
         minSdkVersion 24
-        targetSdkVersion 29
+        targetSdkVersion 30
         versionCode 1
         versionName "1.0"
 
@@ -48,8 +48,8 @@ android {
 dependencies {
 
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$versions.kotlin"
-    implementation 'androidx.core:core-ktx:1.3.2'
-    implementation 'androidx.appcompat:appcompat:1.2.0'
+    implementation 'androidx.core:core-ktx:1.5.0'
+    implementation 'androidx.appcompat:appcompat:1.3.0'
     implementation 'com.google.android.material:material:1.3.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
@@ -62,6 +62,7 @@ dependencies {
     implementation "androidx.room:room-runtime:$versions.room"
     kapt "androidx.room:room-compiler:$versions.room"
 
+    //noinspection GradleDependency
     implementation "androidx.work:work-runtime-ktx:$versions.work"
 
     // optional - Kotlin Extensions and Coroutines support for Room
diff --git a/app/src/main/java/com/github/code/gambit/ui/fragment/home/main/HomeFragment.kt b/app/src/main/java/com/github/code/gambit/ui/fragment/home/main/HomeFragment.kt
@@ -149,6 +149,7 @@ class HomeFragment : Fragment(R.layout.fragment_home), FileUrlClickCallback, Bot
                 is HomeState.Error -> {
                     binding.linearProgress.hide()
                     urlComponent.hide()
+                    fileSearchComponent.setRefreshing(hide = true)
                     longToast(it.message)
                 }
                 is HomeState.FilesLoaded -> {
diff --git a/app/src/main/java/com/github/code/gambit/ui/fragment/home/searchcomponent/FileSearchComponent.kt b/app/src/main/java/com/github/code/gambit/ui/fragment/home/searchcomponent/FileSearchComponent.kt
@@ -19,7 +19,7 @@ interface FileSearchComponent {
             }
         }
     }
-    fun setRefreshing()
+    fun setRefreshing(hide: Boolean = false)
     fun setFileLoaded(files: List<File>)
     fun getRequests(): MutableLiveData<String>
     fun show()
diff --git a/app/src/main/java/com/github/code/gambit/ui/fragment/home/searchcomponent/FileSearchComponentImpl.kt b/app/src/main/java/com/github/code/gambit/ui/fragment/home/searchcomponent/FileSearchComponentImpl.kt
@@ -55,16 +55,20 @@ class FileSearchComponentImpl(
 
     override fun show() {
         binding.searchInput.editText?.setText("")
-        adapter.bindEmptyView(binding.illustration)
+        adapter.bindEmptyView(binding.emptyInfoContainer)
         adapter.refresh(true)
     }
 
     private fun newSearch(searchString: String) {
         fileSearchRequest.postValue(searchString)
     }
 
-    override fun setRefreshing() {
-        (binding.progressBar as View).show()
+    override fun setRefreshing(hide: Boolean) {
+        if (!hide) {
+            (binding.progressBar as View).show()
+        } else {
+            (binding.progressBar as View).hide()
+        }
     }
 
     override fun setFileLoaded(files: List<File>) {
diff --git a/app/src/main/res/layout/file_list_item.xml b/app/src/main/res/layout/file_list_item.xml
@@ -110,7 +110,7 @@
                 android:contentDescription="@string/close"
                 android:rotation="45"
                 android:src="@drawable/ic_plus"
-                android:tint="@color/raw_black" />
+                app:tint="@color/raw_black" />
 
             <com.google.android.material.chip.Chip
                 android:id="@+id/create_new_url_button"
diff --git a/app/src/main/res/layout/file_url_layout.xml b/app/src/main/res/layout/file_url_layout.xml
@@ -40,7 +40,7 @@
                     android:contentDescription="@string/close"
                     android:rotation="45"
                     android:src="@drawable/ic_plus"
-                    android:tint="@color/black" />
+                    app:tint="@color/black" />
 
                 <com.google.android.material.chip.Chip
                     android:id="@+id/create_new_url_button"
diff --git a/app/src/main/res/layout/search_layout.xml b/app/src/main/res/layout/search_layout.xml
@@ -25,7 +25,8 @@
 
             <com.google.android.material.textfield.TextInputEditText
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content" />
+                android:layout_height="wrap_content"
+                android:singleLine="true" />
 
         </com.google.android.material.textfield.TextInputLayout>
 
@@ -36,7 +37,7 @@
             android:layout_weight="1"
             android:backgroundTint="@color/transparent"
             android:src="@drawable/ic_home"
-            android:tint="@color/black"
+            app:tint="@color/black"
             tools:ignore="ContentDescription" />
 
     </LinearLayout>
@@ -68,42 +69,53 @@
         android:id="@+id/progress_bar"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_gravity="center_horizontal"
+        android:layout_margin="@dimen/root_side_margin"
         android:indeterminate="true"
         android:visibility="gone"
-        app:indicatorColor="@color/login_signup_button_color"
-        android:layout_margin="@dimen/root_side_margin"
-        android:layout_gravity="center_horizontal"/>
+        app:indicatorColor="@color/login_signup_button_color" />
 
     <RelativeLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent">
+
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/file_list"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            tools:listitem="@layout/file_list_item"
             android:paddingStart="@dimen/root_side_margin"
-            android:paddingEnd="@dimen/root_side_margin"/>
-        <ImageView
-            android:id="@+id/illustration"
-            android:layout_width="200dp"
-            android:layout_height="200dp"
-            android:src="@drawable/illus_void"
-            android:scaleType="fitXY"
-            android:layout_centerHorizontal="true"
-            android:contentDescription="@string/illustration"
-            android:layout_marginTop="102dp"/>
-        <TextView
-            android:id="@+id/info_message"
+            android:paddingEnd="@dimen/root_side_margin"
+            tools:listitem="@layout/file_list_item" />
+
+        <LinearLayout
+            android:id="@+id/empty_info_container"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="@string/file_search_info"
             android:layout_centerHorizontal="true"
-            android:textAlignment="center"
-            android:layout_below="@id/illustration"
-            android:textSize="22sp"
-            android:fontFamily="@font/nunito_regular"
-            android:textColor="@color/black"
-            android:layout_marginTop="@dimen/illustration_text_vertical_gap"/>
+            android:gravity="center"
+            android:orientation="vertical">
+
+            <ImageView
+                android:id="@+id/illustration"
+                android:layout_width="200dp"
+                android:layout_height="200dp"
+                android:layout_marginTop="102dp"
+                android:contentDescription="@string/illustration"
+                android:scaleType="fitXY"
+                android:src="@drawable/illus_void" />
+
+            <TextView
+                android:id="@+id/info_message"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/illustration_text_vertical_gap"
+                android:fontFamily="@font/nunito_regular"
+                android:text="@string/file_search_info"
+                android:textAlignment="center"
+                android:textColor="@color/black"
+                android:textSize="22sp" />
+        </LinearLayout>
+
+
     </RelativeLayout>
 </LinearLayout>
diff --git a/build.gradle b/build.gradle
@@ -9,15 +9,15 @@ buildscript {
     versions.amplify_core = '1.17.1'
     versions.amplify_core_kotlin = '0.1.2'
     versions.desugar_jdk = '1.1.5'
-    versions.fragment_ktx = '1.3.3'
+    versions.fragment_ktx = '1.3.5'
     versions.ipfs_kotlin = '0.15'
     versions.cloudinary = '1.30.0'
     versions.timber = '4.7.1'
     versions.glide = '4.12.0'
     versions.shimmer = '0.5.0'
     versions.spotlight = '2.0.5'
     versions.work = '2.5.0'
-    versions.truth = '1.1.2'
+    versions.truth = '1.1.3'
 
     repositories {
         google()

Original file line number	Diff line number	Diff line change
`@@ -149,6 +149,7 @@ class HomeFragment : Fragment(R.layout.fragment_home), FileUrlClickCallback, Bot`
`149`	`149`	`is HomeState.Error -> {`
`150`	`150`	`binding.linearProgress.hide()`
`151`	`151`	`urlComponent.hide()`
	`152`	`+ fileSearchComponent.setRefreshing(hide = true)`
`152`	`153`	`longToast(it.message)`
`153`	`154`	`}`
`154`	`155`	`is HomeState.FilesLoaded -> {`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ interface FileSearchComponent {`
`19`	`19`	`}`
`20`	`20`	`}`
`21`	`21`	`}`
`22`		`- fun setRefreshing()`
	`22`	`+ fun setRefreshing(hide: Boolean = false)`
`23`	`23`	`fun setFileLoaded(files: List<File>)`
`24`	`24`	`fun getRequests(): MutableLiveData<String>`
`25`	`25`	`fun show()`