Skip to content

Commit 3a72a01

Browse files
Merge pull request #2902 from nextcloud/style/noid/m3CircularProgressIndicator
Replace circular ProgressBar with M3 CircularProgressIndicator
2 parents a62faf4 + c6b0a0a commit 3a72a01

File tree

4 files changed

+10
-4
lines changed

4 files changed

+10
-4
lines changed

app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
import androidx.recyclerview.widget.LinearLayoutManager;
3636

3737
import com.google.android.material.snackbar.Snackbar;
38+
import com.nextcloud.android.common.ui.theme.utils.ColorRole;
3839
import com.nextcloud.android.sso.helper.SingleAccountHelper;
3940
import com.owncloud.android.lib.common.utils.Log_OC;
4041
import com.owncloud.android.lib.resources.shares.OCShare;
@@ -788,6 +789,7 @@ public void applyBrand(int color) {
788789
final var util = BrandingUtil.of(color, this);
789790
util.platform.themeStatusBar(this);
790791
util.androidx.themeToolbarSearchView(binding.searchView);
792+
util.platform.colorCircularProgressBar(binding.loadingLayoutIndicator, ColorRole.PRIMARY);
791793
util.platform.themeHorizontalProgressBar(binding.progressBar);
792794
util.platform.colorViewBackground(getWindow().getDecorView());
793795
util.platform.colorViewBackground(binding.getRoot());

app/src/main/res/layout/activity_note_share.xml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,12 @@
2525
android:layout_height="match_parent">
2626

2727
<com.google.android.material.progressindicator.CircularProgressIndicator
28+
android:id="@+id/loadingLayoutIndicator"
2829
android:layout_width="wrap_content"
29-
android:layout_marginTop="@dimen/spacer_1x"
3030
android:layout_height="wrap_content"
31-
android:layout_gravity="center" />
31+
android:layout_gravity="center"
32+
android:layout_marginTop="@dimen/spacer_1x"
33+
android:indeterminate="true" />
3234

3335
<TextView
3436
android:layout_width="match_parent"

app/src/main/res/layout/activity_notes_list_view.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,11 +119,12 @@
119119
android:id="@+id/empty_content_view"
120120
layout="@layout/empty_content_view" />
121121

122-
<ProgressBar
122+
<com.google.android.material.progressindicator.CircularProgressIndicator
123123
android:id="@+id/progress_circular"
124124
android:layout_width="wrap_content"
125125
android:layout_height="wrap_content"
126126
android:layout_gravity="center"
127+
android:indeterminate="true"
127128
android:indeterminateTint="@color/defaultBrand"
128129
tools:visibility="gone" />
129130

app/src/main/res/layout/fragment_note_direct_edit.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,11 @@
1818
android:layout_height="match_parent"
1919
tools:visibility="visible" />
2020

21-
<ProgressBar
21+
<com.google.android.material.progressindicator.CircularProgressIndicator
2222
android:id="@+id/progress"
2323
android:layout_width="wrap_content"
2424
android:layout_height="wrap_content"
25+
android:indeterminate="true"
2526
app:layout_constraintBottom_toBottomOf="parent"
2627
app:layout_constraintEnd_toEndOf="parent"
2728
app:layout_constraintStart_toStartOf="parent"

0 commit comments

Comments
 (0)