Skip to content

Commit fdbfee1

Browse files
surinder-tsyssurinder-tsys
committed
Customized SearchView theme.
1 parent d97218f commit fdbfee1

File tree

15 files changed

+209
-20
lines changed

15 files changed

+209
-20
lines changed

‎app/src/main/java/com/nextcloud/client/logger/ui/LogsActivity.kt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ import androidx.lifecycle.ViewModelProvider
1717
import androidx.recyclerview.widget.LinearLayoutManager
1818
import androidx.recyclerview.widget.RecyclerView
1919
import com.nextcloud.client.di.ViewModelFactory
20+
import com.nmc.android.utils.SearchViewThemeUtils.themeSearchView
2021
import com.owncloud.android.R
2122
import com.owncloud.android.databinding.LogsActivityBinding
2223
import com.owncloud.android.ui.activity.ToolbarActivity
@@ -80,7 +81,8 @@ class LogsActivity : ToolbarActivity() {
8081

8182
(menu.findItem(R.id.action_search).actionView as SearchView).apply {
8283
setOnQueryTextListener(searchBoxListener)
83-
viewThemeUtils.androidx.themeToolbarSearchView(this)
84+
//NMC customization
85+
themeSearchView(this@LogsActivity, this)
8486
}
8587
return super.onCreateOptionsMenu(menu)
8688
}

‎app/src/main/java/com/nmc/android/utils/SearchViewThemeUtils.kt

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
package com.nmc.android.utils
2+
3+
import android.content.Context
4+
import android.widget.ImageView
5+
import androidx.appcompat.widget.AppCompatAutoCompleteTextView
6+
import androidx.appcompat.widget.SearchView
7+
import com.owncloud.android.R
8+
9+
object SearchViewThemeUtils {
10+
fun themeSearchView(context: Context, searchView: SearchView) {
11+
val fontColor = context.resources.getColor(R.color.fontAppbar, null)
12+
val editText: AppCompatAutoCompleteTextView = searchView.findViewById(R.id.search_src_text)
13+
editText.textSize = 16F
14+
editText.setTextColor(fontColor)
15+
editText.highlightColor = context.resources.getColor(R.color.et_highlight_color, null)
16+
editText.setHintTextColor(context.resources.getColor(R.color.fontSecondaryAppbar, null))
17+
val closeButton: ImageView = searchView.findViewById(R.id.search_close_btn)
18+
closeButton.setColorFilter(fontColor)
19+
val searchButton: ImageView = searchView.findViewById(R.id.search_button)
20+
searchButton.setImageResource(R.drawable.ic_search)
21+
searchButton.setColorFilter(fontColor)
22+
}
23+
}

‎app/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.java

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
*/
1414
package com.owncloud.android.ui.activity;
1515

