diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index 056a5f56..abcdbd36 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -1,6 +1,6 @@ # Scope -_Please make sure to read https://github.com/droidconKE/droidconKE2022Android/docs/CONTRIBUTING.md +_Please make sure to read the [Contribution Guidelines](https://github.com/droidconKE/droidconKE2023Android/blob/main/CONTRIBUTING.md) and check that you understand and have followed it as best as possible Explain what your feature does in a short paragraph._ please check the below boxes - [ ] I have followed the coding conventions diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index f78a7635..8b2ea9f9 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -92,7 +92,7 @@ class YOUR_TEST_FILE_NAME { fun `YOUR TEST NAME HERE`() { composeTestRule.setContent { - DroidconKE2022Theme { + DroidconKE2023Theme { YOUR_COMPOSABLE_HERE() } } diff --git a/api_key.txt b/api_key.txt new file mode 100644 index 00000000..ae9d7b23 --- /dev/null +++ b/api_key.txt @@ -0,0 +1 @@ +droidconKe-2020 \ No newline at end of file diff --git a/presentation/src/main/java/com/android254/presentation/about/view/AboutScreen.kt b/presentation/src/main/java/com/android254/presentation/about/view/AboutScreen.kt index c17cac15..a77d4954 100644 --- a/presentation/src/main/java/com/android254/presentation/about/view/AboutScreen.kt +++ b/presentation/src/main/java/com/android254/presentation/about/view/AboutScreen.kt @@ -46,7 +46,7 @@ import coil.request.ImageRequest import com.android254.droidconKE2023.presentation.R import com.android254.presentation.common.components.DroidconAppBarWithFeedbackButton import com.android254.presentation.common.components.OrganizedBySection -import com.android254.presentation.common.theme.DroidconKE2022Theme +import com.android254.presentation.common.theme.DroidconKE2023Theme import com.android254.presentation.models.OrganizingTeamMember import com.droidconke.chai.atoms.ChaiBlue import com.droidconke.chai.atoms.ChaiCoal @@ -214,7 +214,7 @@ fun OrganizingTeamSection( @Preview @Composable fun AboutScreenPreview() { - DroidconKE2022Theme { + DroidconKE2023Theme { AboutScreen() } } \ No newline at end of file diff --git a/presentation/src/main/java/com/android254/presentation/about/view/OrganizingTeamComponent.kt b/presentation/src/main/java/com/android254/presentation/about/view/OrganizingTeamComponent.kt index 1c8bd779..40318d96 100644 --- a/presentation/src/main/java/com/android254/presentation/about/view/OrganizingTeamComponent.kt +++ b/presentation/src/main/java/com/android254/presentation/about/view/OrganizingTeamComponent.kt @@ -40,7 +40,7 @@ import androidx.compose.ui.unit.sp import coil.compose.AsyncImage import coil.request.ImageRequest import com.android254.droidconKE2023.presentation.R -import com.android254.presentation.common.theme.DroidconKE2022Theme +import com.android254.presentation.common.theme.DroidconKE2023Theme import com.android254.presentation.models.OrganizingTeamMember import com.droidconke.chai.atoms.ChaiDarkerGrey import com.droidconke.chai.atoms.ChaiSmokeyGrey @@ -104,7 +104,7 @@ fun OrganizingTeamComponent( @Preview @Composable fun Preview() { - DroidconKE2022Theme { + DroidconKE2023Theme { OrganizingTeamComponent( modifier = Modifier, teamMember = OrganizingTeamMember( diff --git a/presentation/src/main/java/com/android254/presentation/activity/MainActivity.kt b/presentation/src/main/java/com/android254/presentation/activity/MainActivity.kt index 0d4b2031..52919f95 100644 --- a/presentation/src/main/java/com/android254/presentation/activity/MainActivity.kt +++ b/presentation/src/main/java/com/android254/presentation/activity/MainActivity.kt @@ -35,7 +35,7 @@ import com.android254.presentation.auth.AuthViewModel import com.android254.presentation.auth.view.AuthDialog import com.android254.presentation.common.bottomnav.BottomNavigationBar import com.android254.presentation.common.navigation.Navigation -import com.android254.presentation.common.theme.DroidconKE2022Theme +import com.android254.presentation.common.theme.DroidconKE2023Theme import dagger.hilt.android.AndroidEntryPoint @AndroidEntryPoint @@ -46,7 +46,7 @@ class MainActivity : ComponentActivity() { super.onCreate(savedInstanceState) installSplashScreen() setContent { - DroidconKE2022Theme { + DroidconKE2023Theme { MainScreen() } } diff --git a/presentation/src/main/java/com/android254/presentation/auth/view/AuthDialog.kt b/presentation/src/main/java/com/android254/presentation/auth/view/AuthDialog.kt index dde13b64..c44d4acf 100644 --- a/presentation/src/main/java/com/android254/presentation/auth/view/AuthDialog.kt +++ b/presentation/src/main/java/com/android254/presentation/auth/view/AuthDialog.kt @@ -43,7 +43,7 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import com.android254.presentation.auth.AuthViewModel -import com.android254.presentation.common.theme.DroidconKE2022Theme +import com.android254.presentation.common.theme.DroidconKE2023Theme import kotlinx.coroutines.launch @Composable @@ -108,7 +108,7 @@ fun AuthDialog( @Preview @Composable fun AuthDialogPreview() { - DroidconKE2022Theme() { + DroidconKE2023Theme() { AuthDialog() } } \ No newline at end of file diff --git a/presentation/src/main/java/com/android254/presentation/common/bottomnav/BottomNavigationBar.kt b/presentation/src/main/java/com/android254/presentation/common/bottomnav/BottomNavigationBar.kt index 50df4c74..aa848336 100644 --- a/presentation/src/main/java/com/android254/presentation/common/bottomnav/BottomNavigationBar.kt +++ b/presentation/src/main/java/com/android254/presentation/common/bottomnav/BottomNavigationBar.kt @@ -24,7 +24,7 @@ import androidx.navigation.compose.currentBackStackEntryAsState import androidx.navigation.compose.rememberNavController import com.android254.presentation.common.navigation.Screens import com.android254.presentation.common.navigation.bottomNavigationDestinations -import com.android254.presentation.common.theme.DroidconKE2022Theme +import com.android254.presentation.common.theme.DroidconKE2023Theme import com.android254.presentation.common.theme.bottomBlack import com.android254.presentation.common.theme.bottomOrange import com.android254.presentation.common.theme.bottomPurple @@ -71,7 +71,7 @@ fun BottomNavigationBar(navController: NavHostController) { @Preview @Composable fun BottomNavigationBarPreview() { - DroidconKE2022Theme { + DroidconKE2023Theme { BottomNavigationBar(rememberNavController()) } } \ No newline at end of file diff --git a/presentation/src/main/java/com/android254/presentation/common/components/DroidconAppBar.kt b/presentation/src/main/java/com/android254/presentation/common/components/DroidconAppBar.kt index 7891f52d..011e8dc7 100644 --- a/presentation/src/main/java/com/android254/presentation/common/components/DroidconAppBar.kt +++ b/presentation/src/main/java/com/android254/presentation/common/components/DroidconAppBar.kt @@ -30,7 +30,7 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import com.android254.droidconKE2023.presentation.R -import com.android254.presentation.common.theme.DroidconKE2022Theme +import com.android254.presentation.common.theme.DroidconKE2023Theme @Composable fun DroidconAppBar( @@ -71,7 +71,7 @@ fun DroidconAppBar( @Preview @Composable fun DroidconAppBarPreview() { - DroidconKE2022Theme { + DroidconKE2023Theme { DroidconAppBar() } } \ No newline at end of file diff --git a/presentation/src/main/java/com/android254/presentation/common/components/DroidconAppBarWithFeedbackButton.kt b/presentation/src/main/java/com/android254/presentation/common/components/DroidconAppBarWithFeedbackButton.kt index 3ce97eac..d8cdbd8b 100644 --- a/presentation/src/main/java/com/android254/presentation/common/components/DroidconAppBarWithFeedbackButton.kt +++ b/presentation/src/main/java/com/android254/presentation/common/components/DroidconAppBarWithFeedbackButton.kt @@ -39,7 +39,7 @@ import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import coil.compose.AsyncImage import coil.request.ImageRequest -import com.android254.presentation.common.theme.DroidconKE2022Theme +import com.android254.presentation.common.theme.DroidconKE2023Theme import com.droidconke.chai.atoms.ChaiCoal import com.droidconke.chai.atoms.ChaiTeal import com.droidconke.chai.atoms.MontserratRegular @@ -125,7 +125,7 @@ fun FeedbackButton( @Preview @Composable fun Preview() { - DroidconKE2022Theme { + DroidconKE2023Theme { DroidconAppBarWithFeedbackButton( onButtonClick = {}, userProfile = "https://media-exp1.licdn.com/dms/image/C4D03AQGn58utIO-x3w/profile-displayphoto-shrink_200_200/0/1637478114039?e=2147483647&v=beta&t=3kIon0YJQNHZojD3Dt5HVODJqHsKdf2YKP1SfWeROnI" diff --git a/presentation/src/main/java/com/android254/presentation/common/components/DroidconAppBarWithFilter.kt b/presentation/src/main/java/com/android254/presentation/common/components/DroidconAppBarWithFilter.kt index 08496f35..93afee76 100644 --- a/presentation/src/main/java/com/android254/presentation/common/components/DroidconAppBarWithFilter.kt +++ b/presentation/src/main/java/com/android254/presentation/common/components/DroidconAppBarWithFilter.kt @@ -32,7 +32,7 @@ import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import com.android254.droidconKE2023.presentation.R -import com.android254.presentation.common.theme.DroidconKE2022Theme +import com.android254.presentation.common.theme.DroidconKE2023Theme import com.droidconke.chai.atoms.* import com.droidconke.chai.atoms.MontserratRegular @@ -157,7 +157,7 @@ fun FilterButton( @Preview @Composable fun ToolbarPreview() { - DroidconKE2022Theme { + DroidconKE2023Theme { Column() { DroidconAppBarWithFilter( diff --git a/presentation/src/main/java/com/android254/presentation/common/theme/Theme.kt b/presentation/src/main/java/com/android254/presentation/common/theme/Theme.kt index 07057901..f995fd3d 100644 --- a/presentation/src/main/java/com/android254/presentation/common/theme/Theme.kt +++ b/presentation/src/main/java/com/android254/presentation/common/theme/Theme.kt @@ -92,7 +92,7 @@ private val DarkColors = darkColorScheme( surfaceTint = md_theme_dark_surfaceTint, ) @Composable -fun DroidconKE2022Theme( +fun DroidconKE2023Theme( darkTheme: Boolean = isSystemInDarkTheme(), dynamicColor: Boolean = true, content: @Composable () -> Unit diff --git a/presentation/src/main/java/com/android254/presentation/feed/view/FeedComponent.kt b/presentation/src/main/java/com/android254/presentation/feed/view/FeedComponent.kt index 77d19487..aee64576 100644 --- a/presentation/src/main/java/com/android254/presentation/feed/view/FeedComponent.kt +++ b/presentation/src/main/java/com/android254/presentation/feed/view/FeedComponent.kt @@ -46,7 +46,7 @@ import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import com.android254.droidconKE2023.presentation.R -import com.android254.presentation.common.theme.DroidconKE2022Theme +import com.android254.presentation.common.theme.DroidconKE2023Theme import com.droidconke.chai.atoms.ChaiBlue import com.droidconke.chai.atoms.ChaiLightGrey import com.droidconke.chai.atoms.ChaiSmokeyGrey @@ -137,7 +137,7 @@ fun FeedComponent(modifier: Modifier, onClickItem: (Int) -> Unit) { @Preview @Composable fun Preview() { - DroidconKE2022Theme { + DroidconKE2023Theme { FeedComponent(modifier = Modifier) { } } diff --git a/presentation/src/main/java/com/android254/presentation/feed/view/FeedScreen.kt b/presentation/src/main/java/com/android254/presentation/feed/view/FeedScreen.kt index f50a37b5..f1a14a92 100644 --- a/presentation/src/main/java/com/android254/presentation/feed/view/FeedScreen.kt +++ b/presentation/src/main/java/com/android254/presentation/feed/view/FeedScreen.kt @@ -28,7 +28,7 @@ import androidx.compose.ui.platform.testTag import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import com.android254.presentation.common.components.DroidconAppBarWithFeedbackButton -import com.android254.presentation.common.theme.DroidconKE2022Theme +import com.android254.presentation.common.theme.DroidconKE2023Theme import kotlinx.coroutines.launch @Composable @@ -92,7 +92,7 @@ fun FeedScreen( @Preview(uiMode = Configuration.UI_MODE_NIGHT_YES, showBackground = true) @Composable fun FeedScreenPreview() { - DroidconKE2022Theme { + DroidconKE2023Theme { Surface(modifier = Modifier.background(MaterialTheme.colorScheme.surface)) { FeedScreen() } diff --git a/presentation/src/main/java/com/android254/presentation/feed/view/FeedShareSection.kt b/presentation/src/main/java/com/android254/presentation/feed/view/FeedShareSection.kt index 4c3ea5ff..a77dd63c 100644 --- a/presentation/src/main/java/com/android254/presentation/feed/view/FeedShareSection.kt +++ b/presentation/src/main/java/com/android254/presentation/feed/view/FeedShareSection.kt @@ -42,7 +42,7 @@ import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import com.android254.droidconKE2023.presentation.R -import com.android254.presentation.common.theme.DroidconKE2022Theme +import com.android254.presentation.common.theme.DroidconKE2023Theme import com.droidconke.chai.atoms.ChaiSmokeyGrey import com.droidconke.chai.atoms.ChaiTeal import com.droidconke.chai.atoms.MontserratBold @@ -141,7 +141,7 @@ fun PlatformButton(platform: String, icon: Int) { @Preview(showBackground = true) @Composable fun PlatformButtonPreview() { - DroidconKE2022Theme { + DroidconKE2023Theme { PlatformButton("Twitter", R.drawable.ic_whatsapp) } } @@ -149,7 +149,7 @@ fun PlatformButtonPreview() { @Preview(showBackground = true) @Composable fun PFeedShareSectionPreview() { - DroidconKE2022Theme { + DroidconKE2023Theme { FeedShareSection() } } \ No newline at end of file diff --git a/presentation/src/main/java/com/android254/presentation/feedback/view/FeedBackScreen.kt b/presentation/src/main/java/com/android254/presentation/feedback/view/FeedBackScreen.kt index 8e648bfb..0c70ad45 100644 --- a/presentation/src/main/java/com/android254/presentation/feedback/view/FeedBackScreen.kt +++ b/presentation/src/main/java/com/android254/presentation/feedback/view/FeedBackScreen.kt @@ -47,7 +47,7 @@ import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import com.android254.droidconKE2023.presentation.R -import com.android254.presentation.common.theme.DroidconKE2022Theme +import com.android254.presentation.common.theme.DroidconKE2023Theme import com.android254.presentation.common.theme.Montserrat @Composable @@ -258,7 +258,7 @@ fun FeedbackTitle() { @Preview @Composable fun FeedBackScreenPreview() { - DroidconKE2022Theme { + DroidconKE2023Theme { FeedBackScreen() } } \ No newline at end of file diff --git a/presentation/src/main/java/com/android254/presentation/home/components/HomeBannerSection.kt b/presentation/src/main/java/com/android254/presentation/home/components/HomeBannerSection.kt index 8a1624c8..28b8cced 100644 --- a/presentation/src/main/java/com/android254/presentation/home/components/HomeBannerSection.kt +++ b/presentation/src/main/java/com/android254/presentation/home/components/HomeBannerSection.kt @@ -35,7 +35,7 @@ import androidx.compose.ui.tooling.preview.Preview import com.android254.droidconKE2023.presentation.R import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp -import com.android254.presentation.common.theme.DroidconKE2022Theme +import com.android254.presentation.common.theme.DroidconKE2023Theme import com.android254.presentation.home.viewstate.HomeViewState import com.droidconke.chai.atoms.ChaiBlack import com.droidconke.chai.atoms.ChaiTeal @@ -118,7 +118,7 @@ fun HomeCallForSpeakersLink() { @Preview @Composable fun HomeBannerSectionPreview() { - DroidconKE2022Theme { + DroidconKE2023Theme { HomeBannerSection(HomeViewState()) } } @@ -126,7 +126,7 @@ fun HomeBannerSectionPreview() { @Preview @Composable fun HomeEventBannerPreview() { - DroidconKE2022Theme { + DroidconKE2023Theme { HomeEventPoster() } } @@ -134,7 +134,7 @@ fun HomeEventBannerPreview() { @Preview @Composable fun HomeCallForSpeakersLinkPreview() { - DroidconKE2022Theme { + DroidconKE2023Theme { HomeCallForSpeakersLink() } } \ No newline at end of file diff --git a/presentation/src/main/java/com/android254/presentation/home/components/HomeSpeakerComponent.kt b/presentation/src/main/java/com/android254/presentation/home/components/HomeSpeakerComponent.kt index dc773e2b..6d2d2240 100644 --- a/presentation/src/main/java/com/android254/presentation/home/components/HomeSpeakerComponent.kt +++ b/presentation/src/main/java/com/android254/presentation/home/components/HomeSpeakerComponent.kt @@ -42,7 +42,7 @@ import androidx.constraintlayout.compose.ConstraintLayout import coil.compose.AsyncImage import coil.request.ImageRequest import com.android254.droidconKE2023.presentation.R -import com.android254.presentation.common.theme.DroidconKE2022Theme +import com.android254.presentation.common.theme.DroidconKE2023Theme import com.android254.presentation.models.SpeakerUI import com.droidconke.chai.atoms.MontserratMedium @@ -97,7 +97,7 @@ fun HomeSpeakerComponent(speaker: SpeakerUI, onClick: () -> Unit = {}) { @Preview @Composable fun HomeSpeakerComponentPreview() { - DroidconKE2022Theme { + DroidconKE2023Theme { Surface(color = Color.White) { HomeSpeakerComponent(speaker = SpeakerUI(name = "Harun Wangereka", bio = "Staff Engineer")) } diff --git a/presentation/src/main/java/com/android254/presentation/home/screen/HomeScreen.kt b/presentation/src/main/java/com/android254/presentation/home/screen/HomeScreen.kt index 55a4433a..406aac1d 100644 --- a/presentation/src/main/java/com/android254/presentation/home/screen/HomeScreen.kt +++ b/presentation/src/main/java/com/android254/presentation/home/screen/HomeScreen.kt @@ -36,7 +36,7 @@ import com.android254.droidconKE2023.presentation.R import com.android254.presentation.common.components.DroidconAppBar import com.android254.presentation.common.components.DroidconAppBarWithFeedbackButton import com.android254.presentation.common.components.SponsorsCard -import com.android254.presentation.common.theme.DroidconKE2022Theme +import com.android254.presentation.common.theme.DroidconKE2023Theme import com.android254.presentation.home.components.HomeBannerSection import com.android254.presentation.home.components.HomeSessionSection import com.android254.presentation.home.components.HomeSpacer @@ -133,7 +133,7 @@ fun HomeToolbar( @Preview @Composable fun HomeScreenPreview() { - DroidconKE2022Theme { + DroidconKE2023Theme { HomeScreen() } } \ No newline at end of file diff --git a/presentation/src/main/java/com/android254/presentation/sessionDetails/view/SessionDetailsScreen.kt b/presentation/src/main/java/com/android254/presentation/sessionDetails/view/SessionDetailsScreen.kt index 2eef1fb8..7717b4fb 100644 --- a/presentation/src/main/java/com/android254/presentation/sessionDetails/view/SessionDetailsScreen.kt +++ b/presentation/src/main/java/com/android254/presentation/sessionDetails/view/SessionDetailsScreen.kt @@ -48,7 +48,7 @@ import androidx.hilt.navigation.compose.hiltViewModel import androidx.lifecycle.compose.collectAsStateWithLifecycle import coil.compose.AsyncImage import com.android254.droidconKE2023.presentation.R -import com.android254.presentation.common.theme.DroidconKE2022Theme +import com.android254.presentation.common.theme.DroidconKE2023Theme import com.android254.presentation.common.theme.Montserrat import com.android254.presentation.models.SessionDetailsPresentationModel import com.android254.presentation.sessionDetails.SessionDetailsViewModel @@ -446,7 +446,7 @@ object TestTag { @Preview @Composable fun SessionDetailsScreenPreview() { - DroidconKE2022Theme(darkTheme = false) { + DroidconKE2023Theme(darkTheme = false) { SessionDetailsScreen( onNavigationIconClick = {}, sessionId = "1", @@ -458,7 +458,7 @@ fun SessionDetailsScreenPreview() { @Preview @Composable fun SessionDetailsScreenDarkThemePreview() { - DroidconKE2022Theme(darkTheme = true) { + DroidconKE2023Theme(darkTheme = true) { SessionDetailsScreen( onNavigationIconClick = {}, sessionId = "1", diff --git a/presentation/src/main/java/com/android254/presentation/sessions/view/SessionsScreen.kt b/presentation/src/main/java/com/android254/presentation/sessions/view/SessionsScreen.kt index 80d77663..7d12ef11 100644 --- a/presentation/src/main/java/com/android254/presentation/sessions/view/SessionsScreen.kt +++ b/presentation/src/main/java/com/android254/presentation/sessions/view/SessionsScreen.kt @@ -44,7 +44,7 @@ import androidx.hilt.navigation.compose.hiltViewModel import androidx.navigation.NavHostController import androidx.navigation.compose.rememberNavController import com.android254.presentation.common.components.* -import com.android254.presentation.common.theme.DroidconKE2022Theme +import com.android254.presentation.common.theme.DroidconKE2023Theme import com.android254.presentation.sessions.components.EventDaySelector import com.android254.presentation.sessions.components.SessionList import com.android254.presentation.sessions.components.SessionsFilterPanel @@ -157,7 +157,7 @@ fun SessionsScreen( @Preview @Composable fun SessionsScreenPreview() { - DroidconKE2022Theme { + DroidconKE2023Theme { SessionsScreen(navController = rememberNavController()) } } diff --git a/presentation/src/main/java/com/android254/presentation/speakers/view/SpeakerComponent.kt b/presentation/src/main/java/com/android254/presentation/speakers/view/SpeakerComponent.kt index 7843478d..01f601f3 100644 --- a/presentation/src/main/java/com/android254/presentation/speakers/view/SpeakerComponent.kt +++ b/presentation/src/main/java/com/android254/presentation/speakers/view/SpeakerComponent.kt @@ -47,7 +47,7 @@ import androidx.constraintlayout.compose.ConstraintLayout import coil.compose.AsyncImage import coil.request.ImageRequest import com.android254.droidconKE2023.presentation.R -import com.android254.presentation.common.theme.DroidconKE2022Theme +import com.android254.presentation.common.theme.DroidconKE2023Theme import com.android254.presentation.models.SpeakerUI @Composable @@ -155,7 +155,7 @@ fun SpeakerComponent( @Preview @Composable fun SpeakerComponentPreview() { - DroidconKE2022Theme { + DroidconKE2023Theme { SpeakerComponent( speaker = SpeakerUI( imageUrl = "https://sessionize.com/image/09c1-400o400o2-cf-9587-423b-bd2e-415e6757286c.b33d8d6e-1f94-4765-a797-255efc34390d.jpg", diff --git a/presentation/src/main/java/com/android254/presentation/speakers/view/SpeakerDetailsScreen.kt b/presentation/src/main/java/com/android254/presentation/speakers/view/SpeakerDetailsScreen.kt index 3e02c368..327582ec 100644 --- a/presentation/src/main/java/com/android254/presentation/speakers/view/SpeakerDetailsScreen.kt +++ b/presentation/src/main/java/com/android254/presentation/speakers/view/SpeakerDetailsScreen.kt @@ -56,7 +56,7 @@ import androidx.hilt.navigation.compose.hiltViewModel import coil.compose.AsyncImage import coil.request.ImageRequest import com.android254.droidconKE2023.presentation.R -import com.android254.presentation.common.theme.DroidconKE2022Theme +import com.android254.presentation.common.theme.DroidconKE2023Theme import com.android254.presentation.models.SpeakerUI import com.android254.presentation.speakers.SpeakersViewModel import com.droidconke.chai.atoms.ChaiBlue @@ -243,7 +243,7 @@ fun SpeakerDetailsScreen( @Preview @Composable fun SpeakerDetailsScreenPreview() { - DroidconKE2022Theme { + DroidconKE2023Theme { SpeakerDetailsScreen( id = 0 ) diff --git a/presentation/src/main/java/com/android254/presentation/speakers/view/SpeakersScreen.kt b/presentation/src/main/java/com/android254/presentation/speakers/view/SpeakersScreen.kt index 67e77ec7..928952fe 100644 --- a/presentation/src/main/java/com/android254/presentation/speakers/view/SpeakersScreen.kt +++ b/presentation/src/main/java/com/android254/presentation/speakers/view/SpeakersScreen.kt @@ -43,7 +43,7 @@ import androidx.compose.ui.unit.sp import androidx.hilt.navigation.compose.hiltViewModel import androidx.lifecycle.compose.collectAsStateWithLifecycle import com.android254.droidconKE2023.presentation.R -import com.android254.presentation.common.theme.DroidconKE2022Theme +import com.android254.presentation.common.theme.DroidconKE2023Theme import com.android254.presentation.models.SpeakerUI import com.android254.presentation.speakers.SpeakersViewModel import com.google.accompanist.swiperefresh.SwipeRefresh @@ -120,7 +120,7 @@ fun SpeakersScreen( @Preview @Composable fun SpeakersScreenPreview() { - DroidconKE2022Theme { + DroidconKE2023Theme { SpeakersScreen() } } \ No newline at end of file diff --git a/presentation/src/main/java/com/android254/presentation/speakers/view/TopAppBar.kt b/presentation/src/main/java/com/android254/presentation/speakers/view/TopAppBar.kt index ef3b7449..24c66729 100644 --- a/presentation/src/main/java/com/android254/presentation/speakers/view/TopAppBar.kt +++ b/presentation/src/main/java/com/android254/presentation/speakers/view/TopAppBar.kt @@ -31,7 +31,7 @@ import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import com.android254.droidconKE2023.presentation.R -import com.android254.presentation.common.theme.DroidconKE2022Theme +import com.android254.presentation.common.theme.DroidconKE2023Theme @Composable fun TopAppBar(modifier: Modifier = Modifier, onBackPressed: () -> Unit = {}) { @@ -73,7 +73,7 @@ fun TopAppBar(modifier: Modifier = Modifier, onBackPressed: () -> Unit = {}) { @Composable @Preview fun TopAppBarPreview() { - DroidconKE2022Theme { + DroidconKE2023Theme { TopAppBar() } } \ No newline at end of file diff --git a/presentation/src/main/res/values/themes.xml b/presentation/src/main/res/values/themes.xml index 853dca81..7d96090c 100644 --- a/presentation/src/main/res/values/themes.xml +++ b/presentation/src/main/res/values/themes.xml @@ -1,9 +1,9 @@ - diff --git a/presentation/src/test/java/com/android254/presentation/about/view/AboutScreenTest.kt b/presentation/src/test/java/com/android254/presentation/about/view/AboutScreenTest.kt index c63e0985..40870caf 100644 --- a/presentation/src/test/java/com/android254/presentation/about/view/AboutScreenTest.kt +++ b/presentation/src/test/java/com/android254/presentation/about/view/AboutScreenTest.kt @@ -18,7 +18,7 @@ package com.android254.presentation.about.view import androidx.compose.ui.test.assertIsDisplayed import androidx.compose.ui.test.junit4.createComposeRule import androidx.compose.ui.test.onNodeWithTag -import com.android254.presentation.common.theme.DroidconKE2022Theme +import com.android254.presentation.common.theme.DroidconKE2023Theme import org.junit.Before import org.junit.Ignore import org.junit.Rule @@ -45,7 +45,7 @@ class AboutScreenTest { @Ignore("Fix later") fun `should show About Screen and organizing team section`() { composeTestRule.setContent { - DroidconKE2022Theme { + DroidconKE2023Theme { AboutScreen() } } @@ -59,7 +59,7 @@ class AboutScreenTest { @Ignore("Fix later") fun `should show About Screen and the droidcon topBar`() { composeTestRule.setContent { - DroidconKE2022Theme { + DroidconKE2023Theme { AboutScreen() } } @@ -72,7 +72,7 @@ class AboutScreenTest { @Ignore("Fix later") fun `should show About Screen and show the organized by section`() { composeTestRule.setContent { - DroidconKE2022Theme { + DroidconKE2023Theme { AboutScreen() } } diff --git a/presentation/src/test/java/com/android254/presentation/auth/view/AuthDialogTest.kt b/presentation/src/test/java/com/android254/presentation/auth/view/AuthDialogTest.kt index 1aa14aa9..84427b56 100644 --- a/presentation/src/test/java/com/android254/presentation/auth/view/AuthDialogTest.kt +++ b/presentation/src/test/java/com/android254/presentation/auth/view/AuthDialogTest.kt @@ -19,7 +19,7 @@ import androidx.compose.ui.test.assertIsDisplayed import androidx.compose.ui.test.assertTextEquals import androidx.compose.ui.test.junit4.createComposeRule import androidx.compose.ui.test.onNodeWithTag -import com.android254.presentation.common.theme.DroidconKE2022Theme +import com.android254.presentation.common.theme.DroidconKE2023Theme import org.junit.Rule import org.junit.Test import org.junit.runner.RunWith @@ -36,7 +36,7 @@ class AuthDialogTest { @Test fun `test all widgets should be visible`() { composeTestRule.setContent { - DroidconKE2022Theme { + DroidconKE2023Theme { AuthDialog() } } diff --git a/presentation/src/test/java/com/android254/presentation/feed/view/FeedScreenTest.kt b/presentation/src/test/java/com/android254/presentation/feed/view/FeedScreenTest.kt index 3de84814..4644b34a 100644 --- a/presentation/src/test/java/com/android254/presentation/feed/view/FeedScreenTest.kt +++ b/presentation/src/test/java/com/android254/presentation/feed/view/FeedScreenTest.kt @@ -19,7 +19,7 @@ import androidx.compose.ui.test.assertIsDisplayed import androidx.compose.ui.test.junit4.createComposeRule import androidx.compose.ui.test.onNodeWithTag import androidx.compose.ui.test.performClick -import com.android254.presentation.common.theme.DroidconKE2022Theme +import com.android254.presentation.common.theme.DroidconKE2023Theme import org.junit.Before import org.junit.Rule import org.junit.Test @@ -44,7 +44,7 @@ class FeedScreenTest { @Test fun `should display feed items`() { composeTestRule.setContent { - DroidconKE2022Theme { + DroidconKE2023Theme { FeedScreen() } } @@ -59,7 +59,7 @@ class FeedScreenTest { @Test fun `test share bottom sheet is shown`() { composeTestRule.setContent { - DroidconKE2022Theme { + DroidconKE2023Theme { FeedScreen() } } diff --git a/presentation/src/test/java/com/android254/presentation/feedback/view/FeedBackScreenTest.kt b/presentation/src/test/java/com/android254/presentation/feedback/view/FeedBackScreenTest.kt index 380ce80e..5ba75a8d 100644 --- a/presentation/src/test/java/com/android254/presentation/feedback/view/FeedBackScreenTest.kt +++ b/presentation/src/test/java/com/android254/presentation/feedback/view/FeedBackScreenTest.kt @@ -20,7 +20,7 @@ import androidx.compose.ui.test.assertTextEquals import androidx.compose.ui.test.junit4.createComposeRule import androidx.compose.ui.test.onNodeWithTag import androidx.compose.ui.test.performScrollTo -import com.android254.presentation.common.theme.DroidconKE2022Theme +import com.android254.presentation.common.theme.DroidconKE2023Theme import org.junit.Before import org.junit.Rule import org.junit.Test @@ -45,7 +45,7 @@ class FeedBackScreenTest { @Test fun `should should show FeedBack Screen and show the heading`() { composeTestRule.setContent { - DroidconKE2022Theme { + DroidconKE2023Theme { FeedBackScreen() } } @@ -58,7 +58,7 @@ class FeedBackScreenTest { @Test fun `should should show FeedBack Heading onCollapse`() { composeTestRule.setContent { - DroidconKE2022Theme { + DroidconKE2023Theme { FeedBackScreen() } } @@ -70,7 +70,7 @@ class FeedBackScreenTest { @Test fun `should show submit Button`() { composeTestRule.setContent { - DroidconKE2022Theme { + DroidconKE2023Theme { FeedBackScreen() } } diff --git a/presentation/src/test/java/com/android254/presentation/home/components/HomeBannerSectionTest.kt b/presentation/src/test/java/com/android254/presentation/home/components/HomeBannerSectionTest.kt index 4aed00ae..694a01ea 100644 --- a/presentation/src/test/java/com/android254/presentation/home/components/HomeBannerSectionTest.kt +++ b/presentation/src/test/java/com/android254/presentation/home/components/HomeBannerSectionTest.kt @@ -18,7 +18,7 @@ package com.android254.presentation.home.components import androidx.compose.ui.test.assertIsDisplayed import androidx.compose.ui.test.junit4.createComposeRule import androidx.compose.ui.test.onNodeWithTag -import com.android254.presentation.common.theme.DroidconKE2022Theme +import com.android254.presentation.common.theme.DroidconKE2023Theme import com.android254.presentation.home.viewstate.HomeViewState import org.junit.Before import org.junit.Rule @@ -45,7 +45,7 @@ class HomeBannerSectionTest { @Test fun `Test home poster is displayed`() { composeTestRule.setContent { - DroidconKE2022Theme { + DroidconKE2023Theme { HomeBannerSection(homeViewState) } } @@ -55,7 +55,7 @@ class HomeBannerSectionTest { @Test fun `Test home poster is hidden`() { composeTestRule.setContent { - DroidconKE2022Theme { + DroidconKE2023Theme { HomeBannerSection(homeViewState.copy(isPosterVisible = false)) } } @@ -65,7 +65,7 @@ class HomeBannerSectionTest { @Test fun `Test home call for speakers is displayed`() { composeTestRule.setContent { - DroidconKE2022Theme { + DroidconKE2023Theme { HomeBannerSection(homeViewState.copy(isCallForSpeakersVisible = true)) } } @@ -75,7 +75,7 @@ class HomeBannerSectionTest { @Test fun `Test home call for speakers is hidden`() { composeTestRule.setContent { - DroidconKE2022Theme { + DroidconKE2023Theme { HomeBannerSection(homeViewState.copy(isCallForSpeakersVisible = false)) } } diff --git a/presentation/src/test/java/com/android254/presentation/home/screen/HomeScreenTest.kt b/presentation/src/test/java/com/android254/presentation/home/screen/HomeScreenTest.kt index 7ddc605c..60baf829 100644 --- a/presentation/src/test/java/com/android254/presentation/home/screen/HomeScreenTest.kt +++ b/presentation/src/test/java/com/android254/presentation/home/screen/HomeScreenTest.kt @@ -19,7 +19,7 @@ import androidx.compose.ui.test.assertIsDisplayed import androidx.compose.ui.test.junit4.createComposeRule import androidx.compose.ui.test.onNodeWithTag import com.android254.presentation.common.components.SponsorsCard -import com.android254.presentation.common.theme.DroidconKE2022Theme +import com.android254.presentation.common.theme.DroidconKE2023Theme import com.android254.presentation.home.components.HomeSessionSection import com.android254.presentation.home.components.HomeSpeakersSection import org.junit.Before @@ -46,7 +46,7 @@ class HomeScreenTest { @Test fun `Test home title is displayed`() { composeTestRule.setContent { - DroidconKE2022Theme { + DroidconKE2023Theme { HomeHeaderSection() } } @@ -68,7 +68,7 @@ class HomeScreenTest { @Test fun `Not signedIn droidcon topBar is displayed`() { composeTestRule.setContent { - DroidconKE2022Theme { + DroidconKE2023Theme { HomeToolbar(isSignedIn = false) } } @@ -80,7 +80,7 @@ class HomeScreenTest { @Test fun `SignedIn droidcon topBar is displayed`() { composeTestRule.setContent { - DroidconKE2022Theme { + DroidconKE2023Theme { HomeToolbar(isSignedIn = true) } } diff --git a/presentation/src/test/java/com/android254/presentation/sessions/view/SessionScreenTest.kt b/presentation/src/test/java/com/android254/presentation/sessions/view/SessionScreenTest.kt index dc88887a..3d234bdc 100644 --- a/presentation/src/test/java/com/android254/presentation/sessions/view/SessionScreenTest.kt +++ b/presentation/src/test/java/com/android254/presentation/sessions/view/SessionScreenTest.kt @@ -23,7 +23,7 @@ import androidx.navigation.testing.TestNavHostController import androidx.test.core.app.ApplicationProvider import com.android254.domain.models.ResourceResult import com.android254.domain.repos.SessionsRepo -import com.android254.presentation.common.theme.DroidconKE2022Theme +import com.android254.presentation.common.theme.DroidconKE2023Theme import io.mockk.coEvery import io.mockk.mockk import org.junit.Before @@ -61,7 +61,7 @@ class SessionScreenTest { coEvery { repo.fetchAndSaveSessions() } returns ResourceResult.Empty("") composeTestRule.setContent { - DroidconKE2022Theme() { + DroidconKE2023Theme() { SessionsScreen( navController = navController, sessionsViewModel = SessionsViewModel(repo), @@ -85,7 +85,7 @@ class SessionScreenTest { coEvery { repo.fetchAndSaveSessions() } returns ResourceResult.Success(emptyList()) composeTestRule.setContent { - DroidconKE2022Theme() { + DroidconKE2023Theme() { SessionsScreen( navController = navController, sessionsViewModel = SessionsViewModel(repo),