rework ui a bit
Signed-off-by: androidacy-user <opensource@androidacy.com>pull/27/head
androidacy-user
3 years ago
parent
3217eaddee
commit
9ac56c371b
@ -1,236 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||
xmlns:tools="http://schemas.android.com/tools"
|
||||
android:id="@+id/setupScrollView"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
app:layout_behavior="@string/appbar_scrolling_view_behavior"
|
||||
tools:context=".SetupActivity"
|
||||
tools:showIn="@layout/activity_setup">
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:orientation="vertical"
|
||||
android:padding="8dp">
|
||||
|
||||
<!-- Title -->
|
||||
<com.google.android.material.textview.MaterialTextView
|
||||
android:id="@+id/setup_title"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@string/setup_title"
|
||||
android:textAppearance="@style/TextAppearance.Material3.HeadlineLarge" />
|
||||
|
||||
<com.google.android.material.textview.MaterialTextView
|
||||
android:id="@+id/setup_summary"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_margin="2dp"
|
||||
android:text="@string/setup_message"
|
||||
android:textAppearance="@style/TextAppearance.Material3.BodyMedium" />
|
||||
|
||||
<!-- Theme radio select. Options are system, light, dark, black, transparent_light -->
|
||||
|
||||
<!-- Button to trigger theme selection, half width, and in container with language -->
|
||||
<LinearLayout
|
||||
android:id="@+id/LinearLayout02"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content">
|
||||
|
||||
<com.google.android.material.button.MaterialButton
|
||||
android:id="@+id/setup_theme_button"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="4dp"
|
||||
android:layout_marginEnd="4dp"
|
||||
android:layout_weight="1"
|
||||
android:padding="12dp"
|
||||
android:text="@string/setup_theme_button"
|
||||
android:textSize="16sp"
|
||||
app:icon="@drawable/ic_baseline_palette_24"
|
||||
style="@style/Widget.Material3.Button.IconButton.Outlined"
|
||||
app:iconGravity="textStart"
|
||||
app:iconPadding="8dp"
|
||||
app:iconTintMode="src_in"
|
||||
app:rippleColor="@color/gray_800"
|
||||
tools:ignore="DuplicateSpeakableTextCheck" />
|
||||
|
||||
<com.google.android.material.button.MaterialButton
|
||||
android:id="@+id/setup_language_button"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginStart="4dp"
|
||||
android:layout_marginTop="4dp"
|
||||
android:layout_weight="1"
|
||||
style="@style/Widget.Material3.Button.IconButton.Outlined"
|
||||
android:padding="12dp"
|
||||
android:text="@string/setup_language_button"
|
||||
android:textSize="16sp"
|
||||
app:icon="@drawable/ic_baseline_language_24"
|
||||
app:iconGravity="textStart"
|
||||
app:iconPadding="8dp"
|
||||
app:iconTintMode="src_in"
|
||||
app:rippleColor="@color/gray_800"
|
||||
tools:ignore="DuplicateSpeakableTextCheck" />
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
<com.google.android.material.textview.MaterialTextView
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_margin="4dp"
|
||||
android:text="@string/repos"
|
||||
android:textAppearance="@android:style/TextAppearance.Material.Headline" />
|
||||
|
||||
<com.google.android.material.materialswitch.MaterialSwitch
|
||||
android:id="@+id/setup_androidacy_repo"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_margin="4dp"
|
||||
android:checked="false"
|
||||
android:key="pref_androidacy_repo_enabled"
|
||||
android:text="@string/setup_androidacy_repo"
|
||||
android:textSize="18sp" />
|
||||
|
||||
<!-- Small summary for above switch -->
|
||||
<com.google.android.material.textview.MaterialTextView
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_margin="4dp"
|
||||
android:drawableStart="@drawable/ic_baseline_info_24"
|
||||
android:drawablePadding="8dp"
|
||||
android:text="@string/setup_androidacy_repo_summary"
|
||||
android:textAppearance="@android:style/TextAppearance.Material.Small" />
|
||||
|
||||
<com.google.android.material.materialswitch.MaterialSwitch
|
||||
android:id="@+id/setup_magisk_alt_repo"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginBottom="4dp"
|
||||
android:checked="false"
|
||||
android:key="pref_magisk_alt_repo_enabled"
|
||||
android:text="@string/setup_magisk_alt_repo"
|
||||
android:textSize="18sp" />
|
||||
|
||||
<!-- Small summary for above switch -->
|
||||
<com.google.android.material.textview.MaterialTextView
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginBottom="4dp"
|
||||
android:drawableStart="@drawable/ic_baseline_info_24"
|
||||
android:drawablePadding="8dp"
|
||||
android:text="@string/setup_magisk_alt_repo_summary"
|
||||
android:textAppearance="@android:style/TextAppearance.Material.Small" />
|
||||
|
||||
<com.google.android.material.textview.MaterialTextView
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_margin="2dp"
|
||||
android:text="@string/setup_custom_repos"
|
||||
android:textAppearance="@android:style/TextAppearance.Material.Caption" />
|
||||
|
||||
<com.google.android.material.textview.MaterialTextView
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_margin="4dp"
|
||||
android:text="@string/crash_reporting_headline"
|
||||
android:textAppearance="@android:style/TextAppearance.Material.Headline" />
|
||||
|
||||
<com.google.android.material.materialswitch.MaterialSwitch
|
||||
android:id="@+id/setup_crash_reporting"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_margin="4dp"
|
||||
android:checked="false"
|
||||
android:key="pref_crash_reporting_enabled"
|
||||
android:text="@string/setup_crash_reporting"
|
||||
android:textAppearance="@android:style/TextAppearance.Material.Subhead"
|
||||
android:textSize="18sp" />
|
||||
|
||||
<com.google.android.material.textview.MaterialTextView
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginBottom="4dp"
|
||||
android:drawableStart="@drawable/ic_baseline_info_24"
|
||||
android:drawablePadding="8dp"
|
||||
android:text="@string/setup_crash_reporting_summary"
|
||||
android:textAppearance="@android:style/TextAppearance.Material.Small" />
|
||||
|
||||
<com.google.android.material.textview.MaterialTextView
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_margin="4dp"
|
||||
android:text="@string/setup_update_check_headline"
|
||||
android:textAppearance="@android:style/TextAppearance.Material.Headline" />
|
||||
|
||||
<com.google.android.material.materialswitch.MaterialSwitch
|
||||
android:id="@+id/setup_background_update_check"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_margin="4dp"
|
||||
android:checked="false"
|
||||
android:key="pref_background_update_check"
|
||||
android:text="@string/setup_background_update_check"
|
||||
android:textSize="18sp" />
|
||||
|
||||
<com.google.android.material.textview.MaterialTextView
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginBottom="4dp"
|
||||
android:drawableStart="@drawable/ic_baseline_info_24"
|
||||
android:drawablePadding="8dp"
|
||||
android:text="@string/setup_background_update_check_summary"
|
||||
android:textAppearance="@android:style/TextAppearance.Material.Small"
|
||||
app:icon="@drawable/ic_baseline_info_24" />
|
||||
|
||||
<!-- require wifi switch -->
|
||||
<com.google.android.material.materialswitch.MaterialSwitch
|
||||
android:id="@+id/setup_background_update_check_require_wifi"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_margin="4dp"
|
||||
android:checked="false"
|
||||
android:key="pref_background_update_check_require_wifi"
|
||||
android:text="@string/setup_background_update_check_require_wifi"
|
||||
android:textSize="18sp" />
|
||||
|
||||
<!-- description for require wifi switch -->
|
||||
<com.google.android.material.textview.MaterialTextView
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginBottom="4dp"
|
||||
android:drawableStart="@drawable/ic_baseline_info_24"
|
||||
android:drawablePadding="8dp"
|
||||
android:text="@string/setup_background_update_check_require_wifi_summary"
|
||||
android:textAppearance="@android:style/TextAppearance.Material.Small"
|
||||
app:icon="@drawable/ic_baseline_info_24" />
|
||||
|
||||
<!-- Placeholder for future settings -->
|
||||
<!--<com.google.android.material.materialswitch.MaterialSwitch
|
||||
android:id="@+id/setup_app_analytics"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_margin="4dp"
|
||||
android:checked="false"
|
||||
android:key="pref_app_analytics"
|
||||
android:textAppearance="@android:style/TextAppearance.Material.Small"
|
||||
android:text="@string/setup_app_analytics" />-->
|
||||
|
||||
<!-- bottom nav for cancel and finish -->
|
||||
<com.google.android.material.bottomnavigation.BottomNavigationView
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="bottom"
|
||||
android:layout_margin="4dp"
|
||||
app:menu="@menu/setup_bottom_nav"
|
||||
app:compatShadowEnabled="true"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
android:background="?attr/colorSurface"
|
||||
android:elevation="4dp" />
|
||||
</LinearLayout>
|
||||
|
||||
</androidx.core.widget.NestedScrollView>
|
||||
@ -1,6 +1,6 @@
|
||||
#Sun Jun 05 10:40:53 EDT 2022
|
||||
distributionBase=GRADLE_USER_HOME
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.1-bin.zip
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip
|
||||
distributionPath=wrapper/dists
|
||||
zipStorePath=wrapper/dists
|
||||
zipStoreBase=GRADLE_USER_HOME
|
||||
Loading…
Reference in New Issue