RedAuburn/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

Migrate to Material Progressbar

Browse source 
Signed-off-by: Jean-BaptisteC <jeanbaptiste.charron@outlook.fr>
This commit is contained in:
Jean-Baptiste 2023-12-07 22:36:29 +01:00 • committed by Viktor Govako
parent d379c8b388
commit 1f65866a36
2 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
android/app/src/main/java/app/organicmaps/DownloadResourcesLegacyActivity.java
View file

@ -9,7 +9,6 @@ import android.text.TextUtils;
import android.view.View;
import android.widget.Button;
import android.widget.CheckBox;
import android.widget.ProgressBar;
import android.widget.TextView;
import androidx.activity.result.ActivityResultLauncher;
@ -33,6 +32,7 @@ import app.organicmaps.util.StringUtils;
import app.organicmaps.util.UiUtils;
import app.organicmaps.util.Utils;
import com.google.android.material.dialog.MaterialAlertDialogBuilder;
import com.google.android.material.progressindicator.LinearProgressIndicator;
import java.util.List;
@ -51,7 +51,7 @@ public class DownloadResourcesLegacyActivity extends BaseMwmFragmentActivity
private static final int ERR_FILE_IN_PROGRESS = -6;
private TextView mTvMessage;
private ProgressBar mProgress;
private LinearProgressIndicator mProgress;
private Button mBtnDownload;
private CheckBox mChbDownloadCountry;

8
android/app/src/main/res/layout/button_with_progress.xml
View file

@ -2,6 +2,7 @@
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
@ -14,16 +15,17 @@
android:textAppearance="?fontBody2"
android:visibility="gone"
tools:visibility="visible"/>
<ProgressBar
<com.google.android.material.progressindicator.LinearProgressIndicator
android:id="@+id/progressbar"
style="@style/Widget.AppCompat.ProgressBar.Horizontal"
style="@style/Widget.MaterialComponents.LinearProgressIndicator"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/margin_base_plus"
android:layout_marginTop="@dimen/margin_base"
android:layout_marginEnd="@dimen/margin_base_plus"
android:layout_marginBottom="@dimen/margin_base"
android:indeterminate="false" />
android:indeterminate="false"
app:indicatorColor="?android:colorAccent"/>
<Button
android:id="@+id/btn_download_resources"
style="@style/MwmWidget.Button.Primary"