16-
import android.Manifest;
1716
import android.accounts.Account;
1817
import android.accounts.AuthenticatorException;
1918
import android.annotation.SuppressLint;
@@ -65,20 +64,18 @@
6564
import com.nextcloud.client.utils.IntentUtil;
6665
import com.nextcloud.model.WorkerState;
6766
import com.nextcloud.model.WorkerStateLiveData;
68-
import com.nextcloud.utils.BuildHelper;
6967
import com.nextcloud.utils.extensions.ActivityExtensionsKt;
7068
import com.nextcloud.utils.extensions.BundleExtensionsKt;
7169
import com.nextcloud.utils.extensions.FileExtensionsKt;
7270
import com.nextcloud.utils.extensions.IntentExtensionsKt;
7371
import com.nextcloud.utils.fileNameValidator.FileNameValidator;
7472
import com.nextcloud.utils.view.FastScrollUtils;
73+
import com.nmc.android.utils.SearchViewThemeUtils;
7574
import com.owncloud.android.MainApp;
7675
import com.owncloud.android.R;
7776
import com.owncloud.android.databinding.FilesBinding;
7877
import com.owncloud.android.datamodel.FileDataStorageManager;
79-
import com.owncloud.android.datamodel.MediaFolderType;
8078
import com.owncloud.android.datamodel.OCFile;
81-
import com.owncloud.android.datamodel.SyncedFolder;
8279
import com.owncloud.android.datamodel.SyncedFolderProvider;
8380
import com.owncloud.android.datamodel.VirtualFolderType;
8481
import com.owncloud.android.files.services.NameCollisionPolicy;
@@ -438,19 +435,19 @@ private void checkOutdatedServer() {
438435
DisplayUtils.showServerOutdatedSnackbar(this, Snackbar.LENGTH_LONG);
439436
}
440437
}
441-
438+
442439
private void checkNotifications() {
443440
new Thread(() -> {
444441
try {
445442
RemoteOperationResult<List<Notification>> result = new GetNotificationsRemoteOperation()
446443
.execute(clientFactory.createNextcloudClient(accountManager.getUser()));
447-
444+
448445
if (result.isSuccess() && !result.getResultData().isEmpty()) {
449446
runOnUiThread(() -> mNotificationButton.setVisibility(View.VISIBLE));
450447
} else {
451448
runOnUiThread(() -> mNotificationButton.setVisibility(View.GONE));
452449
}
453-
450+
454451
} catch (ClientFactory.CreationException e) {
455452
Log_OC.e(TAG, "Could not fetch notifications!");
456453
}
@@ -786,7 +783,8 @@ public boolean onCreateOptionsMenu(Menu menu) {
786783
searchView.setIconified(false);
787784
});
788785

789-
viewThemeUtils.androidx.themeToolbarSearchView(searchView);
786+
//NMC customization
787+
SearchViewThemeUtils.INSTANCE.themeSearchView(this, searchView);
790788

791789
// populate list of menu items to show/hide when drawer is opened/closed
792790
mDrawerMenuItemstoShowHideList = new ArrayList<>(1);

‎app/src/main/java/com/owncloud/android/ui/activity/ReceiveExternalFilesActivity.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@
5656
import com.nextcloud.utils.extensions.FileExtensionsKt;
5757
import com.nextcloud.utils.extensions.IntentExtensionsKt;
5858
import com.nextcloud.utils.fileNameValidator.FileNameValidator;
59+
import com.nmc.android.utils.SearchViewThemeUtils;
5960
import com.owncloud.android.MainApp;
6061
import com.owncloud.android.R;
6162
import com.owncloud.android.databinding.ReceiveExternalFilesBinding;
@@ -1085,7 +1086,8 @@ public boolean onQueryTextChange(String newText) {
10851086
}
10861087
});
10871088

1088-
viewThemeUtils.androidx.themeToolbarSearchView(searchView);
1089+
//NMC customization
1090+
SearchViewThemeUtils.INSTANCE.themeSearchView(this, searchView);
10891091
}
10901092

10911093
@Override

‎app/src/main/java/com/owncloud/android/ui/activity/UploadFilesActivity.java

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030

