Skip to content

Commit 1e511e2

Browse files
w2svw2sv
committed
Fix onboarding crashes
1 parent df01052 commit 1e511e2

File tree

6 files changed

+46
-57
lines changed

6 files changed

+46
-57
lines changed

‎app/src/main/kotlin/com/w2sv/autocrop/activities/examination/fragments/pager/CropPagerFragment.kt‎

Lines changed: 15 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ import com.w2sv.autocrop.activities.examination.fragments.adjustment.CropAdjustm
3737
import com.w2sv.autocrop.activities.examination.fragments.comparison.ComparisonFragment
3838
import com.w2sv.autocrop.activities.examination.fragments.pager.dialogs.AbstractCropSavingDialogFragment
3939
import com.w2sv.autocrop.activities.examination.fragments.pager.dialogs.CropSavingDialogFragment
40-
import com.w2sv.autocrop.activities.examination.fragments.pager.dialogs.RecropAllDialogFragment
4140
import com.w2sv.autocrop.activities.examination.fragments.pager.dialogs.RecropDialogFragment
4241
import com.w2sv.autocrop.activities.examination.fragments.pager.dialogs.SaveAllCropsDialogFragment
4342
import com.w2sv.autocrop.activities.examination.fragments.pager.model.CropProcedure
@@ -78,8 +77,7 @@ class CropPagerFragment :
7877
AppFragment<CropPagerBinding>(CropPagerBinding::class.java),
7978
CropSavingDialogFragment.ResultListener,
8079
SaveAllCropsDialogFragment.ResultListener,
81-
RecropDialogFragment.Listener,
82-
RecropAllDialogFragment.Listener {
80+
RecropDialogFragment.Listener {
8381

8482
companion object {
8583
fun getInstance(cropResults: CropResults): CropPagerFragment =
@@ -300,9 +298,9 @@ class CropPagerFragment :
300298
viewModel.getSaveAllCropsDialog(false)
301299
.show(childFragmentManager)
302300
}
303-
recropAllButton.setOnClickListener {
304-
RecropAllDialogFragment().show(childFragmentManager)
305-
}
301+
// recropAllButton.setOnClickListener {
302+
// RecropAllDialogFragment().show(childFragmentManager)
303+
// }
306304
cancelAutoScrollButton.setOnClickListener {
307305
viewModel.doAutoScrollLive.postValue(false)
308306
}
@@ -463,17 +461,17 @@ class CropPagerFragment :
463461
)
464462
}
465463

466-
override fun onRecropAll(threshold: Double) =
467-
onRecropWrapper {
468-
requireContext().showToast(
469-
viewModel.dataSet.map { it.recropAndUpdate(threshold) }.groupingBy { it }.eachCount().let {
470-
when (it.getOrDefault(false, 0)) {
471-
viewModel.dataSet.size -> "No Crop Edges found for adjusted Settings"
472-
else -> "Updated ${it.getValue(true)} crops"
473-
}
474-
}
475-
)
476-
}
464+
// override fun onRecropAll(threshold: Double) =
465+
// onRecropWrapper {
466+
// requireContext().showToast(
467+
// viewModel.dataSet.map { it.recropAndUpdate(threshold) }.groupingBy { it }.eachCount().let {
468+
// when (it.getOrDefault(false, 0)) {
469+
// viewModel.dataSet.size -> "No Crop Edges found for adjusted Settings"
470+
// else -> "Updated ${it.getValue(true)} crops"
471+
// }
472+
// }
473+
// )
474+
// }
477475

