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

[android] Use material component on download screen

Browse Source 
Signed-off-by: Jean-Baptiste Charron <jeanbaptiste.charron@outlook.fr>
This commit is contained in:
Jean-Baptiste
2025-06-06 22:10:58 +02:00
committed by Konstantin Pastbin
parent 45bba5fb5e
commit 0234be60a2
3 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
android/app/src/main/java/app/organicmaps/DownloadResourcesLegacyActivity.java
View File

@@ -8,9 +8,6 @@ import android.location.Location;
import android.os.Bundle; import android.os.Bundle;
import android.text.TextUtils; import android.text.TextUtils;
import android.view.View; import android.view.View;
import android.widget.Button;
import android.widget.CheckBox;
import android.widget.TextView;
import androidx.activity.result.ActivityResultLauncher; import androidx.activity.result.ActivityResultLauncher;
import androidx.activity.result.contract.ActivityResultContracts; import androidx.activity.result.contract.ActivityResultContracts;
@@ -33,8 +30,12 @@ import app.organicmaps.util.StringUtils;
import app.organicmaps.util.UiUtils; import app.organicmaps.util.UiUtils;
import app.organicmaps.util.Utils; import app.organicmaps.util.Utils;
import app.organicmaps.util.WindowInsetUtils.PaddingInsetsListener; import app.organicmaps.util.WindowInsetUtils.PaddingInsetsListener;
import com.google.android.material.button.MaterialButton;
import com.google.android.material.checkbox.MaterialCheckBox;
import com.google.android.material.dialog.MaterialAlertDialogBuilder; import com.google.android.material.dialog.MaterialAlertDialogBuilder;
import com.google.android.material.progressindicator.LinearProgressIndicator; import com.google.android.material.progressindicator.LinearProgressIndicator;
import com.google.android.material.textview.MaterialTextView;
import java.util.List; import java.util.List;
import java.util.Objects; import java.util.Objects;
@@ -53,10 +54,10 @@ public class DownloadResourcesLegacyActivity extends BaseMwmFragmentActivity
private static final int ERR_NO_MORE_FILES = -5; private static final int ERR_NO_MORE_FILES = -5;
private static final int ERR_FILE_IN_PROGRESS = -6; private static final int ERR_FILE_IN_PROGRESS = -6;
private TextView mTvMessage; private MaterialTextView mTvMessage;
private LinearProgressIndicator mProgress; private LinearProgressIndicator mProgress;
private Button mBtnDownload; private MaterialButton mBtnDownload;
private CheckBox mChbDownloadCountry; private MaterialCheckBox mChbDownloadCountry;
private String mCurrentCountry; private String mCurrentCountry;

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

@@ -19,12 +19,12 @@
android:orientation="vertical" android:orientation="vertical"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintTop_toTopOf="parent"> app:layout_constraintTop_toTopOf="parent">
<ImageView <com.google.android.material.imageview.ShapeableImageView
android:layout_width="90dp" android:layout_width="90dp"
android:layout_height="90dp" android:layout_height="90dp"
app:srcCompat="@drawable/ic_download" app:srcCompat="@drawable/ic_download"
app:tint="?android:colorAccent"/> app:tint="?android:colorAccent"/>
<TextView <com.google.android.material.textview.MaterialTextView
android:id="@+id/head_message" android:id="@+id/head_message"
style="?fontHeadline6" style="?fontHeadline6"
android:layout_width="match_parent" android:layout_width="match_parent"
@@ -32,7 +32,7 @@
android:layout_marginTop="@dimen/margin_base" android:layout_marginTop="@dimen/margin_base"
android:gravity="center" android:gravity="center"
android:text="@string/download_map_title" /> android:text="@string/download_map_title" />
<TextView <com.google.android.material.textview.MaterialTextView
android:id="@+id/download_message" android:id="@+id/download_message"
style="?fontBody2" style="?fontBody2"
android:layout_width="match_parent" android:layout_width="match_parent"

4
android/app/src/main/res/layout/button_with_progress.xml
View File

@@ -6,7 +6,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical"> android:orientation="vertical">
<CheckBox <com.google.android.material.checkbox.MaterialCheckBox
android:id="@+id/chb_download_country" android:id="@+id/chb_download_country"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@@ -27,7 +27,7 @@
android:indeterminate="false" android:indeterminate="false"
app:indicatorColor="?android:colorAccent" app:indicatorColor="?android:colorAccent"
app:trackColor="@color/bg_routing_progress"/> app:trackColor="@color/bg_routing_progress"/>
<Button <com.google.android.material.button.MaterialButton
android:id="@+id/btn_download_resources" android:id="@+id/btn_download_resources"
style="@style/MwmWidget.Button.Primary" style="@style/MwmWidget.Button.Primary"
android:layout_width="match_parent" android:layout_width="match_parent"