Skip to content

Commit 9d327be

Browse files
committed
Progress and seek bar customized.
1 parent e0cc413 commit 9d327be

File tree

6 files changed

+44
-5
lines changed

6 files changed

+44
-5
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
@@ -21,6 +21,7 @@ import com.owncloud.android.R
2121
import com.owncloud.android.databinding.LogsActivityBinding
2222
import com.owncloud.android.ui.activity.ToolbarActivity
2323
import com.owncloud.android.utils.theme.ViewThemeUtils
24+
import com.nmc.android.ui.utils.ProgressBarThemeUtils
2425
import javax.inject.Inject
2526

2627
class LogsActivity : ToolbarActivity() {
@@ -55,7 +56,8 @@ class LogsActivity : ToolbarActivity() {
5556
}
5657

5758
findViewById<ProgressBar>(R.id.logs_loading_progress).apply {
58-
viewThemeUtils.platform.themeHorizontalProgressBar(this)
59+
//NMC Customization
60+
ProgressBarThemeUtils.themeHorizontalProgressBar(this, resources.getColor(R.color.primary, null))
5961
}
6062

6163
logsAdapter = LogsAdapter(this)
Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
package com.nmc.android.ui.utils
2+
3+
import android.widget.ProgressBar
4+
import android.widget.SeekBar
5+
import androidx.annotation.ColorInt
6+
import androidx.core.graphics.BlendModeColorFilterCompat
7+
import androidx.core.graphics.BlendModeCompat
8+
9+
/**
10+
* theming progress and seek bar for NMC
11+
*/
12+
object ProgressBarThemeUtils {
13+
14+
@JvmStatic
15+
fun themeHorizontalSeekBar(seekBar: SeekBar, @ColorInt color: Int) {
16+
themeHorizontalProgressBar(seekBar, color)
17+
seekBar.thumb.colorFilter =
18+
BlendModeColorFilterCompat.createBlendModeColorFilterCompat(color, BlendModeCompat.SRC_IN)
19+
}
20+
21+
@JvmStatic
22+
fun themeHorizontalProgressBar(progressBar: ProgressBar?, @ColorInt color: Int) {
23+
progressBar?.indeterminateDrawable?.colorFilter =
24+
BlendModeColorFilterCompat.createBlendModeColorFilterCompat(color, BlendModeCompat.SRC_IN)
25+
progressBar?.progressDrawable?.colorFilter =
26+
BlendModeColorFilterCompat.createBlendModeColorFilterCompat(color, BlendModeCompat.SRC_IN)
27+
}
28+
}

app/src/main/java/com/owncloud/android/media/MediaControlView.kt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ import android.widget.MediaController.MediaPlayerControl
2727
import android.widget.SeekBar
2828
import android.widget.SeekBar.OnSeekBarChangeListener
2929
import androidx.core.content.ContextCompat
30+
import com.nmc.android.ui.utils.ProgressBarThemeUtils
3031
import com.owncloud.android.MainApp
3132
import com.owncloud.android.R
3233
import com.owncloud.android.databinding.MediaControlBinding
@@ -85,7 +86,8 @@ class MediaControlView(context: Context, attrs: AttributeSet?) :
8586
binding.rewindBtn.setOnClickListener(this)
8687

8788
binding.progressBar.run {
88-
viewThemeUtils.platform.themeHorizontalSeekBar(this)
89+
// NMC Customization
90+
ProgressBarThemeUtils.themeHorizontalSeekBar(this, resources.getColor(R.color.primary, null));
8991
setMax(1000)
9092
}
9193

app/src/main/java/com/owncloud/android/ui/adapter/UploadListAdapter.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
import com.nextcloud.client.jobs.upload.FileUploadHelper;
3131
import com.nextcloud.client.jobs.upload.FileUploadWorker;
3232
import com.nextcloud.client.network.ConnectivityService;
33+
import com.nmc.android.ui.utils.ProgressBarThemeUtils;
3334
import com.owncloud.android.MainApp;
3435
import com.owncloud.android.R;
3536
import com.owncloud.android.databinding.UploadListHeaderBinding;
@@ -345,7 +346,9 @@ public void onBindViewHolder(SectionedViewHolder holder, int section, int relati
345346
String status = getStatusText(item);
346347
switch (item.getUploadStatus()) {
347348
case UPLOAD_IN_PROGRESS -> {
348-
viewThemeUtils.platform.themeHorizontalProgressBar(itemViewHolder.binding.uploadProgressBar);
349+
// NMC Customization
350+
ProgressBarThemeUtils.themeHorizontalProgressBar(itemViewHolder.binding.uploadProgressBar,
351+
holder.itemView.getContext().getResources().getColor(R.color.primary, null));
349352
itemViewHolder.binding.uploadProgressBar.setProgress(0);
350353
itemViewHolder.binding.uploadProgressBar.setVisibility(View.VISIBLE);
351354

app/src/main/java/com/owncloud/android/ui/fragment/FileDetailFragment.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@
5858
import com.owncloud.android.utils.DisplayUtils;
5959
import com.owncloud.android.utils.EncryptionUtils;
6060
import com.owncloud.android.utils.MimeTypeUtil;
61+
import com.nmc.android.ui.utils.ProgressBarThemeUtils;
6162
import com.owncloud.android.utils.theme.ViewThemeUtils;
6263

6364
import org.greenrobot.eventbus.EventBus;
@@ -255,7 +256,8 @@ public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container,
255256
@Override
256257
public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
257258
if (getFile() != null && user != null) {
258-
viewThemeUtils.platform.themeHorizontalProgressBar(binding.progressBar);
259+
//NMC Customization
260+
ProgressBarThemeUtils.themeHorizontalProgressBar(binding.progressBar, getResources().getColor(R.color.primary, null));
259261
progressListener = new ProgressListener(binding.progressBar);
260262
binding.cancelBtn.setOnClickListener(this);
261263
binding.favorite.setOnClickListener(this);

app/src/main/java/com/owncloud/android/ui/preview/FileDownloadFragment.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
import com.nextcloud.client.jobs.download.FileDownloadHelper;
2626
import com.nextcloud.utils.extensions.BundleExtensionsKt;
2727
import com.nextcloud.utils.extensions.FileExtensionsKt;
28+
import com.nmc.android.ui.utils.ProgressBarThemeUtils;
2829
import com.owncloud.android.R;
2930
import com.owncloud.android.datamodel.OCFile;
3031
import com.owncloud.android.lib.common.network.OnDatatransferProgressListener;
@@ -139,7 +140,8 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
139140
mView = inflater.inflate(R.layout.file_download_fragment, container, false);
140141

141142
ProgressBar progressBar = mView.findViewById(R.id.progressBar);
142-
viewThemeUtils.platform.themeHorizontalProgressBar(progressBar);
143+
//NMC Customization
144+
ProgressBarThemeUtils.themeHorizontalProgressBar(progressBar, getResources().getColor(R.color.primary, null));
143145
mProgressListener = new ProgressListener(progressBar);
144146

145147
(mView.findViewById(R.id.cancelBtn)).setOnClickListener(this);

0 commit comments

Comments
 (0)