Skip to content

Commit 4f94712

Browse files
committed
Progress and seek bar customized.
1 parent f59caa7 commit 4f94712

6 files changed

Lines changed: 44 additions & 5 deletions

File tree

‎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
@@ -34,6 +34,7 @@ import com.owncloud.android.R
3434
import com.owncloud.android.databinding.LogsActivityBinding
3535
import com.owncloud.android.ui.activity.ToolbarActivity
3636
import com.owncloud.android.utils.theme.ViewThemeUtils
37+
import com.nmc.android.ui.utils.ProgressBarThemeUtils
3738
import javax.inject.Inject
3839

3940
class LogsActivity : ToolbarActivity() {
@@ -68,7 +69,8 @@ class LogsActivity : ToolbarActivity() {
6869
}
6970

7071
findViewById<ProgressBar>(R.id.logs_loading_progress).apply {
71-
viewThemeUtils.platform.themeHorizontalProgressBar(this)
72+
//NMC Customization
73+
ProgressBarThemeUtils.themeHorizontalProgressBar(this, resources.getColor(R.color.primary, null))
7274
}
7375

7476
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.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636
import android.widget.SeekBar;
3737
import android.widget.SeekBar.OnSeekBarChangeListener;
3838

39+
import com.nmc.android.ui.utils.ProgressBarThemeUtils;
3940
import com.owncloud.android.MainApp;
4041
import com.owncloud.android.R;
4142
import com.owncloud.android.databinding.MediaControlBinding;
@@ -109,7 +110,8 @@ private void initControllerView() {
109110

110111
binding.rewindBtn.setOnClickListener(this);
111112

112-
viewThemeUtils.platform.themeHorizontalSeekBar(binding.progressBar);
113+
//NMC Customization
114+
ProgressBarThemeUtils.themeHorizontalSeekBar(binding.progressBar, getResources().getColor(R.color.primary, null));
113115
binding.progressBar.setOnSeekBarChangeListener(this);
114116
binding.progressBar.setMax(1000);
115117
}

‎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
@@ -47,6 +47,7 @@
4747
import com.nextcloud.client.jobs.upload.FileUploadWorker;
4848
import com.nextcloud.client.network.ConnectivityService;
4949
import com.nextcloud.java.util.Optional;
50+
import com.nmc.android.ui.utils.ProgressBarThemeUtils;
5051
import com.owncloud.android.MainApp;
5152
import com.owncloud.android.R;
5253
import com.owncloud.android.databinding.UploadListHeaderBinding;
@@ -291,7 +292,9 @@ public void onBindViewHolder(SectionedViewHolder holder, int section, int relati
291292
String status = getStatusText(item);
292293
switch (item.getUploadStatus()) {
293294
case UPLOAD_IN_PROGRESS -> {
294-
viewThemeUtils.platform.themeHorizontalProgressBar(itemViewHolder.binding.uploadProgressBar);
295+
// NMC Customization
296+
ProgressBarThemeUtils.themeHorizontalProgressBar(itemViewHolder.binding.uploadProgressBar,
297+
holder.itemView.getContext().getResources().getColor(R.color.primary, null));
295298
itemViewHolder.binding.uploadProgressBar.setProgress(0);
296299
itemViewHolder.binding.uploadProgressBar.setVisibility(View.VISIBLE);
297300

‎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
@@ -75,6 +75,7 @@
7575
import com.owncloud.android.utils.DisplayUtils;
7676
import com.owncloud.android.utils.EncryptionUtils;
7777
import com.owncloud.android.utils.MimeTypeUtil;
78+
import com.nmc.android.ui.utils.ProgressBarThemeUtils;
7879
import com.owncloud.android.utils.theme.ViewThemeUtils;
7980

8081
import org.greenrobot.eventbus.EventBus;
@@ -262,7 +263,8 @@ public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container,
262263
@Override
263264
public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
264265
if (getFile() != null && user != null) {
265-
viewThemeUtils.platform.themeHorizontalProgressBar(binding.progressBar);
266+
//NMC Customization
267+
ProgressBarThemeUtils.themeHorizontalProgressBar(binding.progressBar, getResources().getColor(R.color.primary, null));
266268
progressListener = new ProgressListener(binding.progressBar);
267269
binding.cancelBtn.setOnClickListener(this);
268270
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
@@ -30,6 +30,7 @@
3030
import com.nextcloud.client.account.User;
3131
import com.nextcloud.client.di.Injectable;
3232
import com.nextcloud.utils.extensions.BundleExtensionsKt;
33+
import com.nmc.android.ui.utils.ProgressBarThemeUtils;
3334
import com.owncloud.android.R;
3435
import com.owncloud.android.datamodel.OCFile;
3536
import com.owncloud.android.lib.common.network.OnDatatransferProgressListener;
@@ -144,7 +145,8 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
144145
mView = inflater.inflate(R.layout.file_download_fragment, container, false);
145146

146147
ProgressBar progressBar = mView.findViewById(R.id.progressBar);
147-
viewThemeUtils.platform.themeHorizontalProgressBar(progressBar);
148+
//NMC Customization
149+
ProgressBarThemeUtils.themeHorizontalProgressBar(progressBar, getResources().getColor(R.color.primary, null));
148150
mProgressListener = new ProgressListener(progressBar);
149151

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

0 commit comments

Comments
 (0)