478476
private inline fun onRecropWrapper(f: () -> Unit) {
479477
cropPager.pager.isEnabled = false

‎app/src/main/kotlin/com/w2sv/autocrop/activities/onboarding/OnboardingActivity.kt‎

Lines changed: 9 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package com.w2sv.autocrop.activities.onboarding
22

33
import android.os.Bundle
4-
import android.view.View
54
import androidx.activity.viewModels
65
import androidx.appcompat.widget.AppCompatButton
76
import com.airbnb.lottie.LottieAnimationView
@@ -31,7 +30,7 @@ class OnboardingActivity : com.w2sv.onboarding.OnboardingActivity() {
3130
var screenshotListeningEnabled: Boolean = false
3231
}
3332

34-
val viewModel by viewModels<ViewModel>()
33+
private val viewModel by viewModels<ViewModel>()
3534

3635
private val screenshotListeningPermissionHandlers by lazy {
3736
ScreenshotListener.permissionHandlers(this)
@@ -64,21 +63,21 @@ class OnboardingActivity : com.w2sv.onboarding.OnboardingActivity() {
6463
emblemDrawableRes = com.w2sv.common.R.drawable.ic_hearing_24,
6564
actionLayoutRes = R.layout.action_layout_screenshotlistener_onboardingpage,
6665
onViewCreatedListener = { view, activity ->
67-
activity as OnboardingActivity
68-
6966
val doneAnimation = view.findViewById<LottieAnimationView>(R.id.done_animation)
70-
val enableButton = view.getEnableButton()
67+
val enableButton = view.findViewById<AppCompatButton>(R.id.enable_button)
68+
69+
val viewModel by activity.viewModels<ViewModel>()
7170

72-
when (activity.viewModel.screenshotListeningEnabled) {
71+
when (viewModel.screenshotListeningEnabled) {
7372
true -> crossVisualize(enableButton, doneAnimation)
7473
false -> enableButton
7574
.setOnClickListener {
76-
activity
75+
(activity as OnboardingActivity)
7776
.screenshotListeningPermissionHandlers
7877
.requestPermissions(
7978
onGranted = {
8079
ScreenshotListener.startService(activity)
81-
activity.viewModel.screenshotListeningEnabled = true
80+
viewModel.screenshotListeningEnabled = true
8281
},
8382
onRequestDismissed = {
8483
it
@@ -96,11 +95,9 @@ class OnboardingActivity : com.w2sv.onboarding.OnboardingActivity() {
9695
}
9796
},
9897
onPageFullyVisibleListener = { view, activity ->
99-
activity as OnboardingActivity
100-
101-
if (view != null && !activity.viewModel.screenshotListeningEnabled) {
98+
if (view != null && !activity.viewModels<ViewModel>().value.screenshotListeningEnabled) {
10299
view
103-
.getEnableButton()
100+
.findViewById<AppCompatButton>(R.id.enable_button)
104101
.animationComposer(Techniques.Tada)
105102
.delay(resources.getLong(R.integer.delay_small))
106103
.play()
@@ -115,9 +112,6 @@ class OnboardingActivity : com.w2sv.onboarding.OnboardingActivity() {
115112
)
116113
)
117114

118-
private fun View.getEnableButton(): AppCompatButton =
119-
findViewById(R.id.enable_button)
120-
121115
override fun onOnboardingFinished() {
122116
viewModel.globalFlags.onboardingDone = true
123117
MainActivity.start(this, true, Animatoo::animateSwipeLeft)

‎app/src/main/play/release-notes/en-US/production.txt‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
11
[Improved]
2-
- Crop Algorithm
3-
- UI in various regards including the migration to MaterialTheme'd dialogs, as well as a fresh new font
4-
[Introduced]
5-
- Crop Sensibility Selection
6-
- Recropping with alternate sensibility
7-
- Crop Edge Candidate Selection
2+
- App stability
3+
[Fixed]
4+
- Coloring in light mode

‎app/src/main/res/layout/crop_pager.xml‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -57,23 +57,23 @@
5757

5858
android:contentDescription="@string/save_all_crops" />
5959

60-
<com.google.android.material.divider.MaterialDivider
61-
android:layout_width="1dp"
62-
android:layout_height="match_parent"
63-
android:layout_marginHorizontal="2dp"
64-
android:layout_marginVertical="2dp"
65-
app:dividerColor="@color/low_alpha_gray" />
66-
67-
<androidx.appcompat.widget.AppCompatImageButton
68-
android:id="@+id/recrop_all_button"
69-
android:layout_width="@dimen/size_image_button"
70-
android:layout_height="@dimen/size_image_button"
71-
android:layout_marginHorizontal="@dimen/margin_button_row"
72-
73-
android:background="@drawable/ic_autorenew_24"
74-
android:backgroundTint="@color/higher_light"
75-
76-
android:contentDescription="@string/manually_adjust_the_crop" />
60+
<!-- <com.google.android.material.divider.MaterialDivider-->
61+
<!-- android:layout_width="1dp"-->
62+
<!-- android:layout_height="match_parent"-->
63+
<!-- android:layout_marginHorizontal="2dp"-->
64+
<!-- android:layout_marginVertical="2dp"-->
65+
<!-- app:dividerColor="@color/low_alpha_gray" />-->
66+
67+
<!-- <androidx.appcompat.widget.AppCompatImageButton-->
68+
<!-- android:id="@+id/recrop_all_button"-->
69+
<!-- android:layout_width="@dimen/size_image_button"-->
70+
<!-- android:layout_height="@dimen/size_image_button"-->
71+
<!-- android:layout_marginHorizontal="@dimen/margin_button_row"-->
72+
73+
<!-- android:background="@drawable/ic_autorenew_24"-->
74+
<!-- android:backgroundTint="@color/higher_light"-->
75+
76+
<!-- android:contentDescription="@string/manually_adjust_the_crop" />-->
7777
</LinearLayout>
7878
</LinearLayout>
7979

‎app/src/main/res/values/styles.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
<!-- App Theme -->
1212

13-
<style name="Theme.App.Main" parent="Theme.Material3.DayNight.NoActionBar">
13+
<style name="Theme.App.Main" parent="Theme.Material3.Dark.NoActionBar">
1414

1515
<!-- disable all caps -->
1616
<item name="textAllCaps">false</item>

‎gradle/libs.versions.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ androidutils = 'com.github.w2sv:AndroidUtils:0.1.0'
1818
kotlinutils = 'com.github.w2sv:KotlinUtils:0.0.6-rc3'
1919
viewboundcontroller = 'com.github.w2sv:ViewboundController:0.0.7-rc1'
2020
viewanimations = 'com.github.w2sv:AndroidViewAnimations:3.0.2-rc2'
21-
onboarder = 'com.github.w2sv:AndroidOnboarder:0.0.2-rc3'
21+
onboarder = 'com.github.w2sv:AndroidOnboarder:0.0.3-rc2'
2222

2323
# androidx
2424
androidx-appcompat = 'androidx.appcompat:appcompat:1.6.1'

0 commit comments

Comments
 (0)