Skip to content
This repository was archived by the owner on Jul 20, 2026. It is now read-only.

Commit ae51a70

Browse files
TheRefractionTheRefraction
committed
Refactored stuff
1 parent 60175d1 commit ae51a70

7 files changed

Lines changed: 43 additions & 25 deletions

File tree

‎.idea/appInsightsSettings.xml‎

Lines changed: 26 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎app/src/main/AndroidManifest.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
1111

1212
<application
13-
android:name="fr.utbm.sy43.pilulito.PillulitoApplication"
13+
android:name="fr.utbm.sy43.pilulito.PilulitoApplication"
1414
android:allowBackup="true"
1515
android:dataExtractionRules="@xml/data_extraction_rules"
1616
android:fullBackupContent="@xml/backup_rules"

‎app/src/main/java/fr/utbm/sy43/pilulito/MainActivity.kt‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,6 @@ import androidx.navigation.compose.rememberNavController
1212
import fr.utbm.sy43.pilulito.ui.navigation.AppNavGraph
1313
import fr.utbm.sy43.pilulito.ui.theme.SenPosTheme
1414

15-
16-
//temp imports
17-
import androidx.lifecycle.lifecycleScope
18-
import fr.utbm.sy43.pilulito.data.models.IntakeStatus
19-
import fr.utbm.sy43.pilulito.data.models.MedicationIntake
20-
import kotlinx.coroutines.launch
21-
2215
class MainActivity : ComponentActivity() {
2316
override fun onCreate(savedInstanceState: Bundle?) {
2417
super.onCreate(savedInstanceState)

app/src/main/java/fr/utbm/sy43/pilulito/PillulitoApplication.kt renamed to app/src/main/java/fr/utbm/sy43/pilulito/PilulitoApplication.kt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,8 @@ import fr.utbm.sy43.pilulito.notifications.NotificationHelper
1111
import fr.utbm.sy43.pilulito.workers.OverdueCheckWorker
1212
import com.google.android.libraries.places.api.Places
1313
import java.util.concurrent.TimeUnit
14-
import fr.utbm.sy43.pilulito.R
1514

16-
class PillulitoApplication : Application() {
15+
class PilulitoApplication : Application() {
1716
lateinit var container: AppContainer
1817

1918
override fun onCreate() {

‎app/src/main/java/fr/utbm/sy43/pilulito/ui/AppViewModelProvider.kt‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider.AndroidViewModelFactory
44
import androidx.lifecycle.viewmodel.CreationExtras
55
import androidx.lifecycle.viewmodel.initializer
66
import androidx.lifecycle.viewmodel.viewModelFactory
7-
import fr.utbm.sy43.pilulito.PillulitoApplication
7+
import fr.utbm.sy43.pilulito.PilulitoApplication
88
import fr.utbm.sy43.pilulito.viewmodels.AccountInfoViewModel
99
import fr.utbm.sy43.pilulito.viewmodels.AddPosologyViewModel
1010
import fr.utbm.sy43.pilulito.viewmodels.AuthViewModel
@@ -17,34 +17,34 @@ object AppViewModelProvider {
1717
val Factory = viewModelFactory {
1818

1919
initializer {
20-
AccountInfoViewModel(pillulitoApplication().container.authRepository)
20+
AccountInfoViewModel(pilulitoApplication().container.authRepository)
2121
}
2222

2323
initializer {
24-
PharmacyViewModel(pillulitoApplication().container.pharmacyRepository)
24+
PharmacyViewModel(pilulitoApplication().container.pharmacyRepository)
2525
}
2626
initializer {
27-
AuthViewModel(pillulitoApplication().container.authRepository)
27+
AuthViewModel(pilulitoApplication().container.authRepository)
2828
}
2929
initializer {
30-
HomeViewModel(pillulitoApplication().container.medicationRepository)
30+
HomeViewModel(pilulitoApplication().container.medicationRepository)
3131
}
3232

3333
initializer {
34-
HistoryViewModel(pillulitoApplication().container.medicationRepository)
34+
HistoryViewModel(pilulitoApplication().container.medicationRepository)
3535
}
3636

3737
initializer {
3838
SupervisorViewModel(
39-
pillulitoApplication().container.authRepository,
40-
pillulitoApplication().container.medicationRepository
39+
pilulitoApplication().container.authRepository,
40+
pilulitoApplication().container.medicationRepository
4141
)
4242
}
4343

4444
initializer {
4545
val application =
4646
this[AndroidViewModelFactory.APPLICATION_KEY]
47-
as PillulitoApplication
47+
as PilulitoApplication
4848

4949
AddPosologyViewModel(
5050
application,
@@ -54,5 +54,5 @@ object AppViewModelProvider {
5454
}
5555
}
5656

57-
fun CreationExtras.pillulitoApplication(): PillulitoApplication =
58-
(this[AndroidViewModelFactory.APPLICATION_KEY] as PillulitoApplication)
57+
fun CreationExtras.pilulitoApplication(): PilulitoApplication =
58+
(this[AndroidViewModelFactory.APPLICATION_KEY] as PilulitoApplication)

‎app/src/main/java/fr/utbm/sy43/pilulito/viewmodels/AddPosologyViewModel.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import androidx.lifecycle.viewModelScope
77
import androidx.work.OneTimeWorkRequestBuilder
88
import androidx.work.WorkManager
99
import androidx.work.workDataOf
10-
import fr.utbm.sy43.pilulito.PillulitoApplication
10+
import fr.utbm.sy43.pilulito.PilulitoApplication
1111
import fr.utbm.sy43.pilulito.data.models.Drug
1212
import fr.utbm.sy43.pilulito.data.models.IntakeStatus
1313
import fr.utbm.sy43.pilulito.data.models.MedicationIntake
@@ -44,7 +44,7 @@ class AddPosologyViewModel(
4444
) : AndroidViewModel(application) {
4545

4646
private val _uiState = MutableStateFlow(AddPosologyUiState())
47-
private val context: Context get() = getApplication<PillulitoApplication>()
47+
private val context: Context get() = getApplication<PilulitoApplication>()
4848
val uiState: StateFlow<AddPosologyUiState> = _uiState.asStateFlow()
4949

5050
init {

‎app/src/main/java/fr/utbm/sy43/pilulito/workers/OverdueCheckWorker.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package fr.utbm.sy43.pilulito.workers
33
import android.content.Context
44
import androidx.work.CoroutineWorker
55
import androidx.work.WorkerParameters
6-
import fr.utbm.sy43.pilulito.PillulitoApplication
6+
import fr.utbm.sy43.pilulito.PilulitoApplication
77
import fr.utbm.sy43.pilulito.data.models.IntakeStatus
88
import fr.utbm.sy43.pilulito.notifications.NotificationHelper
99
import java.util.Calendar
@@ -14,7 +14,7 @@ class OverdueCheckWorker(
1414
) : CoroutineWorker(ctx, params) {
1515

1616
override suspend fun doWork(): Result {
17-
val repo = (applicationContext as PillulitoApplication)
17+
val repo = (applicationContext as PilulitoApplication)
1818
.container.medicationRepository
1919

2020
val now = System.currentTimeMillis()

0 commit comments

Comments
 (0)