Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Submission Aditya Bhawsar #15

Draft
wants to merge 29 commits into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
fb962c4
Added Contributor card
aditya-bhawsar-mm Mar 18, 2022
57138ea
fixed import
aditya-bhawsar-mm Mar 18, 2022
6ef93e8
Added Mic Animation
aditya-bhawsar-mm Apr 1, 2022
b175bea
Merge pull request #19 from mutualmobile/aditya/mic_animation
aditya-bhawsar-mm Apr 1, 2022
313a0d0
Added background
aditya-bhawsar-mm Apr 2, 2022
57ba123
Basic Circle Animation
aditya-bhawsar-mm Apr 2, 2022
ae4af40
Added CircleSquareAnimation.kt
aditya-bhawsar-mm Apr 2, 2022
81469d6
Rearranged Animations
aditya-bhawsar-mm Apr 2, 2022
88a17d4
Merge pull request #20 from mutualmobile/aditya/circle_square
aditya-bhawsar-mm Apr 2, 2022
7753a56
Merge branch 'master' into aditya/breathe_animation
aditya-bhawsar-mm Apr 2, 2022
71e858e
Added breathe animation
aditya-bhawsar-mm Apr 2, 2022
a61fac4
Merge branch 'submission/aditya' into aditya/breathe_animation
aditya-bhawsar-mm Apr 2, 2022
e28dd64
Added circle animation to main activity
aditya-bhawsar-mm Apr 2, 2022
32e5c6d
Merge pull request #21 from mutualmobile/aditya/breathe_animation
aditya-bhawsar-mm Apr 2, 2022
089c7bc
Corrected package name
aditya-bhawsar-mm Apr 2, 2022
ebafa75
Added alarm slider animation
aditya-bhawsar-mm Apr 9, 2022
2a3233f
Added fi splash screen
aditya-bhawsar-mm Apr 9, 2022
6747c96
Added circle
aditya-bhawsar-mm Apr 9, 2022
4854a0f
Created a swipeable slider
aditya-bhawsar-mm Apr 9, 2022
3a17d8e
Created a swipeable slider
aditya-bhawsar-mm Apr 14, 2022
b0e7add
Added background animation
aditya-bhawsar-mm Apr 14, 2022
ef464ae
Added animation
aditya-bhawsar-mm Apr 15, 2022
958b75e
Replaced position
aditya-bhawsar-mm Apr 15, 2022
ee23875
Merge pull request #22 from mutualmobile/aditya/alarm_slider_component
aditya-bhawsar-mm Apr 15, 2022
c0f40aa
Added animation
aditya-bhawsar-mm Apr 15, 2022
e005b11
Merge branch 'submission/aditya' into aditya/fi_animation
aditya-bhawsar-mm Apr 15, 2022
18cb28a
Merge pull request #23 from mutualmobile/aditya/fi_animation
aditya-bhawsar-mm Apr 15, 2022
b43478b
Added animation
aditya-bhawsar-mm Apr 16, 2022
96f1647
Merge pull request #24 from mutualmobile/aditya/breate_again
aditya-bhawsar-mm Apr 16, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

21 changes: 20 additions & 1 deletion app/src/main/java/dev/baseio/composeplayground/MainActivity.kt
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ import com.google.accompanist.pager.HorizontalPager
import com.google.accompanist.pager.HorizontalPagerIndicator
import com.google.accompanist.pager.rememberPagerState
import dev.baseio.composeplayground.ui.animations.*
import dev.baseio.composeplayground.ui.animations.adityabhawsar.*
import dev.baseio.composeplayground.ui.animations.anmolverma.BellAnimation
import dev.baseio.composeplayground.ui.animations.anmolverma.ShootingStarsAnimation
import dev.baseio.composeplayground.ui.animations.anmolverma.planetarysystem.PlanetarySystem
Expand Down Expand Up @@ -64,7 +65,7 @@ class MainActivity : ComponentActivity() {
) {
HorizontalPager(
modifier = Modifier.fillMaxSize(),
count = 15, state = pagerState,
count = 21, state = pagerState,
) { page ->
// Our page content
when (page) {
Expand Down Expand Up @@ -95,9 +96,27 @@ class MainActivity : ComponentActivity() {
14 -> {
ShootingStarsAnimation()
}
15 -> {
BreatheAnimation()
}
16 -> {
MicAnimation()
}
17 -> {
CircleSquareAnimation()
}
0 -> {
NetflixIntroAnimation()
}
18 -> {
FiSplashAnimation()
}
20 -> {
BreatheRotatingAnimation()
}
19 -> {
AlarmSliderAnimation()
}
11 -> {
Box(modifier = Modifier.fillMaxSize()) {
Github404(Modifier)
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
package dev.baseio.composeplayground.contributors

import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size
import androidx.compose.material.MaterialTheme
import androidx.compose.material.Text
import androidx.compose.runtime.Composable
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.unit.dp
import dev.baseio.composeplayground.R
import dev.baseio.composeplayground.ui.theme.Typography

const val adityaImageUrl = "https://ca.slack-edge.com/T02TLUWLZ-U02CDNRLMSA-4aa8ad906c93-72"

@Composable
fun AdityaBhawsar(modifier: Modifier = Modifier) {
Row(verticalAlignment = Alignment.CenterVertically, modifier = modifier.padding(4.dp)) {
CoilImageBox(Modifier.size(64.dp), adityaImageUrl)
Column(verticalArrangement = Arrangement.Center, modifier = Modifier.padding(8.dp)) {
Text(
text = stringResource(id = R.string.emp_mmh0329),
style = Typography.h6.copy(MaterialTheme.colors.onSurface),
)
Text(
text = stringResource(id = R.string.emp_mmh0329_email),
style = Typography.subtitle1.copy(MaterialTheme.colors.onSurface),
)
}
}
}
Loading