Skip to content

Commit 1e6586f

Browse files
committed
Minor alteration
1 parent 4e3b5e3 commit 1e6586f

File tree

8 files changed

+13
-14
lines changed

8 files changed

+13
-14
lines changed

app/src/main/java/com/autocrop/activities/examination/ExaminationActivity.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ import com.autocrop.activities.examination.fragments.viewpager.ViewPagerFragment
1414
import com.autocrop.activities.main.MainActivity
1515
import com.autocrop.global.CropFileSaveDestinationPreferences
1616
import com.autocrop.uicontroller.activity.ApplicationActivity
17-
import com.autocrop.utilsandroid.*
1817
import com.autocrop.utils.numericallyInflected
18+
import com.autocrop.utilsandroid.*
1919
import com.w2sv.autocrop.R
2020

2121
class ExaminationActivity :

app/src/main/java/com/autocrop/activities/examination/ImageFileIO.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@ import android.os.Build
77
import android.provider.MediaStore
88
import androidx.annotation.RequiresApi
99
import com.autocrop.collections.CropBundle
10+
import com.autocrop.utils.logBeforehand
1011
import com.autocrop.utilsandroid.deleteImageMediaFile
1112
import com.autocrop.utilsandroid.fileName
1213
import com.autocrop.utilsandroid.queryImageFileMediaColumn
1314
import com.autocrop.utilsandroid.saveBitmap
14-
import com.autocrop.utils.logBeforehand
1515
import timber.log.Timber
1616

1717
/**

app/src/main/java/com/autocrop/activities/examination/fragments/viewpager/ImmersiveViewOnTouchListener.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ import android.annotation.SuppressLint
44
import android.graphics.Point
55
import android.view.MotionEvent
66
import android.view.View
7-
import com.autocrop.utilsandroid.manhattanNorm
87
import com.autocrop.utils.logAfterwards
8+
import com.autocrop.utilsandroid.manhattanNorm
99

1010
/**
1111
* Enables distinction between pulling up navigation bar and clicks

app/src/main/java/com/autocrop/activities/examination/fragments/viewpager/PageChangeHandler.kt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@ package com.autocrop.activities.examination.fragments.viewpager
22

33
import androidx.viewpager.widget.ViewPager
44
import androidx.viewpager2.widget.ViewPager2
5-
import com.autocrop.utils.BlankFun
6-
import kotlin.properties.Delegates
75

86
class PageChangeHandler(private val viewModel: ViewPagerViewModel)
97
: ViewPager2.OnPageChangeCallback(){

app/src/main/java/com/autocrop/activities/examination/fragments/viewpager/ViewPagerViewModel.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ import com.autocrop.collections.CropBundle
88
import com.autocrop.global.BooleanUserPreferences
99
import com.autocrop.utils.BlankFun
1010
import com.autocrop.utils.Consumable
11-
import com.autocrop.utilsandroid.mutableLiveData
1211
import com.autocrop.utils.rotated
12+
import com.autocrop.utilsandroid.mutableLiveData
1313
import java.util.*
1414

1515
class ViewPagerViewModel:

app/src/main/java/com/autocrop/activities/main/MainActivity.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ import com.autocrop.activities.main.fragments.about.AboutFragment
99
import com.autocrop.activities.main.fragments.flowfield.FlowFieldFragment
1010
import com.autocrop.global.userPreferencesInstances
1111
import com.autocrop.uicontroller.activity.ApplicationActivity
12-
import com.autocrop.utilsandroid.*
1312
import com.autocrop.utils.numericallyInflected
13+
import com.autocrop.utilsandroid.*
1414
import com.w2sv.autocrop.R
1515

1616
class MainActivity :

app/src/main/java/com/autocrop/global/UserPreferences.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ package com.autocrop.global
22

33
import android.content.SharedPreferences
44
import android.net.Uri
5-
import com.autocrop.utilsandroid.buildDocumentUriFromTreeUri
65
import com.autocrop.utils.logBeforehand
6+
import com.autocrop.utilsandroid.buildDocumentUriFromTreeUri
77
import timber.log.Timber
88
import java.util.*
99

app/src/main/java/com/autocrop/uicontroller/fragment/ApplicationFragment.kt

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ package com.autocrop.uicontroller.fragment
33
import android.app.Activity
44
import android.os.Bundle
55
import android.view.View
6+
import androidx.fragment.app.Fragment
67
import androidx.lifecycle.ViewModel
78
import androidx.lifecycle.ViewModelProvider
89
import androidx.viewbinding.ViewBinding
@@ -20,12 +21,6 @@ abstract class ApplicationFragment<A: Activity, VB: ViewBinding, VM: ViewModel>(
2021
onViewCreatedCore(savedInstanceState)
2122
}
2223

23-
private inline fun withPostponedEnterTransition(f: BlankFun){
24-
postponeEnterTransition()
25-
f()
26-
startPostponedEnterTransition()
27-
}
28-
2924
open fun onViewCreatedCore(savedInstanceState: Bundle?){}
3025

3126
/**
@@ -39,4 +34,10 @@ abstract class ApplicationFragment<A: Activity, VB: ViewBinding, VM: ViewModel>(
3934
override val sharedViewModel: VM by lazy {
4035
ViewModelProvider(requireActivity())[viewModelClass]
4136
}
37+
}
38+
39+
private inline fun Fragment.withPostponedEnterTransition(f: BlankFun){
40+
postponeEnterTransition()
41+
f()
42+
startPostponedEnterTransition()
4243
}

0 commit comments

Comments
 (0)