Skip to content

Commit 4074a21

Browse files
update: should be able to build
1 parent 1ae6378 commit 4074a21

6 files changed

Lines changed: 18 additions & 6 deletions

File tree

app/src/main/java/com/example/sw0b_001/MainActivity.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ class MainActivity : AppCompatActivity() {
140140

141141
var loggedInAlready by mutableStateOf(false)
142142

143-
val vaultViewModel: VaultsViewModel by viewModels()
143+
lateinit var vaultViewModel: VaultsViewModel
144144

145145
override fun onCreate(savedInstanceState: Bundle?) {
146146
super.onCreate(savedInstanceState)
@@ -151,6 +151,7 @@ class MainActivity : AppCompatActivity() {
151151
window.isNavigationBarContrastEnforced = false
152152
}
153153

154+
vaultViewModel = VaultsViewModel(applicationContext)
154155
searchViewModel = SearchViewModel(getDatabase().threadsDao()!!)
155156

156157
fun beginAppLifecycle() {

app/src/main/java/com/example/sw0b_001/ui/viewModels/VaultsViewModel.kt

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package com.example.sw0b_001.ui.viewModels
22

33
import android.app.Activity
4+
import android.content.Context
45
import android.graphics.Bitmap
56
import android.graphics.BitmapFactory
67
import android.hardware.camera2.CaptureRequest
@@ -11,6 +12,7 @@ import androidx.compose.runtime.remember
1112
import androidx.compose.runtime.setValue
1213
import androidx.lifecycle.ViewModel
1314
import androidx.lifecycle.viewModelScope
15+
import com.example.sw0b_001.R
1416
import com.example.sw0b_001.data.GatewayClientsCommunications.json
1517
import com.example.sw0b_001.data.Network
1618
import com.google.android.gms.safetynet.SafetyNet
@@ -28,10 +30,14 @@ import java.util.concurrent.Executor
2830
import java.util.concurrent.Executors
2931

3032

31-
class VaultsViewModel : ViewModel() {
33+
class VaultsViewModel(val context: Context) : ViewModel() {
3234

3335
val captchaUrl = "https://captcha.smswithoutborders.com"
34-
val clientId = com.example.sw0b_001.BuildConfig.RECAPTCHA_KEY
36+
lateinit var clientId: String
37+
38+
init {
39+
clientId = context.getString(R.string.recaptcha_key)
40+
}
3541

3642
private val _captchaImage = MutableStateFlow<Bitmap?>(null)
3743
val captchaImage: StateFlow<Bitmap?> = _captchaImage.asStateFlow()

app/src/main/java/com/example/sw0b_001/ui/views/CreateAccountView.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -498,10 +498,11 @@ private fun createAccount(
498498
@Preview(showBackground = true)
499499
@Composable
500500
fun CreateAccountPreview() {
501+
val context = LocalContext.current
501502
AppTheme(darkTheme = false) {
502503
CreateAccountView(
503504
rememberNavController(),
504-
remember { VaultsViewModel() }
505+
remember { VaultsViewModel(context) }
505506
)
506507
}
507508
}

app/src/main/java/com/example/sw0b_001/ui/views/ForgotPasswordView.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -405,8 +405,9 @@ private fun recoverPassword(
405405
@Preview(showBackground = true)
406406
@Composable
407407
fun ForgotPasswordPreview() {
408+
val context = LocalContext.current
408409
AppTheme(darkTheme = false) {
409410
ForgotPasswordView(rememberNavController(),
410-
remember{ VaultsViewModel()})
411+
remember{ VaultsViewModel(context)})
411412
}
412413
}

app/src/main/java/com/example/sw0b_001/ui/views/LoginView.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -453,9 +453,10 @@ private fun login(
453453
@Preview(showBackground = true)
454454
@Composable
455455
fun LoginViewPreview() {
456+
val context = LocalContext.current
456457
AppTheme(darkTheme = false) {
457458
LoginView(rememberNavController(),
458-
remember{ VaultsViewModel() })
459+
remember{ VaultsViewModel(context) })
459460

460461
}
461462
}

app/src/main/res/values/strings.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44
<string name="select_all">Select All</string>
55
<string name="selected_messages">%d selected</string>
66

7+
<string name="recaptcha_key" translatable="false">dc4def40b6961289f969a236bb2bc433e32b29e0af06458fea56f7f2daad9eac</string>
8+
79
<!-- Homepage menu -->
810

911
<string name="settings_settings">Settings</string>

0 commit comments

Comments
 (0)