Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings
This repository was archived by the owner on Nov 1, 2021. It is now read-only.

Commit 960e6ed

Browse files
author
neon
committed
update: added new projects screen (just4test)
1 parent 8195ffe commit 960e6ed

File tree

18 files changed

+86
-24
lines changed

18 files changed

+86
-24
lines changed

‎app/src/main/AndroidManifest.xml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,10 @@
88
android:fullBackupContent="@xml/backup_descriptor"
99
android:icon="@mipmap/ic_launcher"
1010
android:label="@string/app_name"
11-
android:roundIcon="@mipmap/ic_launcher_round"
1211
android:supportsRtl="true"
1312
android:theme="@style/Theme.Codee">
1413
<activity
15-
android:name=".app.MainActivity"
14+
android:name=".app.AppActivity"
1615
android:exported="true"
1716
android:label="@string/app_name"
1817
android:theme="@style/Theme.Codee.NoActionBar">
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
package com.codee.app
22

33
import android.app.Application
4+
import com.codee.app.core.ContextDI
45

56
class App : Application() {
67
override fun onCreate() {
78
super.onCreate()
9+
ContextDI.init(this)
810
}
911
}

‎app/src/main/java/com/codee/app/AppActivity.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import android.os.Bundle
44
import androidx.activity.ComponentActivity
55
import androidx.activity.compose.setContent
66
import androidx.navigation.compose.rememberNavController
7-
import com.codee.app.core.extensions.CodeeTheme
7+
import com.codee.app.resources.CodeeTheme
88
import com.codee.app.screens.main.MainView
99

1010
class AppActivity : ComponentActivity() {
Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
package com.codee.app.resources
2+
3+
import androidx.compose.foundation.isSystemInDarkTheme
4+
import androidx.compose.material.MaterialTheme
5+
import androidx.compose.runtime.Composable
6+
import com.codee.app.core.extensions.darkThemeColors
7+
import com.codee.app.core.extensions.lightThemeColors
8+
import com.google.accompanist.systemuicontroller.rememberSystemUiController
9+
10+
/**
11+
* Compose representation of codee theme.
12+
*/
13+
@Composable
14+
fun CodeeTheme(
15+
darkTheme: Boolean = isSystemInDarkTheme(),
16+
content: @Composable () -> Unit
17+
) {
18+
val colors = if (darkTheme)
19+
darkThemeColors.value
20+
else lightThemeColors.value
21+
rememberSystemUiController().apply {
22+
setSystemBarsColor(colors.primary, darkIcons = !darkTheme)
23+
setNavigationBarColor(colors.primary, darkIcons = !darkTheme)
24+
}
25+
MaterialTheme(
26+
colors = colors,
27+
content = content
28+
)
29+
}

‎app/src/main/java/com/codee/app/screens/main/MainView.kt‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import androidx.compose.ui.Modifier
88
import androidx.navigation.NavHostController
99
import androidx.navigation.compose.NavHost
1010
import androidx.navigation.compose.composable
11+
import com.codee.app.screens.projects.ProjectsView
1112

1213
@Composable
1314
fun MainView(navController: NavHostController) = NavHost(
@@ -16,6 +17,6 @@ fun MainView(navController: NavHostController) = NavHost(
1617
modifier = Modifier.fillMaxSize()
1718
) {
1819
composable("projects") {
19-
20+
ProjectsView()
2021
}
2122
}
Lines changed: 51 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,45 @@
11
package com.codee.app.screens.projects
22

33
import androidx.compose.foundation.Image
4-
import androidx.compose.material.FloatingActionButton
5-
import androidx.compose.material.Scaffold
6-
import androidx.compose.material.Text
7-
import androidx.compose.material.TopAppBar
4+
import androidx.compose.foundation.layout.*
5+
import androidx.compose.foundation.lazy.LazyColumn
6+
import androidx.compose.foundation.lazy.LazyRow
7+
import androidx.compose.foundation.lazy.items
8+
import androidx.compose.foundation.selection.selectable
9+
import androidx.compose.material.*
810
import androidx.compose.material.icons.Icons
11+
import androidx.compose.material.icons.outlined.Add
912
import androidx.compose.material.icons.outlined.Create
1013
import androidx.compose.runtime.Composable
14+
import androidx.compose.ui.Alignment
15+
import androidx.compose.ui.Modifier
16+
import androidx.compose.ui.draw.alpha
17+
import androidx.compose.ui.res.painterResource
18+
import androidx.compose.ui.text.font.FontStyle
1119
import androidx.compose.ui.tooling.preview.Preview
20+
import androidx.compose.ui.unit.dp
21+
import androidx.compose.ui.unit.sp
22+
import com.codee.R
23+
import com.codee.app.core.extensions.localize
24+
import com.codee.app.resources.locale.strings.AppStrings
25+
import com.codee.app.resources.locale.strings.CodeeStrings
26+
import com.google.android.material.color.MaterialColors
1227

13-
@Preview
1428
@Composable
1529
fun ProjectsView() = Scaffold(
16-
topBar = { Toolbar(title ="Codee") },
30+
topBar = { Toolbar() },
1731
floatingActionButton = { FAB() }
1832
) {
19-
33+
LazyColumn {
34+
items(listOf(1, 2, 3)) {
35+
ProjectItem(name = "Some project")
36+
}
37+
}
2038
}
2139

2240
@Composable
23-
private fun Toolbar(title:String) = TopAppBar(
24-
title = { Text(text = title) }
41+
private fun Toolbar() = TopAppBar(
42+
title = { Text(text = CodeeStrings.projects.localize()) }
2543
)
2644

2745
@Composable
@@ -30,7 +48,30 @@ private fun FAB() = FloatingActionButton(
3048

3149
}) {
3250
Image(
33-
imageVector = Icons.Outlined.Create,
51+
imageVector = Icons.Outlined.Add,
3452
contentDescription = null
3553
)
54+
}
55+
56+
@Composable
57+
private fun ProjectItem(name: String) = Row(
58+
modifier = Modifier
59+
.selectable(selected = false) {
60+
61+
},
62+
verticalAlignment = Alignment.CenterVertically
63+
) {
64+
Image(
65+
painter = painterResource(id = R.mipmap.ic_launcher),
66+
modifier = Modifier.size(60.dp).padding(12.dp),
67+
contentDescription = "test"
68+
)
69+
Column(Modifier.fillMaxSize(), verticalArrangement = Arrangement.Center) {
70+
Text(text = name, fontSize = 18.sp)
71+
Text(
72+
modifier = Modifier.alpha(0.8F),
73+
text = "/storage/emulated/0/data/somewhere",
74+
fontSize = 12.sp
75+
)
76+
}
3677
}

‎app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml‎

Lines changed: 0 additions & 5 deletions
This file was deleted.

‎app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml‎

Lines changed: 0 additions & 5 deletions
This file was deleted.
-1.37 KB
Binary file not shown.
-2.83 KB
Binary file not shown.

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /