Merge branch '67-filter-icon' of mmarif/GitNex into master

app/src/main/java/org/mian/gitnex/fragments/ClosedIssuesFragment.java

@@ -263,6 +263,7 @@ public class ClosedIssuesFragment extends Fragment {
         MenuItem searchItem = menu.findItem(R.id.action_search);
         androidx.appcompat.widget.SearchView searchView = (androidx.appcompat.widget.SearchView) searchItem.getActionView();
         searchView.setImeOptions(EditorInfo.IME_ACTION_DONE);
+        searchView.setQueryHint(getContext().getString(R.string.strFilter));
 
         if(!connToInternet) {
             return;

app/src/main/java/org/mian/gitnex/fragments/IssuesFragment.java

@@ -262,6 +262,7 @@ public class IssuesFragment extends Fragment {
         MenuItem searchItem = menu.findItem(R.id.action_search);
         androidx.appcompat.widget.SearchView searchView = (androidx.appcompat.widget.SearchView) searchItem.getActionView();
         searchView.setImeOptions(EditorInfo.IME_ACTION_DONE);
+        searchView.setQueryHint(getContext().getString(R.string.strFilter));
 
         if(!connToInternet) {
             return;

app/src/main/java/org/mian/gitnex/fragments/MembersByOrgFragment.java

@@ -112,6 +112,7 @@ public class MembersByOrgFragment extends Fragment {
         MenuItem searchItem = menu.findItem(R.id.action_search);
         androidx.appcompat.widget.SearchView searchView = (androidx.appcompat.widget.SearchView) searchItem.getActionView();
         searchView.setImeOptions(EditorInfo.IME_ACTION_DONE);
+        searchView.setQueryHint(getContext().getString(R.string.strFilter));
 
         if(!connToInternet) {
             return;

app/src/main/java/org/mian/gitnex/fragments/MilestonesFragment.java

@@ -182,6 +182,7 @@ public class MilestonesFragment extends Fragment {
         MenuItem searchItem = menu.findItem(R.id.action_search);
         androidx.appcompat.widget.SearchView searchView = (androidx.appcompat.widget.SearchView) searchItem.getActionView();
         searchView.setImeOptions(EditorInfo.IME_ACTION_DONE);
+        searchView.setQueryHint(getContext().getString(R.string.strFilter));
 
         if(!connToInternet) {
             return;

app/src/main/java/org/mian/gitnex/fragments/MyRepositoriesFragment.java

@@ -203,6 +203,7 @@ public class MyRepositoriesFragment extends Fragment {
         MenuItem searchItem = menu.findItem(R.id.action_search);
         androidx.appcompat.widget.SearchView searchView = (androidx.appcompat.widget.SearchView) searchItem.getActionView();
         searchView.setImeOptions(EditorInfo.IME_ACTION_DONE);
+        searchView.setQueryHint(getContext().getString(R.string.strFilter));
 
         if(!connToInternet) {
             return;

app/src/main/java/org/mian/gitnex/fragments/OrganizationsFragment.java

@@ -173,6 +173,7 @@ public class OrganizationsFragment extends Fragment {
         MenuItem searchItem = menu.findItem(R.id.action_search);
         androidx.appcompat.widget.SearchView searchView = (androidx.appcompat.widget.SearchView) searchItem.getActionView();
         searchView.setImeOptions(EditorInfo.IME_ACTION_DONE);
+        searchView.setQueryHint(getContext().getString(R.string.strFilter));
 
         if(!connToInternet) {
             return;

app/src/main/java/org/mian/gitnex/fragments/RepositoriesByOrgFragment.java

@@ -155,6 +155,7 @@ public class RepositoriesByOrgFragment extends Fragment {
         MenuItem searchItem = menu.findItem(R.id.action_search);
         androidx.appcompat.widget.SearchView searchView = (androidx.appcompat.widget.SearchView) searchItem.getActionView();
         searchView.setImeOptions(EditorInfo.IME_ACTION_DONE);
+        searchView.setQueryHint(getContext().getString(R.string.strFilter));
 
         if(!connToInternet) {
             return;

app/src/main/java/org/mian/gitnex/fragments/RepositoriesFragment.java

@@ -176,6 +176,7 @@ public class RepositoriesFragment extends Fragment {
         MenuItem searchItem = menu.findItem(R.id.action_search);
         androidx.appcompat.widget.SearchView searchView = (androidx.appcompat.widget.SearchView) searchItem.getActionView();
         searchView.setImeOptions(EditorInfo.IME_ACTION_DONE);
+        searchView.setQueryHint(getContext().getString(R.string.strFilter));
 
         if(!connToInternet) {
             return;

app/src/main/java/org/mian/gitnex/fragments/StarredRepositoriesFragment.java

@@ -198,6 +198,7 @@ public class StarredRepositoriesFragment extends Fragment {
         MenuItem searchItem = menu.findItem(R.id.action_search);
         androidx.appcompat.widget.SearchView searchView = (androidx.appcompat.widget.SearchView) searchItem.getActionView();
         searchView.setImeOptions(EditorInfo.IME_ACTION_DONE);
+        searchView.setQueryHint(getContext().getString(R.string.strFilter));
 
         if(!connToInternet) {
             return;

app/src/main/java/org/mian/gitnex/fragments/TeamsByOrgFragment.java

@@ -156,6 +156,7 @@ public class TeamsByOrgFragment extends Fragment {
         MenuItem searchItem = menu.findItem(R.id.action_search);
         androidx.appcompat.widget.SearchView searchView = (androidx.appcompat.widget.SearchView) searchItem.getActionView();
         searchView.setImeOptions(EditorInfo.IME_ACTION_DONE);
+        searchView.setQueryHint(getContext().getString(R.string.strFilter));
 
         if(!connToInternet) {
             return;

app/src/main/res/drawable/ic_filter.xml

@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#FFFFFF"
+    android:viewportHeight="24.0" android:viewportWidth="24.0"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF000000" android:pathData="M10,18h4v-2h-4v2zM3,6v2h18L21,6L3,6zM6,13h12v-2L6,11v2z"/>
+</vector>

app/src/main/res/menu/search_menu.xml

@@ -5,8 +5,8 @@
 
     <item
         android:id="@+id/action_search"
-        android:icon="@drawable/ic_search"
+        android:icon="@drawable/ic_filter"
-        android:title="@string/search"
+        android:title="@string/strFilter"
         app:actionViewClass="androidx.appcompat.widget.SearchView"
         app:showAsAction="ifRoom|collapseActionView" />
 

app/src/main/res/values-de/strings.xml

@@ -424,6 +424,8 @@
     <string name="newFileNewBranchMessage">z.B.: neuer-branch</string>
     <string name="newFileRequiredFieldNewBranchName">Neuer Branch-Name kann nicht leer sein, wenn der derzeitige Branch nicht ausgewählt ist</string>
 
+    <string name="strFilter">Filter</string>
+
     <!-- generic copy -->
     <string name="okButton">OK</string>
     <string name="doneButton">Fertig</string>

app/src/main/res/values-fr/strings.xml

@@ -424,6 +424,8 @@
     <string name="newFileNewBranchMessage">e.g: new-branch</string>
     <string name="newFileRequiredFieldNewBranchName">New branch name cannot be empty if current branch is not selected</string>
 
+    <string name="strFilter">Filter</string>
+
     <!-- generic copy -->
     <string name="okButton">OK</string>
     <string name="doneButton">Done</string>

app/src/main/res/values-ru/strings.xml

@@ -424,6 +424,8 @@
     <string name="newFileNewBranchMessage">e.g: new-branch</string>
     <string name="newFileRequiredFieldNewBranchName">New branch name cannot be empty if current branch is not selected</string>
 
+    <string name="strFilter">Filter</string>
+
     <!-- generic copy -->
     <string name="okButton">OK</string>
     <string name="doneButton">Готово</string>

app/src/main/res/values/strings.xml

@@ -462,6 +462,8 @@
     <string name="newFileNewBranchMessage">e.g: new-branch</string>
     <string name="newFileRequiredFieldNewBranchName">New branch name cannot be empty if current branch is not selected</string>
 
+    <string name="strFilter">Filter</string>
+
     <!-- generic copy -->
     <string name="okButton">OK</string>
     <string name="doneButton">Done</string>