Skip to content

Commit 56fd22c

Browse files
danishjamal104danishjamal104
committed
search component enhanced
1 parent c5513c1 commit 56fd22c

8 files changed

Lines changed: 56 additions & 38 deletions

File tree

‎app/build.gradle‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,13 @@ properties.load(project.rootProject.file('apikey.properties').newDataInputStream
1111
def apiKey = properties.getProperty('API_KEY')
1212

1313
android {
14-
compileSdkVersion 29
15-
buildToolsVersion "30.0.2"
14+
compileSdkVersion 30
15+
buildToolsVersion "30.0.3"
1616

1717
defaultConfig {
1818
applicationId "com.github.code.gambit"
1919
minSdkVersion 24
20-
targetSdkVersion 29
20+
targetSdkVersion 30
2121
versionCode 1
2222
versionName "1.0"
2323

@@ -48,8 +48,8 @@ android {
4848
dependencies {
4949

5050
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$versions.kotlin"
51-
implementation 'androidx.core:core-ktx:1.3.2'
52-
implementation 'androidx.appcompat:appcompat:1.2.0'
51+
implementation 'androidx.core:core-ktx:1.5.0'
52+
implementation 'androidx.appcompat:appcompat:1.3.0'
5353
implementation 'com.google.android.material:material:1.3.0'
5454
implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
5555
implementation 'androidx.legacy:legacy-support-v4:1.0.0'
@@ -62,6 +62,7 @@ dependencies {
6262
implementation "androidx.room:room-runtime:$versions.room"
6363
kapt "androidx.room:room-compiler:$versions.room"
6464

65+
//noinspection GradleDependency
6566
implementation "androidx.work:work-runtime-ktx:$versions.work"
6667

6768
// optional - Kotlin Extensions and Coroutines support for Room

‎app/src/main/java/com/github/code/gambit/ui/fragment/home/main/HomeFragment.kt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -149,6 +149,7 @@ class HomeFragment : Fragment(R.layout.fragment_home), FileUrlClickCallback, Bot
149149
is HomeState.Error -> {
150150
binding.linearProgress.hide()
151151
urlComponent.hide()
152+
fileSearchComponent.setRefreshing(hide = true)
152153
longToast(it.message)
153154
}
154155
is HomeState.FilesLoaded -> {

‎app/src/main/java/com/github/code/gambit/ui/fragment/home/searchcomponent/FileSearchComponent.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ interface FileSearchComponent {
1919
}
2020
}
2121
}
22-
fun setRefreshing()
22+
fun setRefreshing(hide: Boolean = false)
2323
fun setFileLoaded(files: List<File>)
2424
fun getRequests(): MutableLiveData<String>
2525
fun show()

‎app/src/main/java/com/github/code/gambit/ui/fragment/home/searchcomponent/FileSearchComponentImpl.kt‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,16 +55,20 @@ class FileSearchComponentImpl(
5555

5656
override fun show() {
5757
binding.searchInput.editText?.setText("")
58-
adapter.bindEmptyView(binding.illustration)
58+
adapter.bindEmptyView(binding.emptyInfoContainer)
5959
adapter.refresh(true)
6060
}
6161

6262
private fun newSearch(searchString: String) {
6363
fileSearchRequest.postValue(searchString)
6464
}
6565

66-
override fun setRefreshing() {
67-
(binding.progressBar as View).show()
66+
override fun setRefreshing(hide: Boolean) {
67+
if (!hide) {
68+
(binding.progressBar as View).show()
69+
} else {
70+
(binding.progressBar as View).hide()
71+
}
6872
}
6973

7074
override fun setFileLoaded(files: List<File>) {

‎app/src/main/res/layout/file_list_item.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@
110110
android:contentDescription="@string/close"
111111
android:rotation="45"
112112
android:src="@drawable/ic_plus"
113-
android:tint="@color/raw_black" />
113+
app:tint="@color/raw_black" />
114114

115115
<com.google.android.material.chip.Chip
116116
android:id="@+id/create_new_url_button"

‎app/src/main/res/layout/file_url_layout.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
android:contentDescription="@string/close"
4141
android:rotation="45"
4242
android:src="@drawable/ic_plus"
43-
android:tint="@color/black" />
43+
app:tint="@color/black" />
4444

4545
<com.google.android.material.chip.Chip
4646
android:id="@+id/create_new_url_button"

‎app/src/main/res/layout/search_layout.xml‎

Lines changed: 37 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,8 @@
2525

2626
<com.google.android.material.textfield.TextInputEditText
2727
android:layout_width="match_parent"
28-
android:layout_height="wrap_content" />
28+
android:layout_height="wrap_content"
29+
android:singleLine="true" />
2930

3031
</com.google.android.material.textfield.TextInputLayout>
3132

@@ -36,7 +37,7 @@
3637
android:layout_weight="1"
3738
android:backgroundTint="@color/transparent"
3839
android:src="@drawable/ic_home"
39-
android:tint="@color/black"
40+
app:tint="@color/black"
4041
tools:ignore="ContentDescription" />
4142

4243
</LinearLayout>
@@ -68,42 +69,53 @@
6869
android:id="@+id/progress_bar"
6970
android:layout_width="wrap_content"
7071
android:layout_height="wrap_content"
72+
android:layout_gravity="center_horizontal"
73+
android:layout_margin="@dimen/root_side_margin"
7174
android:indeterminate="true"
7275
android:visibility="gone"
73-
app:indicatorColor="@color/login_signup_button_color"
74-
android:layout_margin="@dimen/root_side_margin"
75-
android:layout_gravity="center_horizontal"/>
76+
app:indicatorColor="@color/login_signup_button_color" />
7677

7778
<RelativeLayout
7879
android:layout_width="match_parent"
7980
android:layout_height="match_parent">
81+
8082
<androidx.recyclerview.widget.RecyclerView
8183
android:id="@+id/file_list"
8284
android:layout_width="match_parent"
8385
android:layout_height="wrap_content"
84-
tools:listitem="@layout/file_list_item"
8586
android:paddingStart="@dimen/root_side_margin"
86-
android:paddingEnd="@dimen/root_side_margin"/>
87-
<ImageView
88-
android:id="@+id/illustration"
89-
android:layout_width="200dp"
90-
android:layout_height="200dp"
91-
android:src="@drawable/illus_void"
92-
android:scaleType="fitXY"
93-
android:layout_centerHorizontal="true"
94-
android:contentDescription="@string/illustration"
95-
android:layout_marginTop="102dp"/>
96-
<TextView
97-
android:id="@+id/info_message"
87+
android:paddingEnd="@dimen/root_side_margin"
88+
tools:listitem="@layout/file_list_item" />
89+
90+
<LinearLayout
91+
android:id="@+id/empty_info_container"
9892
android:layout_width="wrap_content"
9993
android:layout_height="wrap_content"
100-
android:text="@string/file_search_info"
10194
android:layout_centerHorizontal="true"
102-
android:textAlignment="center"
103-
android:layout_below="@id/illustration"
104-
android:textSize="22sp"
105-
android:fontFamily="@font/nunito_regular"
106-
android:textColor="@color/black"
107-
android:layout_marginTop="@dimen/illustration_text_vertical_gap"/>
95+
android:gravity="center"
96+
android:orientation="vertical">
97+
98+
<ImageView
99+
android:id="@+id/illustration"
100+
android:layout_width="200dp"
101+
android:layout_height="200dp"
102+
android:layout_marginTop="102dp"
103+
android:contentDescription="@string/illustration"
104+
android:scaleType="fitXY"
105+
android:src="@drawable/illus_void" />
106+
107+
<TextView
108+
android:id="@+id/info_message"
109+
android:layout_width="wrap_content"
110+
android:layout_height="wrap_content"
111+
android:layout_marginTop="@dimen/illustration_text_vertical_gap"
112+
android:fontFamily="@font/nunito_regular"
113+
android:text="@string/file_search_info"
114+
android:textAlignment="center"
115+
android:textColor="@color/black"
116+
android:textSize="22sp" />
117+
</LinearLayout>
118+
119+
108120
</RelativeLayout>
109121
</LinearLayout>

‎build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,15 @@ buildscript {
99
versions.amplify_core = '1.17.1'
1010
versions.amplify_core_kotlin = '0.1.2'
1111
versions.desugar_jdk = '1.1.5'
12-
versions.fragment_ktx = '1.3.3'
12+
versions.fragment_ktx = '1.3.5'
1313
versions.ipfs_kotlin = '0.15'
1414
versions.cloudinary = '1.30.0'
1515
versions.timber = '4.7.1'
1616
versions.glide = '4.12.0'
1717
versions.shimmer = '0.5.0'
1818
versions.spotlight = '2.0.5'
1919
versions.work = '2.5.0'
20-
versions.truth = '1.1.2'
20+
versions.truth = '1.1.3'
2121

2222
repositories {
2323
google()

0 commit comments

Comments
 (0)