NMC-2256: Progress and seek bar customized.

surinder-tsys · surinder-tsys · commit e8fccf76225d · 2025-12-08T15:34:11.000+05:30
NMC-2041: SwipeRefreshLayout Customized.
diff --git a/app/src/main/java/com/nextcloud/client/logger/ui/LogsActivity.kt b/app/src/main/java/com/nextcloud/client/logger/ui/LogsActivity.kt
@@ -20,6 +20,7 @@ import com.nextcloud.client.di.ViewModelFactory
 import com.owncloud.android.R
 import com.owncloud.android.databinding.LogsActivityBinding
 import com.owncloud.android.ui.activity.ToolbarActivity
+import com.nmc.android.utils.ProgressBarThemeUtils
 import javax.inject.Inject
 
 class LogsActivity : ToolbarActivity() {
@@ -49,7 +50,8 @@ class LogsActivity : ToolbarActivity() {
         }
 
         findViewById<ProgressBar>(R.id.logs_loading_progress).apply {
-            viewThemeUtils.platform.themeHorizontalProgressBar(this)
+            //NMC Customization
+            ProgressBarThemeUtils.themeHorizontalProgressBar(this, resources.getColor(R.color.primary, null))
         }
 
         logsAdapter = LogsAdapter(this)
diff --git a/app/src/main/java/com/nmc/android/utils/ProgressBarThemeUtils.kt b/app/src/main/java/com/nmc/android/utils/ProgressBarThemeUtils.kt
@@ -0,0 +1,35 @@
+/*
+ * Nextcloud - Android Client
+ *
+ * SPDX-FileCopyrightText: 2024 Your Name <your@email.com>
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
+package com.nmc.android.utils
+
+import android.widget.ProgressBar
+import android.widget.SeekBar
+import androidx.annotation.ColorInt
+import androidx.core.graphics.BlendModeColorFilterCompat
+import androidx.core.graphics.BlendModeCompat
+
+/**
+ * theming progress and seek bar for NMC
+ */
+object ProgressBarThemeUtils {
+
+    @JvmStatic
+    fun themeHorizontalSeekBar(seekBar: SeekBar, @ColorInt color: Int) {
+        themeHorizontalProgressBar(seekBar, color)
+        seekBar.thumb.colorFilter =
+            BlendModeColorFilterCompat.createBlendModeColorFilterCompat(color, BlendModeCompat.SRC_IN)
+    }
+
+    @JvmStatic
+    fun themeHorizontalProgressBar(progressBar: ProgressBar?, @ColorInt color: Int) {
+        progressBar?.indeterminateDrawable?.colorFilter =
+            BlendModeColorFilterCompat.createBlendModeColorFilterCompat(color, BlendModeCompat.SRC_IN)
+        progressBar?.progressDrawable?.colorFilter =
+            BlendModeColorFilterCompat.createBlendModeColorFilterCompat(color, BlendModeCompat.SRC_IN)
+    }
+}
diff --git a/app/src/main/java/com/nmc/android/utils/SwipeRefreshThemeUtils.kt b/app/src/main/java/com/nmc/android/utils/SwipeRefreshThemeUtils.kt
@@ -0,0 +1,13 @@
+package com.nmc.android.utils
+
+import android.content.Context
+import androidx.swiperefreshlayout.widget.SwipeRefreshLayout
+import com.owncloud.android.R
+
+object SwipeRefreshThemeUtils {
+    @JvmStatic
+    fun themeSwipeRefreshLayout(context: Context, swipeRefreshLayout: SwipeRefreshLayout) {
+        swipeRefreshLayout.setColorSchemeColors(context.resources.getColor(R.color.primary, null))
+        swipeRefreshLayout.setProgressBackgroundColorSchemeResource(R.color.refresh_layout_bg_color)
+    }
+}
diff --git a/app/src/main/java/com/owncloud/android/media/MediaControlView.kt b/app/src/main/java/com/owncloud/android/media/MediaControlView.kt
@@ -27,6 +27,7 @@ import android.widget.SeekBar
 import android.widget.SeekBar.OnSeekBarChangeListener
 import androidx.core.content.ContextCompat
 import androidx.media3.common.Player
+import com.nmc.android.utils.ProgressBarThemeUtils
 import com.owncloud.android.MainApp
 import com.owncloud.android.R
 import com.owncloud.android.databinding.MediaControlBinding
@@ -81,7 +82,8 @@ class MediaControlView(context: Context, attrs: AttributeSet?) :
         binding.rewindBtn.setOnClickListener(this)
 
         binding.progressBar.run {
-            viewThemeUtils.platform.themeHorizontalSeekBar(this)
+            // NMC Customization
+            ProgressBarThemeUtils.themeHorizontalSeekBar(this, resources.getColor(R.color.primary, null))
             setMax(1000)
         }
 
diff --git a/app/src/main/java/com/owncloud/android/ui/activity/NotificationsActivity.kt b/app/src/main/java/com/owncloud/android/ui/activity/NotificationsActivity.kt
@@ -30,6 +30,7 @@ import com.nextcloud.client.network.ClientFactory.CreationException
 import com.nextcloud.client.preferences.AppPreferences
 import com.nextcloud.common.NextcloudClient
 import com.nextcloud.utils.BuildHelper.isFlavourGPlay
+import com.nmc.android.utils.SwipeRefreshThemeUtils
 import com.owncloud.android.R
 import com.owncloud.android.databinding.NotificationsLayoutBinding
 import com.owncloud.android.datamodel.ArbitraryDataProvider
@@ -135,8 +136,10 @@ class NotificationsActivity :
     }
 
     private fun setupContainingList() {
-        viewThemeUtils.androidx.themeSwipeRefreshLayout(binding.swipeContainingList)
-        viewThemeUtils.androidx.themeSwipeRefreshLayout(binding.swipeContainingEmpty)
+        //NMC Customisation
+        SwipeRefreshThemeUtils.themeSwipeRefreshLayout(this, binding.swipeContainingList);
+        SwipeRefreshThemeUtils.themeSwipeRefreshLayout(this, binding.swipeContainingEmpty);
+
         binding.swipeContainingList.setOnRefreshListener {
             setLoadingMessage()
             binding.swipeContainingList.isRefreshing = true
diff --git a/app/src/main/java/com/owncloud/android/ui/activity/UploadListActivity.java b/app/src/main/java/com/owncloud/android/ui/activity/UploadListActivity.java
@@ -30,6 +30,7 @@
 import com.nextcloud.client.utils.Throttler;
 import com.nextcloud.model.WorkerState;
 import com.nextcloud.utils.extensions.ActivityExtensionsKt;
+import com.nmc.android.utils.SwipeRefreshThemeUtils;
 import com.owncloud.android.R;
 import com.owncloud.android.databinding.UploadListLayoutBinding;
 import com.owncloud.android.datamodel.OCFile;
@@ -169,7 +170,8 @@ private void setupContent() {
         binding.list.setLayoutManager(lm);
         binding.list.setAdapter(uploadListAdapter);
 
-        viewThemeUtils.androidx.themeSwipeRefreshLayout(swipeListRefreshLayout);
+        //NMC Customisation
+        SwipeRefreshThemeUtils.themeSwipeRefreshLayout(this, swipeListRefreshLayout);
         swipeListRefreshLayout.setOnRefreshListener(this::refresh);
 
         loadItems();
diff --git a/app/src/main/java/com/owncloud/android/ui/adapter/UploadListAdapter.java b/app/src/main/java/com/owncloud/android/ui/adapter/UploadListAdapter.java
@@ -32,6 +32,7 @@
 import com.nextcloud.client.jobs.upload.FileUploadWorker;
 import com.nextcloud.client.network.ConnectivityService;
 import com.nextcloud.utils.extensions.ViewExtensionsKt;
+import com.nmc.android.utils.ProgressBarThemeUtils;
 import com.owncloud.android.MainApp;
 import com.owncloud.android.R;
 import com.owncloud.android.databinding.UploadListHeaderBinding;
@@ -400,7 +401,9 @@ public void onBindViewHolder(SectionedViewHolder holder, int section, int relati
         String status = getStatusText(item);
         switch (item.getUploadStatus()) {
             case UPLOAD_IN_PROGRESS -> {
-                viewThemeUtils.platform.themeHorizontalProgressBar(itemViewHolder.binding.uploadProgressBar);
+                // NMC Customization
+                ProgressBarThemeUtils.themeHorizontalProgressBar(itemViewHolder.binding.uploadProgressBar,
+                                                                 holder.itemView.getContext().getResources().getColor(R.color.primary, null));
                 itemViewHolder.binding.uploadProgressBar.setProgress(0);
                 itemViewHolder.binding.uploadProgressBar.setVisibility(View.VISIBLE);
 
diff --git a/app/src/main/java/com/owncloud/android/ui/fragment/ExtendedListFragment.kt b/app/src/main/java/com/owncloud/android/ui/fragment/ExtendedListFragment.kt
@@ -57,6 +57,7 @@ import com.nextcloud.client.preferences.AppPreferences
 import com.nextcloud.client.preferences.AppPreferencesImpl
 import com.nextcloud.utils.extensions.getTypedActivity
 import com.nextcloud.utils.extensions.mainThread
+import com.nmc.android.utils.SwipeRefreshThemeUtils
 import com.owncloud.android.MainApp
 import com.owncloud.android.R
 import com.owncloud.android.databinding.ListFragmentBinding
@@ -331,7 +332,8 @@ open class ExtendedListFragment :
 
         mRefreshListLayout = binding?.swipeContainingList
         mRefreshListLayout?.let {
-            viewThemeUtils.androidx.themeSwipeRefreshLayout(it)
+            // NMC Customisation
+            SwipeRefreshThemeUtils.themeSwipeRefreshLayout(requireContext(), it)
             it.setOnRefreshListener(this)
         }
 
diff --git a/app/src/main/java/com/owncloud/android/ui/fragment/FileDetailActivitiesFragment.java b/app/src/main/java/com/owncloud/android/ui/fragment/FileDetailActivitiesFragment.java
@@ -25,6 +25,7 @@
 import com.nextcloud.common.NextcloudClient;
 import com.nextcloud.utils.extensions.BundleExtensionsKt;
 import com.nextcloud.utils.extensions.FileExtensionsKt;
+import com.nmc.android.utils.SwipeRefreshThemeUtils;
 import com.owncloud.android.R;
 import com.owncloud.android.databinding.FileDetailsActivitiesFragmentBinding;
 import com.owncloud.android.datamodel.FileDataStorageManager;
@@ -131,8 +132,9 @@ public View onCreateView(@NonNull LayoutInflater inflater,
 
         setupView();
 
-        viewThemeUtils.androidx.themeSwipeRefreshLayout(binding.swipeContainingEmpty);
-        viewThemeUtils.androidx.themeSwipeRefreshLayout(binding.swipeContainingList);
+        //NMC Customisation
+        SwipeRefreshThemeUtils.themeSwipeRefreshLayout(requireContext(), binding.swipeContainingEmpty);
+        SwipeRefreshThemeUtils.themeSwipeRefreshLayout(requireContext(), binding.swipeContainingList);
 
         isLoadingActivities = true;
         fetchAndSetData(-1);
diff --git a/app/src/main/java/com/owncloud/android/ui/fragment/FileDetailFragment.java b/app/src/main/java/com/owncloud/android/ui/fragment/FileDetailFragment.java
@@ -67,6 +67,7 @@
 import com.owncloud.android.utils.DisplayUtils;
 import com.owncloud.android.utils.EncryptionUtils;
 import com.owncloud.android.utils.MimeTypeUtil;
+import com.nmc.android.utils.ProgressBarThemeUtils;
 import com.owncloud.android.utils.theme.ViewThemeUtils;
 
 import org.greenrobot.eventbus.EventBus;
@@ -274,7 +275,8 @@ public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container,
     @Override
     public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
         if (getFile() != null && user != null) {
-            viewThemeUtils.platform.themeHorizontalProgressBar(binding.progressBar);
+            //NMC Customization
+            ProgressBarThemeUtils.themeHorizontalProgressBar(binding.progressBar, getResources().getColor(R.color.primary, null));
             progressListener = new DownloadProgressListener(binding.progressBar);
             binding.cancelBtn.setOnClickListener(this);
             binding.favorite.setOnClickListener(this);
diff --git a/app/src/main/java/com/owncloud/android/ui/preview/FileDownloadFragment.java b/app/src/main/java/com/owncloud/android/ui/preview/FileDownloadFragment.java
@@ -25,6 +25,7 @@
 import com.nextcloud.client.jobs.download.FileDownloadHelper;
 import com.nextcloud.utils.extensions.BundleExtensionsKt;
 import com.nextcloud.utils.extensions.FileExtensionsKt;
+import com.nmc.android.utils.ProgressBarThemeUtils;
 import com.owncloud.android.R;
 import com.owncloud.android.datamodel.OCFile;
 import com.owncloud.android.lib.common.utils.Log_OC;
@@ -138,7 +139,8 @@ public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container,
         mView = inflater.inflate(R.layout.file_download_fragment, container, false);
 
         ProgressBar progressBar = mView.findViewById(R.id.progressBar);
-        viewThemeUtils.platform.themeHorizontalProgressBar(progressBar);
+        //NMC Customization
+        ProgressBarThemeUtils.themeHorizontalProgressBar(progressBar, getResources().getColor(R.color.primary, null));
         mProgressListener = new DownloadProgressListener(progressBar);
 
         (mView.findViewById(R.id.cancelBtn)).setOnClickListener(this);
diff --git a/app/src/main/java/com/owncloud/android/ui/trashbin/TrashbinActivity.kt b/app/src/main/java/com/owncloud/android/ui/trashbin/TrashbinActivity.kt
@@ -34,6 +34,7 @@ import com.nextcloud.client.network.ConnectivityService
 import com.nextcloud.client.preferences.AppPreferences
 import com.nextcloud.client.utils.Throttler
 import com.nextcloud.ui.trashbinFileActions.TrashbinFileActionsBottomSheet
+import com.nmc.android.utils.SwipeRefreshThemeUtils
 import com.owncloud.android.R
 import com.owncloud.android.databinding.TrashbinActivityBinding
 import com.owncloud.android.datamodel.SyncedFolderProvider
@@ -163,7 +164,8 @@ class TrashbinActivity :
         recyclerView.setHasFooter(true)
         recyclerView.layoutManager = LinearLayoutManager(this)
 
-        viewThemeUtils?.androidx?.themeSwipeRefreshLayout(binding.swipeContainingList)
+        // NMC Customisation
+        SwipeRefreshThemeUtils.themeSwipeRefreshLayout(this, binding.swipeContainingList)
         binding.swipeContainingList.setOnRefreshListener { loadFolder() }
         viewThemeUtils?.material?.colorMaterialTextButton(findViewById(R.id.sort_button))
 
diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml
@@ -39,4 +39,69 @@
     <color name="fontAppbar">@android:color/white</color>
 
     <color name="actionbar_color">#101418</color>
+
+    <!-- NMC Colors -->
+    <color name="icon_color">#FFFFFF</color>
+    <color name="sort_text_color">@color/grey_30</color>
+    <color name="list_icon_color">@color/grey_30</color>
+    <color name="warning_icon_color">#CCCCCC</color>
+    <color name="divider_color">@color/grey_70</color>
+    <color name="spinner_bg_color">@color/grey_80</color>
+    <color name="refresh_layout_bg_color">#2D2D2D</color>
+    <color name="primary_button_disabled_color">@color/grey_70</color>
+    <color name="toolbar_divider_color">@color/grey_70</color>
+
+    <!-- Snackbar Colors -->
+    <color name="snackbar_bg_color">@color/grey_80</color>
+    <color name="snackbar_txt_color">@color/grey_0</color>
+
+    <!-- Alert Dialog Colors -->
+    <color name="alert_bg_color">@color/grey_80</color>
+    <color name="alert_txt_color">@color/grey_0</color>
+
+    <!--  NavigationView colors  -->
+    <color name="nav_selected_bg_color">@color/grey_60</color>
+    <color name="nav_txt_unselected_color">@color/grey_0</color>
+    <color name="nav_txt_selected_color">@color/grey_0</color>
+    <color name="nav_icon_unselected_color">@color/grey_30</color>
+    <color name="nav_icon_selected_color">#FFFFFF</color>
+    <color name="nav_divider_color">@color/grey_30</color>
+    <color name="nav_bg_color">@color/grey_80</color>
+    <color name="drawer_quota_txt_color">#FFFFFF</color>
+
+    <!-- Bottom Sheet Colors -->
+    <color name="bottom_sheet_bg_color">@color/grey_80</color>
+    <color name="bottom_sheet_icon_color">@color/grey_30</color>
+    <color name="bottom_sheet_txt_color">@color/grey_0</color>
+
+    <!-- Popup Menu Colors -->
+    <color name="popup_menu_bg">@color/grey_80</color>
+    <color name="popup_menu_txt_color">@color/grey_0</color>
+    <color name="overflow_bg_color">@color/grey_80</color>
+
+    <!-- Switch Compat Colors -->
+    <color name="switch_thumb_disabled">@color/grey_70</color>
+    <color name="switch_track_disabled">@color/grey_60</color>
+
+    <!-- Checkbox Colors -->
+    <color name="checkbox_checked_disabled">@color/grey_70</color>
+    <color name="checkbox_unchecked_disabled">@color/grey_70</color>
+
+    <!-- Share Colors -->
+    <color name="share_title_txt_color">#FFFFFF</color>
+    <color name="share_subtitle_txt_color">@color/grey_30</color>
+    <color name="share_info_txt_color">@color/grey_0</color>
+    <color name="share_search_border_color">@color/grey_0</color>
+    <color name="share_btn_txt_color">@color/grey_0</color>
+    <color name="share_list_item_txt_color">@color/grey_0</color>
+    <color name="share_disabled_txt_color">@color/grey_60</color>
+    <color name="share_txt_color">@color/grey_0</color>
+    <color name="share_et_divider">#FFFFFF</color>
+    <color name="share_blue_color">#7d94f9</color>
+
+    <!-- Scan Colors -->
+    <color name="scan_doc_bg_color">#121212</color>
+    <color name="scan_text_color">@color/grey_0</color>
+    <color name="scan_edit_bottom_color">@color/grey_80</color>
+    <color name="scan_count_bg_color">@color/grey_80</color>
 </resources>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml

Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,7 @@ import com.nextcloud.client.di.ViewModelFactory`
`20`	`20`	`import com.owncloud.android.R`
`21`	`21`	`import com.owncloud.android.databinding.LogsActivityBinding`
`22`	`22`	`import com.owncloud.android.ui.activity.ToolbarActivity`
	`23`	`+import com.nmc.android.utils.ProgressBarThemeUtils`
`23`	`24`	`import javax.inject.Inject`
`24`	`25`
`25`	`26`	`class LogsActivity : ToolbarActivity() {`
`@@ -49,7 +50,8 @@ class LogsActivity : ToolbarActivity() {`
`49`	`50`	`}`
`50`	`51`
`51`	`52`	`findViewById<ProgressBar>(R.id.logs_loading_progress).apply {`
`52`		`- viewThemeUtils.platform.themeHorizontalProgressBar(this)`
	`53`	`+ //NMC Customization`
	`54`	`+ ProgressBarThemeUtils.themeHorizontalProgressBar(this, resources.getColor(R.color.primary, null))`
`53`	`55`	`}`
`54`	`56`
`55`	`57`	`logsAdapter = LogsAdapter(this)`