drifty/comaps
1
0
Fork 0
mirror of https://codeberg.org/comaps/comaps synced 2025-12-19 13:03:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

[android] Migrate Circular Progress Indicator to Material 3

Browse Source 
Signed-off-by: Jean-Baptiste <jeanbaptiste.charron@outlook.fr>
This commit is contained in:
Jean-Baptiste
2025-11-28 09:19:59 +01:00
committed by jeanbaptisteC
parent 7d5e6fabcd
commit 9b5c700ad8
7 changed files with 24 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
android/app/src/main/java/app/organicmaps/editor/ProfileFragment.java
View File

@@ -6,7 +6,6 @@ import android.os.Bundle;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.widget.ProgressBar;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import androidx.core.view.ViewCompat; import androidx.core.view.ViewCompat;
@@ -23,6 +22,7 @@ import app.organicmaps.util.Utils;
import app.organicmaps.util.WindowInsetUtils; import app.organicmaps.util.WindowInsetUtils;
import app.organicmaps.widget.StackedButtonDialogFragment; import app.organicmaps.widget.StackedButtonDialogFragment;
import com.google.android.material.imageview.ShapeableImageView; import com.google.android.material.imageview.ShapeableImageView;
import com.google.android.material.progressindicator.CircularProgressIndicator;
import com.google.android.material.textview.MaterialTextView; import com.google.android.material.textview.MaterialTextView;
import java.text.NumberFormat; import java.text.NumberFormat;
@@ -50,7 +50,7 @@ public class ProfileFragment extends BaseMwmToolbarFragment
private MaterialTextView mEditsSent; private MaterialTextView mEditsSent;
private MaterialTextView mProfileName; private MaterialTextView mProfileName;
private ShapeableImageView mProfileImage; private ShapeableImageView mProfileImage;
private ProgressBar mProfileInfoLoading; private CircularProgressIndicator mProfileInfoLoading;
@Nullable @Nullable
@Override @Override

6
android/app/src/main/res/layout/fragment_osm_profile.xml
View File

@@ -30,12 +30,14 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:padding="@dimen/margin_base" android:padding="@dimen/margin_base"
android:background="?colorPrimary"> android:background="?colorPrimary">
<ProgressBar <com.google.android.material.progressindicator.CircularProgressIndicator
android:id="@+id/user_profile_loading" android:id="@+id/user_profile_loading"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
app:trackColor="@color/text_light"
app:indicatorColor="@color/text_light"
android:layout_gravity="center" android:layout_gravity="center"
android:indeterminateTint="@color/text_light" android:indeterminate="true"
android:visibility="invisible" android:visibility="invisible"
tools:visibility="visible" /> tools:visibility="visible" />
<LinearLayout <LinearLayout

6
android/app/src/main/res/layout/fragment_prefs_faq.xml
View File

@@ -10,12 +10,12 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:visibility="gone" /> android:visibility="gone" />
<ProgressBar <com.google.android.material.progressindicator.CircularProgressIndicator
android:id="@+id/progress" android:id="@+id/progress"
style="@style/Widget.AppCompat.ProgressBar"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center" /> android:layout_gravity="center"
android:indeterminate="true"/>
<include <include
layout="@layout/feedback_fab" layout="@layout/feedback_fab"
android:layout_width="match_parent" android:layout_width="match_parent"

6
android/app/src/main/res/layout/fragment_web_view_with_progress.xml
View File

@@ -10,12 +10,12 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:visibility="gone"/> android:visibility="gone"/>
<ProgressBar <com.google.android.material.progressindicator.CircularProgressIndicator
android:id="@+id/progress" android:id="@+id/progress"
style="@style/Widget.AppCompat.ProgressBar"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center"/> android:layout_gravity="center"
android:indeterminate="true"/>
<include layout="@layout/shadow_top"/> <include layout="@layout/shadow_top"/>
</FrameLayout> </FrameLayout>

5
android/app/src/main/res/layout/placeholder_with_progressbar_layout.xml
View File

@@ -6,11 +6,10 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:gravity="center" android:gravity="center"
android:orientation="vertical"> android:orientation="vertical">
<ProgressBar <com.google.android.material.progressindicator.CircularProgressIndicator
style="@style/Widget.AppCompat.ProgressBar"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@null" /> android:indeterminate="true"/>
<com.google.android.material.textview.MaterialTextView <com.google.android.material.textview.MaterialTextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"

8
android/app/src/main/res/layout/toolbar_menu_progressbar.xml
View File

@@ -1,8 +1,10 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<ProgressBar <com.google.android.material.progressindicator.CircularProgressIndicator
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
style="@style/Widget.AppCompat.ProgressBar" xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="@dimen/height_block_base" android:layout_width="@dimen/height_block_base"
android:layout_height="@dimen/height_block_base" android:layout_height="@dimen/height_block_base"
android:padding="@dimen/margin_half" android:padding="@dimen/margin_half"
android:background="@null"/> android:indeterminate="true"
app:trackColor="@color/text_light"
app:indicatorColor="@color/text_light" />

9
android/app/src/main/res/layout/toolbar_search_controls.xml
View File

@@ -34,16 +34,17 @@
android:singleLine="true" android:singleLine="true"
android:textCursorDrawable="@drawable/cursor_drawable" /> android:textCursorDrawable="@drawable/cursor_drawable" />
<ProgressBar <com.google.android.material.progressindicator.CircularProgressIndicator
android:id="@+id/progress" android:id="@+id/progress"
style="@style/Widget.AppCompat.ProgressBar"
android:layout_width="@dimen/search_progress_size" android:layout_width="@dimen/search_progress_size"
android:layout_height="@dimen/search_progress_size" android:layout_height="@dimen/search_progress_size"
android:layout_marginEnd="@dimen/margin_half" android:layout_marginEnd="@dimen/margin_half"
android:layout_weight="0" android:layout_weight="0"
android:background="@null"
android:minHeight="@dimen/search_progress_size" android:minHeight="@dimen/search_progress_size"
android:minWidth="@dimen/search_progress_size"/> android:minWidth="@dimen/search_progress_size"
app:trackColor="@color/text_light"
app:indicatorColor="@color/text_light"
android:indeterminate="true"/>
<com.google.android.material.imageview.ShapeableImageView <com.google.android.material.imageview.ShapeableImageView
android:id="@+id/clear" android:id="@+id/clear"