3131
import com.nextcloud.client.account.User;
3232
import com.nextcloud.client.core.Clock;
33+
import com.nmc.android.utils.SearchViewThemeUtils;
3334
import com.nextcloud.client.di.Injectable;
3435
import com.nextcloud.client.jobs.upload.FileUploadHelper;
3536
import com.nextcloud.client.jobs.upload.FileUploadWorker;
@@ -296,8 +297,10 @@ public boolean onCreateOptionsMenu(Menu menu) {
296297

297298
final MenuItem item = menu.findItem(R.id.action_search);
298299
mSearchView = (SearchView) MenuItemCompat.getActionView(item);
299-
viewThemeUtils.androidx.themeToolbarSearchView(mSearchView);
300-
viewThemeUtils.platform.tintTextDrawable(this, menu.findItem(R.id.action_choose_storage_path).getIcon());
300+
//NMC customization
301+
SearchViewThemeUtils.INSTANCE.themeSearchView(this, mSearchView);
302+
viewThemeUtils.platform.colorDrawable(menu.findItem(R.id.action_choose_storage_path).getIcon(),
303+
getResources().getColor(R.color.fontAppbar, null));
301304

302305
mSearchView.setOnSearchClickListener(v -> mToolbarSpinner.setVisibility(View.GONE));
303306

‎app/src/main/java/com/owncloud/android/ui/adapter/UnifiedSearchHeaderViewHolder.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,5 @@ class UnifiedSearchHeaderViewHolder(
2222

2323
fun bind(section: UnifiedSearchSection) {
2424
binding.title.text = section.name
25-
viewThemeUtils.platform.colorPrimaryTextViewElement(binding.title)
2625
}
2726
}

‎app/src/main/java/com/owncloud/android/ui/adapter/UnifiedSearchItemViewHolder.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,8 @@ class UnifiedSearchItemViewHolder(
121121

122122
val defaultDrawable = MimeTypeUtil.getFileTypeIcon(mimetype, entry.title, context, viewThemeUtils)
123123
val drawable: Drawable = ResourcesCompat.getDrawable(context.resources, iconId, null) ?: defaultDrawable
124-
return viewThemeUtils.platform.tintDrawable(context, drawable, ColorRole.PRIMARY)
124+
// NMC Customization: No tinting required
125+
return drawable
125126
}
126127

127128
private inner class RoundIfNeededListener(private val entry: SearchResultEntry) :

‎app/src/main/java/com/owncloud/android/ui/fragment/ExtendedListFragment.kt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@ import com.nextcloud.client.network.ConnectivityService.GenericCallback
5959
import com.nextcloud.client.preferences.AppPreferences
6060
import com.nextcloud.client.preferences.AppPreferencesImpl
6161
import com.nextcloud.utils.extensions.getTypedActivity
62+
import com.nmc.android.utils.SearchViewThemeUtils
6263
import com.owncloud.android.MainApp
6364
import com.owncloud.android.R
6465
import com.owncloud.android.databinding.ListFragmentBinding
@@ -167,7 +168,8 @@ open class ExtendedListFragment :
167168
override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
168169
val item = menu.findItem(R.id.action_search)
169170
searchView = MenuItemCompat.getActionView(item) as SearchView?
170-
viewThemeUtils.androidx.themeToolbarSearchView(searchView!!)
171+
// NMC customization
172+
SearchViewThemeUtils.themeSearchView(requireActivity(), searchView!!);
171173
closeButton = searchView?.findViewById<ImageView>(androidx.appcompat.R.id.search_close_btn)
172174
searchView?.setOnQueryTextListener(this)
173175
searchView?.setOnCloseListener(this)

‎app/src/main/java/com/owncloud/android/ui/fragment/UnifiedSearchFragment.kt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ import com.nextcloud.client.core.AsyncRunner
3030
import com.nextcloud.client.di.Injectable
3131
import com.nextcloud.client.di.ViewModelFactory
3232
import com.nextcloud.client.network.ClientFactory
33+
import com.nmc.android.utils.SearchViewThemeUtils.themeSearchView
3334
import com.owncloud.android.R
3435
import com.owncloud.android.databinding.ListFragmentBinding
3536
import com.owncloud.android.datamodel.FileDataStorageManager
@@ -175,7 +176,8 @@ class UnifiedSearchFragment :
175176
// Required to align with TextView width.
176177
// Because this fragment is opened with TextView onClick on the previous screen
177178
maxWidth = Integer.MAX_VALUE
178-
viewThemeUtils.androidx.themeToolbarSearchView(this)
179+
// NMC Customization
180+
themeSearchView(requireActivity(), this)
179181
setQuery(vm.query.value, false)
180182
setOnQueryTextListener(this@UnifiedSearchFragment)
181183
isIconified = false

‎app/src/main/java/com/owncloud/android/ui/preview/PreviewTextFileFragment.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
import com.nextcloud.ui.fileactions.FileActionsBottomSheet;
2222
import com.nextcloud.utils.extensions.BundleExtensionsKt;
2323
import com.nextcloud.utils.extensions.FileExtensionsKt;
24+
import com.nmc.android.utils.SearchViewThemeUtils;
2425
import com.owncloud.android.R;
2526
import com.owncloud.android.datamodel.OCFile;
2627
import com.owncloud.android.lib.common.utils.Log_OC;
@@ -248,7 +249,8 @@ public void onCreateOptionsMenu(@NonNull Menu menu, @NonNull MenuInflater inflat
248249
menuItem.setVisible(true);
249250
searchView = (SearchView) MenuItemCompat.getActionView(menuItem);
250251
searchView.setMaxWidth(Integer.MAX_VALUE);
251-
viewThemeUtils.androidx.themeToolbarSearchView(searchView);
252+
//NMC customization
253+
SearchViewThemeUtils.INSTANCE.themeSearchView(requireActivity(), searchView);
252254

253255
if (searchOpen) {
254256
searchView.setIconified(false);

0 commit comments

Comments
 (0)