mnalis/apps-android-commons
1
0
Fork 0
mirror of https://github.com/commons-app/apps-android-commons.git synced 2025-10-27 04:43:54 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

unformatted search text field for depicts and categories search field of upload wizard (#4724)

Browse source 
* unformatted search text field for depicts and categories search field of upload wizard

* fix tests by declaring search text field of type PasteSensitiveTextInputEditText
This commit is contained in:
KhyatiSaini 2021-12-17 16:32:58 +05:30 • committed by GitHub
parent d834ce3e7e
commit d38c3f1427
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 16 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

5
app/src/main/java/fr/free/nrw/commons/upload/categories/UploadCategoriesFragment.java
View file

@ -3,7 +3,6 @@ package fr.free.nrw.commons.upload.categories;
import android.app.Activity; import android.app.Activity;
import android.os.Bundle; import android.os.Bundle;
import android.text.Editable; import android.text.Editable;
import android.util.Log;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.view.View.OnClickListener; import android.view.View.OnClickListener;
@ -18,12 +17,12 @@ import androidx.recyclerview.widget.RecyclerView;
import butterknife.BindView; import butterknife.BindView;
import butterknife.ButterKnife; import butterknife.ButterKnife;
import butterknife.OnClick; import butterknife.OnClick;
import com.google.android.material.textfield.TextInputEditText;
import com.google.android.material.textfield.TextInputLayout; import com.google.android.material.textfield.TextInputLayout;
import com.jakewharton.rxbinding2.view.RxView; import com.jakewharton.rxbinding2.view.RxView;
import com.jakewharton.rxbinding2.widget.RxTextView; import com.jakewharton.rxbinding2.widget.RxTextView;
import fr.free.nrw.commons.R; import fr.free.nrw.commons.R;
import fr.free.nrw.commons.category.CategoryItem; import fr.free.nrw.commons.category.CategoryItem;
import fr.free.nrw.commons.ui.PasteSensitiveTextInputEditText;
import fr.free.nrw.commons.upload.UploadActivity; import fr.free.nrw.commons.upload.UploadActivity;
import fr.free.nrw.commons.upload.UploadBaseFragment; import fr.free.nrw.commons.upload.UploadBaseFragment;
import fr.free.nrw.commons.utils.DialogUtil; import fr.free.nrw.commons.utils.DialogUtil;
@ -44,7 +43,7 @@ public class UploadCategoriesFragment extends UploadBaseFragment implements Cate
@BindView(R.id.til_container_search) @BindView(R.id.til_container_search)
TextInputLayout tilContainerEtSearch; TextInputLayout tilContainerEtSearch;
@BindView(R.id.et_search) @BindView(R.id.et_search)
TextInputEditText etSearch; PasteSensitiveTextInputEditText etSearch;
@BindView(R.id.pb_categories) @BindView(R.id.pb_categories)
ProgressBar pbCategories; ProgressBar pbCategories;
@BindView(R.id.rv_categories) @BindView(R.id.rv_categories)

4
app/src/main/java/fr/free/nrw/commons/upload/depicts/DepictsFragment.java
View file

@ -15,11 +15,11 @@ import androidx.recyclerview.widget.RecyclerView;
import butterknife.BindView; import butterknife.BindView;
import butterknife.ButterKnife; import butterknife.ButterKnife;
import butterknife.OnClick; import butterknife.OnClick;
import com.google.android.material.textfield.TextInputEditText;
import com.google.android.material.textfield.TextInputLayout; import com.google.android.material.textfield.TextInputLayout;
import com.jakewharton.rxbinding2.view.RxView; import com.jakewharton.rxbinding2.view.RxView;
import com.jakewharton.rxbinding2.widget.RxTextView; import com.jakewharton.rxbinding2.widget.RxTextView;
import fr.free.nrw.commons.R; import fr.free.nrw.commons.R;
import fr.free.nrw.commons.ui.PasteSensitiveTextInputEditText;
import fr.free.nrw.commons.upload.UploadActivity; import fr.free.nrw.commons.upload.UploadActivity;
import fr.free.nrw.commons.upload.UploadBaseFragment; import fr.free.nrw.commons.upload.UploadBaseFragment;
import fr.free.nrw.commons.upload.structure.depictions.DepictedItem; import fr.free.nrw.commons.upload.structure.depictions.DepictedItem;
@ -45,7 +45,7 @@ public class DepictsFragment extends UploadBaseFragment implements DepictsContra
@BindView(R.id.depicts_search_container) @BindView(R.id.depicts_search_container)
TextInputLayout depictsSearchContainer; TextInputLayout depictsSearchContainer;
@BindView(R.id.depicts_search) @BindView(R.id.depicts_search)
TextInputEditText depictsSearch; PasteSensitiveTextInputEditText depictsSearch;
@BindView(R.id.depictsSearchInProgress) @BindView(R.id.depictsSearchInProgress)
ProgressBar depictsSearchInProgress; ProgressBar depictsSearchInProgress;
@BindView(R.id.depicts_recycler_view) @BindView(R.id.depicts_recycler_view)

6
app/src/main/res/layout/upload_categories_fragment.xml
View file

@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/rl_container_categories" android:id="@+id/rl_container_categories"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
@ -56,14 +57,15 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"> android:layout_height="wrap_content">
<com.google.android.material.textfield.TextInputEditText <fr.free.nrw.commons.ui.PasteSensitiveTextInputEditText
android:id="@+id/et_search" android:id="@+id/et_search"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:hint="@string/categories_search_text_hint" android:hint="@string/categories_search_text_hint"
android:imeOptions="actionSearch" android:imeOptions="actionSearch"
android:inputType="text" android:inputType="text"
android:maxLines="1"/> android:maxLines="1"
app:allowFormatting="false"/>
</com.google.android.material.textfield.TextInputLayout> </com.google.android.material.textfield.TextInputLayout>
<ProgressBar <ProgressBar

6
app/src/main/res/layout/upload_depicts_fragment.xml
View file

@ -3,6 +3,7 @@
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_marginBottom="8dp" android:layout_marginBottom="8dp"
android:orientation="vertical" android:orientation="vertical"
tools:showIn="@layout/activity_upload"> tools:showIn="@layout/activity_upload">
@ -81,13 +82,14 @@
android:layout_marginTop="@dimen/standard_gap" android:layout_marginTop="@dimen/standard_gap"
android:layout_height="wrap_content"> android:layout_height="wrap_content">
<com.google.android.material.textfield.TextInputEditText <fr.free.nrw.commons.ui.PasteSensitiveTextInputEditText
android:id="@+id/depicts_search" android:id="@+id/depicts_search"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:imeOptions="actionSearch" android:imeOptions="actionSearch"
android:inputType="text" android:inputType="text"
android:maxLines="1" /> android:maxLines="1"
app:allowFormatting="false" />
</com.google.android.material.textfield.TextInputLayout> </com.google.android.material.textfield.TextInputLayout>
<ProgressBar <ProgressBar

4
app/src/test/kotlin/fr/free/nrw/commons/upload/categories/UploadCategoriesFragmentUnitTests.kt
View file

@ -11,11 +11,11 @@ import android.widget.TextView
import androidx.fragment.app.FragmentManager import androidx.fragment.app.FragmentManager
import androidx.fragment.app.FragmentTransaction import androidx.fragment.app.FragmentTransaction
import androidx.recyclerview.widget.RecyclerView import androidx.recyclerview.widget.RecyclerView
import com.google.android.material.textfield.TextInputEditText
import com.google.android.material.textfield.TextInputLayout import com.google.android.material.textfield.TextInputLayout
import fr.free.nrw.commons.R import fr.free.nrw.commons.R
import fr.free.nrw.commons.TestAppAdapter import fr.free.nrw.commons.TestAppAdapter
import fr.free.nrw.commons.TestCommonsApplication import fr.free.nrw.commons.TestCommonsApplication
import fr.free.nrw.commons.ui.PasteSensitiveTextInputEditText
import fr.free.nrw.commons.upload.UploadActivity import fr.free.nrw.commons.upload.UploadActivity
import fr.free.nrw.commons.upload.UploadBaseFragment import fr.free.nrw.commons.upload.UploadBaseFragment
import io.reactivex.disposables.Disposable import io.reactivex.disposables.Disposable
@ -57,7 +57,7 @@ class UploadCategoriesFragmentUnitTests {
private lateinit var tilContainerEtSearch: TextInputLayout private lateinit var tilContainerEtSearch: TextInputLayout
@Mock @Mock
private lateinit var etSearch: TextInputEditText private lateinit var etSearch: PasteSensitiveTextInputEditText
@Mock @Mock
private lateinit var rvCategories: RecyclerView private lateinit var rvCategories: RecyclerView

4
app/src/test/kotlin/fr/free/nrw/commons/upload/depicts/DepictsFragmentUnitTests.kt
View file

@ -10,11 +10,11 @@ import android.widget.TextView
import androidx.fragment.app.FragmentManager import androidx.fragment.app.FragmentManager
import androidx.fragment.app.FragmentTransaction import androidx.fragment.app.FragmentTransaction
import androidx.recyclerview.widget.RecyclerView import androidx.recyclerview.widget.RecyclerView
import com.google.android.material.textfield.TextInputEditText
import com.google.android.material.textfield.TextInputLayout import com.google.android.material.textfield.TextInputLayout
import fr.free.nrw.commons.R import fr.free.nrw.commons.R
import fr.free.nrw.commons.TestAppAdapter import fr.free.nrw.commons.TestAppAdapter
import fr.free.nrw.commons.TestCommonsApplication import fr.free.nrw.commons.TestCommonsApplication
import fr.free.nrw.commons.ui.PasteSensitiveTextInputEditText
import fr.free.nrw.commons.upload.UploadActivity import fr.free.nrw.commons.upload.UploadActivity
import fr.free.nrw.commons.upload.UploadBaseFragment import fr.free.nrw.commons.upload.UploadBaseFragment
import io.reactivex.disposables.Disposable import io.reactivex.disposables.Disposable
@ -57,7 +57,7 @@ class DepictsFragmentUnitTests {
private lateinit var recyclerView: RecyclerView private lateinit var recyclerView: RecyclerView
@Mock @Mock
private lateinit var textInputEditText: TextInputEditText private lateinit var textInputEditText: PasteSensitiveTextInputEditText
@Mock @Mock
private lateinit var progressBar: ProgressBar private lateinit var progressBar: ProgressBar