Skip to content

Commit

Permalink
other: remove unused onboarding page
Browse files Browse the repository at this point in the history
  • Loading branch information
@timschneeb
timschneeb committed Oct 7, 2022
1 parent 489900d commit b48cec0
Show file tree
Hide file tree
Showing 4 changed files with 27 additions and 188 deletions.
7 changes: 2 additions & 5 deletions app/src/main/java/me/timschneeberger/rootlessjamesdsp/fragment/OnboardingFragment.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,7 @@ class OnboardingFragment : Fragment() {
PAGE_METHOD_SELECT to R.id.onboarding_page3,
PAGE_ADB_SETUP to R.id.onboarding_page4,
PAGE_RUNTIME_PERMISSIONS to R.id.onboarding_page5,
PAGE_SELF_CHECK to R.id.onboarding_page6,
PAGE_READY to R.id.onboarding_page7,
PAGE_READY to R.id.onboarding_page6,
)

private enum class SetupMethods {
Expand Down Expand Up @@ -343,7 +342,6 @@ class OnboardingFragment : Fragment() {
else requireContext().checkSelfPermission(Manifest.permission.POST_NOTIFICATIONS) == PERMISSION_GRANTED
notificationGranted && requireContext().checkSelfPermission(Manifest.permission.RECORD_AUDIO) == PERMISSION_GRANTED
}
PAGE_SELF_CHECK -> true /* FIXME skip dummy page */
else -> false
}

Expand Down Expand Up @@ -521,7 +519,6 @@ class OnboardingFragment : Fragment() {
const val PAGE_METHOD_SELECT = 3
const val PAGE_ADB_SETUP = 4
const val PAGE_RUNTIME_PERMISSIONS = 5
const val PAGE_SELF_CHECK = 6
const val PAGE_READY = 7
const val PAGE_READY = 6
}
}
2 changes: 1 addition & 1 deletion app/src/main/res/layout/onboarding_fragment.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">
<include layout="@layout/onboarding_page7" />
<include layout="@layout/onboarding_page6" />
</FrameLayout>

<FrameLayout
Expand Down
162 changes: 24 additions & 138 deletions app/src/main/res/layout/onboarding_page6.xml
View file
Original file line number Diff line number Diff line change
@@ -1,158 +1,44 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/start_root"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
android:padding="16dp">

<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
android:layout_height="0dp"
android:gravity="center"
android:orientation="vertical"
android:layout_weight="1">
<ImageView
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_gravity="center_vertical"
android:layout_marginEnd="8dp"
android:layout_width="72dp"
android:layout_height="72dp"
android:layout_gravity="center_horizontal"

android:alpha="0.8"
app:srcCompat="@drawable/ic_twotone_safety_check_24dp"
app:srcCompat="@drawable/ic_twotone_check_circle_24dp"
app:tint="?attr/colorOnSurface" />

<TextView
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_gravity="center_vertical"
android:text="Compatibility checks"
android:textAppearance="?attr/textAppearanceHeadline5" />
</LinearLayout>

<ScrollView
android:layout_marginTop="16dp"
android:layout_width="match_parent"
android:layout_height="match_parent">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="16dp"
android:text="This app parses system dumps that are hard to parse reliably. Their structure may differ between Android versions which could prevent this app from working as expected."
android:textAppearance="?attr/textAppearanceBody2" />

<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:layout_marginBottom="16dp">
<ImageView
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_gravity="center_vertical"
android:layout_marginEnd="12dp"
android:alpha="0.8"
app:srcCompat="@drawable/ic_twotone_check_circle_24dp"
app:tint="@android:color/holo_green_dark" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<TextView
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_gravity="center_vertical"
android:layout_marginBottom="2dp"
android:text="AudioService compatible"
android:textAppearance="?attr/textAppearanceBody1" />
<TextView
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_gravity="center_vertical"
android:text="Appears to work correctly. Preferred and default method"
android:textAppearance="?attr/textAppearanceLabelMedium" />
</LinearLayout>
</LinearLayout>

<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:layout_marginBottom="16dp">
<ImageView
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_gravity="center_vertical"
android:layout_marginEnd="12dp"
android:alpha="0.8"
app:srcCompat="@drawable/ic_twotone_cancel_24dp"
app:tint="@android:color/holo_red_dark" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<TextView
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_gravity="center_vertical"
android:layout_marginBottom="2dp"
android:text="AudioPolicyService not compatible"
android:textAppearance="?attr/textAppearanceBody1"/>
<TextView
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_gravity="center_vertical"
android:text="Not implemented"
android:textAppearance="?attr/textAppearanceLabelMedium" />
</LinearLayout>
</LinearLayout>


<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:layout_marginBottom="16dp">
<ImageView
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_gravity="center_vertical"
android:layout_marginEnd="12dp"
android:alpha="0.8"
app:srcCompat="@drawable/ic_twotone_cancel_24dp"
app:tint="@android:color/holo_red_dark" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<TextView
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_gravity="center_vertical"
android:layout_marginBottom="2dp"
android:text="AudioFlingerService not compatible"
android:textAppearance="?attr/textAppearanceBody1"/>
<TextView
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_gravity="center_vertical"
android:text="Not implemented"
android:textAppearance="?attr/textAppearanceLabelMedium" />
</LinearLayout>
</LinearLayout>
android:layout_gravity="center"
android:layout_marginTop="8dp"
android:gravity="center"
android:text="@string/onboarding_finish_header"
android:textAppearance="?attr/textAppearanceHeadlineLarge" />


<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="6dp"
android:text="Your device may not be fully compatible."
android:textAppearance="?attr/textAppearanceTitleMedium" />


</LinearLayout>

</ScrollView>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginTop="8dp"
android:gravity="center"
android:text="@string/onboarding_finish_caption"
android:textAppearance="?attr/textAppearanceBody2" />
</LinearLayout>

</LinearLayout>
44 changes: 0 additions & 44 deletions app/src/main/res/layout/onboarding_page7.xml
View file

This file was deleted.

0 comments on commit b48cec0

Please sign in to comment.