Skip to content

Commit

Permalink
Refactor: Remove 2022 references
Browse files Browse the repository at this point in the history
  • Loading branch information
chepsi committed Mar 28, 2023
1 parent f07a034 commit 7975bfb
Show file tree
Hide file tree
Showing 33 changed files with 77 additions and 76 deletions.
2 changes: 1 addition & 1 deletion .github/pull_request_template.md
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ class YOUR_TEST_FILE_NAME {
fun `YOUR TEST NAME HERE`() {

composeTestRule.setContent {
DroidconKE2022Theme {
DroidconKE2023Theme {
YOUR_COMPOSABLE_HERE()
}
}
Expand Down
1 change: 1 addition & 0 deletions api_key.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
droidconKe-2020
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -214,7 +214,7 @@ fun OrganizingTeamSection(
@Preview
@Composable
fun AboutScreenPreview() {
DroidconKE2022Theme {
DroidconKE2023Theme {
AboutScreen()
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -104,7 +104,7 @@ fun OrganizingTeamComponent(
@Preview
@Composable
fun Preview() {
DroidconKE2022Theme {
DroidconKE2023Theme {
OrganizingTeamComponent(
modifier = Modifier,
teamMember = OrganizingTeamMember(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -46,7 +46,7 @@ class MainActivity : ComponentActivity() {
super.onCreate(savedInstanceState)
installSplashScreen()
setContent {
DroidconKE2022Theme {
DroidconKE2023Theme {
MainScreen()
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -108,7 +108,7 @@ fun AuthDialog(
@Preview
@Composable
fun AuthDialogPreview() {
DroidconKE2022Theme() {
DroidconKE2023Theme() {
AuthDialog()
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -71,7 +71,7 @@ fun BottomNavigationBar(navController: NavHostController) {
@Preview
@Composable
fun BottomNavigationBarPreview() {
DroidconKE2022Theme {
DroidconKE2023Theme {
BottomNavigationBar(rememberNavController())
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down Expand Up @@ -71,7 +71,7 @@ fun DroidconAppBar(
@Preview
@Composable
fun DroidconAppBarPreview() {
DroidconKE2022Theme {
DroidconKE2023Theme {
DroidconAppBar()
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -157,7 +157,7 @@ fun FilterButton(
@Preview
@Composable
fun ToolbarPreview() {
DroidconKE2022Theme {
DroidconKE2023Theme {
Column() {

DroidconAppBarWithFilter(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -137,7 +137,7 @@ fun FeedComponent(modifier: Modifier, onClickItem: (Int) -> Unit) {
@Preview
@Composable
fun Preview() {
DroidconKE2022Theme {
DroidconKE2023Theme {
FeedComponent(modifier = Modifier) {
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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()
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -141,15 +141,15 @@ fun PlatformButton(platform: String, icon: Int) {
@Preview(showBackground = true)
@Composable
fun PlatformButtonPreview() {
DroidconKE2022Theme {
DroidconKE2023Theme {
PlatformButton("Twitter", R.drawable.ic_whatsapp)
}
}

@Preview(showBackground = true)
@Composable
fun PFeedShareSectionPreview() {
DroidconKE2022Theme {
DroidconKE2023Theme {
FeedShareSection()
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -258,7 +258,7 @@ fun FeedbackTitle() {
@Preview
@Composable
fun FeedBackScreenPreview() {
DroidconKE2022Theme {
DroidconKE2023Theme {
FeedBackScreen()
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -118,23 +118,23 @@ fun HomeCallForSpeakersLink() {
@Preview
@Composable
fun HomeBannerSectionPreview() {
DroidconKE2022Theme {
DroidconKE2023Theme {
HomeBannerSection(HomeViewState())
}
}

@Preview
@Composable
fun HomeEventBannerPreview() {
DroidconKE2022Theme {
DroidconKE2023Theme {
HomeEventPoster()
}
}

@Preview
@Composable
fun HomeCallForSpeakersLinkPreview() {
DroidconKE2022Theme {
DroidconKE2023Theme {
HomeCallForSpeakersLink()
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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"))
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -133,7 +133,7 @@ fun HomeToolbar(
@Preview
@Composable
fun HomeScreenPreview() {
DroidconKE2022Theme {
DroidconKE2023Theme {
HomeScreen()
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -446,7 +446,7 @@ object TestTag {
@Preview
@Composable
fun SessionDetailsScreenPreview() {
DroidconKE2022Theme(darkTheme = false) {
DroidconKE2023Theme(darkTheme = false) {
SessionDetailsScreen(
onNavigationIconClick = {},
sessionId = "1",
Expand All @@ -458,7 +458,7 @@ fun SessionDetailsScreenPreview() {
@Preview
@Composable
fun SessionDetailsScreenDarkThemePreview() {
DroidconKE2022Theme(darkTheme = true) {
DroidconKE2023Theme(darkTheme = true) {
SessionDetailsScreen(
onNavigationIconClick = {},
sessionId = "1",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -157,7 +157,7 @@ fun SessionsScreen(
@Preview
@Composable
fun SessionsScreenPreview() {
DroidconKE2022Theme {
DroidconKE2023Theme {
SessionsScreen(navController = rememberNavController())
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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",
Expand Down
Loading

0 comments on commit 7975bfb

Please sign in to comment.