Skip to content

Commit 642aaf4

Browse files
CyroPCJrCyroPCJr
authored
General adjustment (#9)
* feat: Add WeDoScreen to the MainScreen. feat: Add infos to the arms team as Card layout. feat: link WeDoScreen call to the others screen. * feat: Add cliclable card that open external url. update: adjuste some layout.
1 parent 2f39477 commit 642aaf4

File tree

13 files changed

+456
-41
lines changed

13 files changed

+456
-41
lines changed

‎app/src/main/java/com/example/armsapp/data/Local.kt‎

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
package com.example.armsapp.data
22

3+
import com.example.armsapp.R
4+
import com.example.armsapp.model.ArmsTeam
5+
import com.example.armsapp.model.ArmsWeAre
6+
import com.example.armsapp.model.EndPoints
37
import com.example.armsapp.model.Project
48

59
val listProjects = listOf(
@@ -66,4 +70,55 @@ val listProjects = listOf(
6670
name = "NHÔ QUIN", type = "CERVEJARIA"
6771
)
6872

73+
)
74+
75+
val listArmsWeAre = listOf(
76+
ArmsWeAre(R.string.arms_we_are_title_diagnostic, R.string.arms_we_are_description_diagnostic),
77+
ArmsWeAre(R.string.arms_we_are_title_naming, R.string.arms_we_are_description_naming),
78+
ArmsWeAre(R.string.arms_we_are_title_logo, R.string.arms_we_are_description_logo),
79+
ArmsWeAre(R.string.arms_we_are_title_visual, R.string.arms_we_are_description_visual),
80+
ArmsWeAre(
81+
R.string.arms_we_are_title_communication,
82+
R.string.arms_we_are_description_communication
83+
),
84+
ArmsWeAre(R.string.arms_we_are_title_mkt, R.string.arms_we_are_description_mkt),
85+
ArmsWeAre(R.string.arms_we_are_title_photos, R.string.arms_we_are_description_photos),
86+
)
87+
88+
val listArmsTeam = listOf(
89+
ArmsTeam(
90+
name = R.string.we_are_team_rogerio,
91+
jobPosition = R.string.we_are_team_rogerio_job,
92+
instagramLabel = "@studioarms",
93+
instagramUri = EndPoints.INSTAGRAM,
94+
imageUrl = EndPoints.TEAM_ROGERIO
95+
),
96+
ArmsTeam(
97+
name = R.string.we_are_team_jean,
98+
jobPosition = R.string.we_are_team_jean_job,
99+
instagramLabel = "@jeanovaes",
100+
instagramUri = EndPoints.INSTAGRAM_BASE + "/jeanovaes/",
101+
imageUrl = EndPoints.TEAM_JEAN
102+
),
103+
ArmsTeam(
104+
name = R.string.we_are_team_andrea,
105+
jobPosition = R.string.we_are_team_andrea_job,
106+
instagramLabel = "@andreac_simao",
107+
instagramUri = EndPoints.INSTAGRAM_BASE + "/andreac_simao/",
108+
imageUrl = EndPoints.TEAM_ANDREA
109+
),
110+
ArmsTeam(
111+
name = R.string.we_are_team_mayara,
112+
jobPosition = R.string.we_are_team_mayara_job,
113+
instagramLabel = "@mayarafigueiredo.adv",
114+
instagramUri = EndPoints.INSTAGRAM_BASE + "/mayarafigueiredo.adv/",
115+
imageUrl = EndPoints.TEAM_MAYARA
116+
),
117+
ArmsTeam(
118+
name = R.string.we_are_team_sidney,
119+
jobPosition = R.string.we_are_team_sidney_job,
120+
instagramLabel = "@sbretanha",
121+
instagramUri = EndPoints.INSTAGRAM_BASE + "/sbretanha/",
122+
imageUrl = EndPoints.TEAM_SIDNEY
123+
),
69124
)

‎app/src/main/java/com/example/armsapp/model/ArmsTeam.kt‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
package com.example.armsapp.model
2+
3+
import androidx.annotation.StringRes
4+
5+
data class ArmsTeam(
6+
@StringRes val name: Int,
7+
@StringRes val jobPosition: Int,
8+
val instagramLabel: String,
9+
val instagramUri: String,
10+
val imageUrl: String,
11+
)

‎app/src/main/java/com/example/armsapp/model/ArmsWeAre.kt‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
package com.example.armsapp.model
2+
3+
import androidx.annotation.StringRes
4+
5+
data class ArmsWeAre(
6+
@StringRes val title: Int,
7+
@StringRes val description: Int,
8+
)

‎app/src/main/java/com/example/armsapp/model/EndPoints.kt‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,12 @@ object EndPoints {
66
const val SKETCH_REELS = BuildConfig.armsBaseUrl + "/12/gero_sketch_logo.mp4"
77
const val PROJECT_REELS = BuildConfig.armsBaseUrl + "/12/logos_site.mp4"
88
const val CEO_PICTURE = BuildConfig.armsBaseUrl + "/11/Rectangle-65.png"
9+
const val TEAM_ROGERIO = BuildConfig.armsBaseUrl + "/11/Rectangle-60-2.png"
10+
const val TEAM_JEAN = BuildConfig.armsBaseUrl + "/11/jean-novaes.png"
11+
const val TEAM_ANDREA = BuildConfig.armsBaseUrl + "/11/andrea-simao.png"
12+
const val TEAM_MAYARA = BuildConfig.armsBaseUrl + "/11/mayara-figueiredo.png"
13+
const val TEAM_SIDNEY = BuildConfig.armsBaseUrl + "/11/sidney_pb.png"
14+
const val INSTAGRAM_BASE = "https://www.instagram.com"
915
const val WHATSAPP = "https://api.whatsapp.com/send/?phone=5519996314695"
1016
const val TELEGRAM = "https://t.me/rogerioforti"
1117
const val BEHANCE = "https://www.behance.net/estudioarms"

‎app/src/main/java/com/example/armsapp/ui/MainScreen.kt‎

Lines changed: 19 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ import com.example.armsapp.model.BottomBarNavItem
3333
import com.example.armsapp.ui.contact.ContactScreen
3434
import com.example.armsapp.ui.home.HomeScreen
3535
import com.example.armsapp.ui.theme.ArmsAppTheme
36+
import com.example.armsapp.ui.weare.WeAreScreen
3637
import com.example.armsapp.ui.wedo.WeDoScreen
3738
import com.example.armsapp.ui.wespeak.WeSpeakScreen
3839

@@ -133,7 +134,10 @@ fun NavigationHost(
133134
navController.navigate(BottomBarNavItem.WeDoScreen.route)
134135

135136
},
136-
onClickWeAreScreen = { /*TODO:*/ },
137+
onClickWeAreScreen = {
138+
onChangeIndexNavBarNavItem(BottomBarNavItem.WeAreScreen.id)
139+
navController.navigate(BottomBarNavItem.WeAreScreen.route)
140+
},
137141
contentPaddingValues = contentPaddingValues
138142
)
139143
}
@@ -145,7 +149,8 @@ fun NavigationHost(
145149
navController.navigate(BottomBarNavItem.WeDoScreen.route)
146150
},
147151
onClickWeAreScreen = {
148-
/*TODO:*/
152+
onChangeIndexNavBarNavItem(BottomBarNavItem.WeAreScreen.id)
153+
navController.navigate(BottomBarNavItem.WeAreScreen.route)
149154
},
150155
contentPaddingValues = contentPaddingValues
151156
)
@@ -154,7 +159,8 @@ fun NavigationHost(
154159
composable(route = BottomBarNavItem.WeDoScreen.route) {
155160
WeDoScreen(
156161
onClickWeAreScreen = {
157-
/*TODO:*/
162+
onChangeIndexNavBarNavItem(BottomBarNavItem.WeAreScreen.id)
163+
navController.navigate(BottomBarNavItem.WeAreScreen.route)
158164
},
159165
contentPaddingValues = contentPaddingValues
160166
)
@@ -170,6 +176,16 @@ fun NavigationHost(
170176
)
171177
}
172178

179+
composable(route = BottomBarNavItem.WeAreScreen.route) {
180+
WeAreScreen(
181+
onClickWeDoScreen = {
182+
onChangeIndexNavBarNavItem(BottomBarNavItem.WeDoScreen.id)
183+
navController.navigate(BottomBarNavItem.WeDoScreen.route)
184+
},
185+
contentPaddingValues = contentPaddingValues
186+
)
187+
}
188+
173189

174190
}
175191
}

