Skip to content

Commit bf1ee4e

Browse files
ambrose40ambrose40
committed
MOPPAND-1661 Re-enable and unhide CDOC2 functionality.
1 parent dc36197 commit bf1ee4e

File tree

68 files changed

+546
-585
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

68 files changed

+546
-585
lines changed

‎app/src/main/kotlin/ee/ria/DigiDoc/RIADigiDocAppNavigation.kt‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ import androidx.compose.runtime.Composable
2828
import androidx.compose.runtime.collectAsState
2929
import androidx.compose.ui.Modifier
3030
import androidx.compose.ui.tooling.preview.Preview
31-
import androidx.hilt.navigation.compose.hiltViewModel
31+
import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
3232
import androidx.navigation.compose.NavHost
3333
import androidx.navigation.compose.composable
3434
import androidx.navigation.compose.rememberNavController
@@ -287,7 +287,6 @@ fun RIADigiDocAppScreen(externalFileUris: List<Uri>) {
287287
navController = navController,
288288
sharedMenuViewModel = sharedMenuViewModel,
289289
sharedSettingsViewModel = sharedSettingsViewModel,
290-
sharedCertificateViewModel = sharedCertificateViewModel,
291290
)
292291
}
293292
composable(route = Route.SettingsLanguageChooser.route) {

‎app/src/main/kotlin/ee/ria/DigiDoc/fragment/AccessibilityFragment.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ import androidx.compose.ui.platform.testTag
3333
import androidx.compose.ui.semantics.semantics
3434
import androidx.compose.ui.semantics.testTagsAsResourceId
3535
import androidx.compose.ui.tooling.preview.Preview
36-
import androidx.hilt.navigation.compose.hiltViewModel
36+
import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
3737
import androidx.navigation.NavHostController
3838
import androidx.navigation.compose.rememberNavController
3939
import ee.ria.DigiDoc.fragment.screen.AccessibilityScreen

‎app/src/main/kotlin/ee/ria/DigiDoc/fragment/AdvancedSettingsFragment.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ import androidx.compose.ui.platform.testTag
3333
import androidx.compose.ui.semantics.semantics
3434
import androidx.compose.ui.semantics.testTagsAsResourceId
3535
import androidx.compose.ui.tooling.preview.Preview
36-
import androidx.hilt.navigation.compose.hiltViewModel
36+
import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
3737
import androidx.navigation.NavHostController
3838
import androidx.navigation.compose.rememberNavController
3939
import ee.ria.DigiDoc.fragment.screen.AdvancedSettingsScreen

‎app/src/main/kotlin/ee/ria/DigiDoc/fragment/CryptoFileOpeningFragment.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ import androidx.compose.ui.platform.testTag
3333
import androidx.compose.ui.semantics.semantics
3434
import androidx.compose.ui.semantics.testTagsAsResourceId
3535
import androidx.compose.ui.tooling.preview.Preview
36-
import androidx.hilt.navigation.compose.hiltViewModel
36+
import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
3737
import androidx.navigation.NavHostController
3838
import androidx.navigation.compose.rememberNavController
3939
import ee.ria.DigiDoc.fragment.screen.CryptoFileOpeningScreen

‎app/src/main/kotlin/ee/ria/DigiDoc/fragment/DecryptFragment.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ import androidx.compose.ui.platform.testTag
3333
import androidx.compose.ui.semantics.semantics
3434
import androidx.compose.ui.semantics.testTagsAsResourceId
3535
import androidx.compose.ui.tooling.preview.Preview
36-
import androidx.hilt.navigation.compose.hiltViewModel
36+
import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
3737
import androidx.navigation.NavHostController
3838
import androidx.navigation.compose.rememberNavController
3939
import ee.ria.DigiDoc.fragment.screen.DecryptScreen

‎app/src/main/kotlin/ee/ria/DigiDoc/fragment/DecryptMethodChooserFragment.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ import androidx.compose.ui.platform.testTag
3333
import androidx.compose.ui.semantics.semantics
3434
import androidx.compose.ui.semantics.testTagsAsResourceId
3535
import androidx.compose.ui.tooling.preview.Preview
36-
import androidx.hilt.navigation.compose.hiltViewModel
36+
import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
3737
import androidx.navigation.NavHostController
3838
import androidx.navigation.compose.rememberNavController
3939
import ee.ria.DigiDoc.fragment.screen.DecryptMethodChooserScreen

‎app/src/main/kotlin/ee/ria/DigiDoc/fragment/DiagnosticsFragment.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ import androidx.compose.ui.platform.testTag
3333
import androidx.compose.ui.semantics.semantics
3434
import androidx.compose.ui.semantics.testTagsAsResourceId
3535
import androidx.compose.ui.tooling.preview.Preview
36-
import androidx.hilt.navigation.compose.hiltViewModel
36+
import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
3737
import androidx.navigation.NavHostController
3838
import androidx.navigation.compose.rememberNavController
3939
import ee.ria.DigiDoc.fragment.screen.DiagnosticsScreen

‎app/src/main/kotlin/ee/ria/DigiDoc/fragment/EncryptFragment.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ import androidx.compose.ui.platform.testTag
3333
import androidx.compose.ui.semantics.semantics
3434
import androidx.compose.ui.semantics.testTagsAsResourceId
3535
import androidx.compose.ui.tooling.preview.Preview
36-
import androidx.hilt.navigation.compose.hiltViewModel
36+
import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
3737
import androidx.navigation.NavHostController
3838
import androidx.navigation.compose.rememberNavController
3939
import ee.ria.DigiDoc.fragment.screen.EncryptScreen

‎app/src/main/kotlin/ee/ria/DigiDoc/fragment/EncryptRecipientFragment.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ import androidx.compose.ui.platform.testTag
3333
import androidx.compose.ui.semantics.semantics
3434
import androidx.compose.ui.semantics.testTagsAsResourceId
3535
import androidx.compose.ui.tooling.preview.Preview
36-
import androidx.hilt.navigation.compose.hiltViewModel
36+
import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
3737
import androidx.navigation.NavHostController
3838
import androidx.navigation.compose.rememberNavController
3939
import ee.ria.DigiDoc.fragment.screen.EncryptRecipientScreen

‎app/src/main/kotlin/ee/ria/DigiDoc/fragment/EncryptionServicesSettingsFragment.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ import androidx.compose.ui.platform.testTag
3333
import androidx.compose.ui.semantics.semantics
3434
import androidx.compose.ui.semantics.testTagsAsResourceId
3535
import androidx.compose.ui.tooling.preview.Preview
36-
import androidx.hilt.navigation.compose.hiltViewModel
36+
import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
3737
import androidx.navigation.NavHostController
3838
import androidx.navigation.compose.rememberNavController
3939
import ee.ria.DigiDoc.fragment.screen.EncryptionServicesSettingsScreen

0 commit comments

Comments
 (0)