‎app/src/main/java/com/example/armsapp/ui/components/ExoPlayerMediaUtil.kt‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ import androidx.compose.ui.Modifier
1414
import androidx.compose.ui.platform.LocalContext
1515
import androidx.compose.ui.unit.dp
1616
import androidx.compose.ui.viewinterop.AndroidView
17-
import androidx.lifecycle.compose.collectAsStateWithLifecycle
1817
import androidx.lifecycle.viewmodel.compose.viewModel
1918
import androidx.media3.common.MediaItem
2019
import androidx.media3.common.Player

‎app/src/main/java/com/example/armsapp/ui/components/LayoutShared.kt‎

Lines changed: 18 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import androidx.compose.foundation.layout.Row
66
import androidx.compose.foundation.layout.Spacer
77
import androidx.compose.foundation.layout.padding
88
import androidx.compose.foundation.layout.size
9+
import androidx.compose.foundation.shape.RoundedCornerShape
910
import androidx.compose.material.icons.Icons
1011
import androidx.compose.material.icons.automirrored.filled.ArrowForward
1112
import androidx.compose.material3.Button
@@ -18,8 +19,7 @@ import androidx.compose.material3.MaterialTheme
1819
import androidx.compose.material3.Text
1920
import androidx.compose.runtime.Composable
2021
import androidx.compose.ui.Modifier
21-
import androidx.compose.ui.draw.shadow
22-
import androidx.compose.ui.graphics.RectangleShape
22+
import androidx.compose.ui.platform.LocalUriHandler
2323
import androidx.compose.ui.res.stringResource
2424
import androidx.compose.ui.tooling.preview.Preview
2525
import androidx.compose.ui.unit.dp
@@ -33,23 +33,22 @@ fun CardLayout(
3333
project: Project,
3434
modifier: Modifier = Modifier,
3535
) {
36+
val uriHandler = LocalUriHandler.current
3637
Card(
3738
modifier = modifier
38-
.padding(8.dp)
39-
.shadow(
40-
elevation = 15.dp,
41-
shape = RectangleShape,
42-
ambientColor = MaterialTheme.colorScheme.primary,
43-
spotColor = MaterialTheme.colorScheme.primary,
44-
),
45-
shape = RectangleShape,
39+
.padding(8.dp),
40+
shape = RoundedCornerShape(4.dp),
41+
elevation = CardDefaults.elevatedCardElevation(defaultElevation = 8.dp),
4642
colors = CardDefaults.cardColors(
4743
containerColor = MaterialTheme.colorScheme.surfaceContainer,
4844
contentColor = contentColor
49-
)
45+
),
46+
onClick = {
47+
uriHandler.openUri(uri = project.linkPage)
48+
}
5049
) {
5150
LoadImages(project.urlImage)
52-
Row(modifier = modifier) {
51+
Row {
5352
Text(
5453
text = project.name,
5554
modifier = Modifier
@@ -70,8 +69,10 @@ fun ButtonNavigation(
7069
onClick: () -> Unit,
7170
) {
7271
Button(onClick = onClick) {
73-
Text(text = stringResource(textButton),
74-
color = MaterialTheme.colorScheme.onBackground)
72+
Text(
73+
text = stringResource(textButton),
74+
color = MaterialTheme.colorScheme.onBackground
75+
)
7576
Spacer(Modifier.size(ButtonDefaults.IconSpacing))
7677
Icon(
7778
Icons.AutoMirrored.Filled.ArrowForward,
@@ -88,7 +89,7 @@ fun ProjectCardLayoutList(projectList: List<Project>) {
8889
}
8990
}
9091

91-
@Preview
92+
@Preview(showBackground = true)
9293
@Composable
9394
fun ProjectCardLayoutPreview() {
9495
ArmsAppTheme {
@@ -121,10 +122,10 @@ private fun ButtonNavigationPreviewDarkMode() {
121122
}
122123
}
123124

124-
@Preview
125+
@Preview(showBackground = true)
125126
@Composable
126127
private fun ProjectCardListPreview() {
127-
ArmsAppTheme {
128+
ArmsAppTheme(darkTheme = false) {
128129
ProjectCardLayoutList(listProjects)
129130
}
130131
}

‎app/src/main/java/com/example/armsapp/ui/home/HomeScreen.kt‎

Lines changed: 40 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import androidx.annotation.StringRes
44
import androidx.compose.foundation.layout.Arrangement
55
import androidx.compose.foundation.layout.Column
66
import androidx.compose.foundation.layout.PaddingValues
7+
import androidx.compose.foundation.layout.Row
78
import androidx.compose.foundation.layout.Spacer
89
import androidx.compose.foundation.layout.fillMaxSize
910
import androidx.compose.foundation.layout.padding
@@ -15,13 +16,17 @@ import androidx.compose.material.icons.automirrored.filled.ArrowForward
1516
import androidx.compose.material3.Button
1617
import androidx.compose.material3.ButtonDefaults
1718
import androidx.compose.material3.Icon
19+
import androidx.compose.material3.MaterialTheme
1820
import androidx.compose.material3.Text
1921
import androidx.compose.runtime.Composable
2022
import androidx.compose.ui.Alignment
2123
import androidx.compose.ui.Modifier
2224
import androidx.compose.ui.res.stringResource
25+
import androidx.compose.ui.text.font.FontWeight
26+
import androidx.compose.ui.text.style.TextAlign
2327
import androidx.compose.ui.tooling.preview.Preview
2428
import androidx.compose.ui.unit.dp
29+
import androidx.compose.ui.unit.sp
2530
import com.example.armsapp.R
2631
import com.example.armsapp.data.listProjects
2732
import com.example.armsapp.model.EndPoints
@@ -44,30 +49,47 @@ fun HomeScreen(
4449
modifier = modifier
4550
.fillMaxSize()
4651
.padding(contentPaddingValues)
52+
.padding(start = 10.dp, end = 10.dp)
4753
.verticalScroll(state = scrollState),
4854
verticalArrangement = Arrangement.SpaceEvenly,
4955
horizontalAlignment = Alignment.CenterHorizontally
5056
) {
5157
Text(
5258
text = stringResource(R.string.title),
53-
modifier = Modifier.padding(top = 10.dp, bottom = 10.dp),
59+
fontSize = 40.sp,
60+
fontWeight = FontWeight.Black,
61+
color = MaterialTheme.colorScheme.onBackground,
62+
lineHeight = 42.sp,
63+
textAlign = TextAlign.Center,
5464
)
5565

5666
Text(
5767
text = stringResource(R.string.sub_title),
58-
modifier = Modifier.padding(top = 10.dp, bottom = 10.dp),
68+
fontSize = 14.sp,
69+
fontWeight = FontWeight.Light,
70+
color = MaterialTheme.colorScheme.onBackground,
5971
)
6072

6173
ExoPlayerView(
6274
EndPoints.PROJECT_REELS,
6375
modifier = Modifier.padding(start = 8.dp, end = 8.dp)
6476
)
6577

66-
BorderTexts(
67-
textLeft = stringResource(R.string.sub_title2),
68-
textRight = stringResource(R.string.sub_title3),
69-
modifier = modifier.padding(top = 10.dp, bottom = 10.dp)
70-
)
78+
Row {
79+
Text(
80+
text = stringResource(R.string.sub_title2),
81+
fontSize = 14.sp,
82+
fontWeight = FontWeight.Light,
83+
color = MaterialTheme.colorScheme.onBackground,
84+
modifier = Modifier.weight(1f)
85+
)
86+
Text(
87+
text = stringResource(R.string.sub_title3),
88+
fontSize = 14.sp,
89+
fontWeight = FontWeight.Light,
90+
color = MaterialTheme.colorScheme.onBackground,
91+
)
92+
}
7193

7294
ProjectCardLayoutList(listProjects.dropLast(4))
7395

@@ -77,15 +99,19 @@ fun HomeScreen(
7799

78100
Text(
79101
text = stringResource(R.string.sub_title4),
80-
modifier = Modifier
81-
.align(alignment = Alignment.Start)
82-
.padding(start = 8.dp)
102+
fontSize = 40.sp,
103+
fontWeight = FontWeight.Black,
104+
color = MaterialTheme.colorScheme.onBackground,
105+
lineHeight = 42.sp,
106+
textAlign = TextAlign.Start,
107+
modifier = Modifier.align(alignment = Alignment.Start)
83108
)
84109
Text(
85110
text = stringResource(R.string.sub_title5),
86-
modifier = Modifier
87-
.align(alignment = Alignment.End)
88-
.padding(end = 8.dp)
111+
fontSize = 14.sp,
112+
fontWeight = FontWeight.Light,
113+
color = MaterialTheme.colorScheme.onBackground,
114+
modifier = Modifier.align(alignment = Alignment.End)
89115
)
90116

91117
ButtonNavigation(R.string.btn_click_for_more) {
@@ -130,7 +156,7 @@ private fun ButtonNavigation(
130156
}
131157
}
132158

133-
@Preview
159+
@Preview(showBackground = true)
134160
@Composable
135161
private fun HomeScreenPreview() {
136162
ArmsAppTheme {

‎app/src/main/java/com/example/armsapp/ui/theme/Theme.kt‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package com.example.armsapp.ui.theme
22

3-
import android.app.Activity
43
import android.os.Build
54
import androidx.compose.foundation.isSystemInDarkTheme
65
import androidx.compose.material3.MaterialTheme
@@ -38,7 +37,7 @@ fun ArmsAppTheme(
3837
darkTheme: Boolean = isSystemInDarkTheme(),
3938
// Dynamic color is available on Android 12+
4039
dynamicColor: Boolean = true,
41-
content: @Composable () -> Unit
40+
content: @Composable () -> Unit,
4241
) {
4342
val colorScheme = when {
4443
dynamicColor && Build.VERSION.SDK_INT >= Build.VERSION_CODES.S -> {

0 commit comments

Comments
 (0)