socrates/batterytracker
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Jetpack Compose????

Browse Source
This commit is contained in:
sockenklaus
2022-07-15 14:42:56 +02:00
parent b25f1aea76
commit 82b85c20c8
16 changed files with 215 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/main/AndroidManifest.xml
View File

@@ -13,6 +13,11 @@
android:supportsRtl="true"
android:theme="@style/Theme.BatteryTracker"
tools:targetApi="31">
<activity
android:name=".AddBattery"
android:exported="false"
android:label="@string/title_activity_add_battery"
android:theme="@style/Theme.BatteryTracker" />
<activity
android:name=".MainActivity"
android:exported="true"

71
app/src/main/java/com/sockenklaus/batterytracker/AddBattery.kt Normal file
View File

@@ -0,0 +1,71 @@
package com.sockenklaus.batterytracker
import android.os.Bundle
import androidx.activity.ComponentActivity
import androidx.activity.compose.setContent
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.material.MaterialTheme
import androidx.compose.material.OutlinedTextField
import androidx.compose.material.Surface
import androidx.compose.material.Text
import androidx.compose.runtime.Composable
import androidx.compose.runtime.getValue
import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.saveable.rememberSaveable
import androidx.compose.runtime.setValue
import androidx.compose.ui.Modifier
import androidx.compose.ui.text.TextRange
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.text.input.TextFieldValue
import com.sockenklaus.batterytracker.ui.theme.BatteryTrackerTheme
class AddBattery : ComponentActivity() {
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
setContent {
BatteryTrackerTheme {
// A surface container using the 'background' color from the theme
Surface(
modifier = Modifier.fillMaxSize(),
color = MaterialTheme.colors.background
) {
Row() {
Text("Battery ID")
}
}
}
}
}
}
@Composable
fun myTextField(){
var batteryId by rememberSaveable(stateSaver = TextFieldValue.Saver) {
mutableStateOf(TextFieldValue("example", TextRange(0,7)))
}
OutlinedTextField(
value = batteryId,
onValueChange = {batteryId = it},
label = { Text("Battery ID") }
)
}
@Composable
fun Greeting(name: String) {
Text(text = "Hello $name!")
}
@Preview(showBackground = true)
@Composable
fun DefaultPreview() {
BatteryTrackerTheme {
Greeting("Android")
}
}

2
app/src/main/java/com/sockenklaus/batterytracker/MainActivity.kt
View File

@@ -2,8 +2,6 @@ package com.sockenklaus.batterytracker
import android.os.Bundle
import android.view.Menu
import android.view.MenuItem
import com.google.android.material.snackbar.Snackbar
import com.google.android.material.navigation.NavigationView
import androidx.navigation.findNavController
import androidx.navigation.ui.AppBarConfiguration

2
app/src/main/java/com/sockenklaus/batterytracker/ui/AddBatteryFragment.kt
View File

@@ -6,6 +6,7 @@ import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import com.sockenklaus.batterytracker.R
import com.sockenklaus.batterytracker.databinding.FragmentAddBatteryBinding
// TODO: Rename parameter arguments, choose names that match
// the fragment initialization parameters, e.g. ARG_ITEM_NUMBER
@@ -24,6 +25,7 @@ class AddBatteryFragment : Fragment() {
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
arguments?.let {
param1 = it.getString(ARG_PARAM1)
param2 = it.getString(ARG_PARAM2)

1
app/src/main/java/com/sockenklaus/batterytracker/ui/add_charge/AddChargeFragment.kt
View File

@@ -69,7 +69,6 @@ class AddChargeFragment : Fragment() {
}
private fun openDatePicker() {
println("Clicked edit Field")
val datePicker = MaterialDatePicker.Builder.datePicker()
.setTitleText("Select date")

8
app/src/main/java/com/sockenklaus/batterytracker/ui/theme/Color.kt Normal file
View File

@@ -0,0 +1,8 @@
package com.sockenklaus.batterytracker.ui.theme
import androidx.compose.ui.graphics.Color
val Purple200 = Color(0xFFBB86FC)
val Purple500 = Color(0xFF6200EE)
val Purple700 = Color(0xFF3700B3)
val Teal200 = Color(0xFF03DAC5)

11
app/src/main/java/com/sockenklaus/batterytracker/ui/theme/Shape.kt Normal file
View File

@@ -0,0 +1,11 @@
package com.sockenklaus.batterytracker.ui.theme
import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.material.Shapes
import androidx.compose.ui.unit.dp
val Shapes = Shapes(
small = RoundedCornerShape(4.dp),
medium = RoundedCornerShape(4.dp),
large = RoundedCornerShape(0.dp)
)

47
app/src/main/java/com/sockenklaus/batterytracker/ui/theme/Theme.kt Normal file
View File

@@ -0,0 +1,47 @@
package com.sockenklaus.batterytracker.ui.theme
import androidx.compose.foundation.isSystemInDarkTheme
import androidx.compose.material.MaterialTheme
import androidx.compose.material.darkColors
import androidx.compose.material.lightColors
import androidx.compose.runtime.Composable
private val DarkColorPalette = darkColors(
primary = Purple200,
primaryVariant = Purple700,
secondary = Teal200
)
private val LightColorPalette = lightColors(
primary = Purple500,
primaryVariant = Purple700,
secondary = Teal200
/* Other default colors to override
background = Color.White,
surface = Color.White,
onPrimary = Color.White,
onSecondary = Color.Black,
onBackground = Color.Black,
onSurface = Color.Black,
*/
)
@Composable
fun BatteryTrackerTheme(
darkTheme: Boolean = isSystemInDarkTheme(),
content: @Composable () -> Unit
) {
val colors = if (darkTheme) {
DarkColorPalette
} else {
LightColorPalette
}
MaterialTheme(
colors = colors,
typography = Typography,
shapes = Shapes,
content = content
)
}

28
app/src/main/java/com/sockenklaus/batterytracker/ui/theme/Type.kt Normal file
View File

@@ -0,0 +1,28 @@
package com.sockenklaus.batterytracker.ui.theme
import androidx.compose.material.Typography
import androidx.compose.ui.text.TextStyle
import androidx.compose.ui.text.font.FontFamily
import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.unit.sp
// Set of Material typography styles to start with
val Typography = Typography(
body1 = TextStyle(
fontFamily = FontFamily.Default,
fontWeight = FontWeight.Normal,
fontSize = 16.sp
)
/* Other default text styles to override
button = TextStyle(
fontFamily = FontFamily.Default,
fontWeight = FontWeight.W500,
fontSize = 14.sp
),
caption = TextStyle(
fontFamily = FontFamily.Default,
fontWeight = FontWeight.Normal,
fontSize = 12.sp
)
*/
)

2
app/src/main/res/layout/app_bar_main.xml
View File

@@ -11,7 +11,7 @@
android:layout_height="wrap_content"
android:theme="@style/Theme.BatteryTracker.AppBarOverlay">
<androidx.appcompat.widget.Toolbar
<com.google.android.material.appbar.MaterialToolbar
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"

7
app/src/main/res/layout/nav_header_main.xml
View File

@@ -9,15 +9,14 @@
android:paddingLeft="@dimen/activity_horizontal_margin"
android:paddingTop="@dimen/activity_vertical_margin"
android:paddingRight="@dimen/activity_horizontal_margin"
android:paddingBottom="@dimen/activity_vertical_margin"
android:theme="@style/ThemeOverlay.AppCompat.Dark">
android:paddingBottom="@dimen/activity_vertical_margin">
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingTop="@dimen/nav_header_vertical_spacing"
android:text="@string/nav_header_title"
android:textAppearance="@style/TextAppearance.Material3.ActionBar.Title"
android:textColor="#FFFFFF" />
android:textAppearance="@style/TextAppearance.MaterialComponents.Headline5"
/>
</LinearLayout>

1
app/src/main/res/values/strings.xml
View File

@@ -26,4 +26,5 @@
<string name="hint_enter_declared_capacity">Enter declared capacity</string>
<string name="declared_capacity">Declared Capacity</string>
<string name="button_save_battery">Save Battery</string>
<string name="title_activity_add_battery">AddBattery</string>
</resources>

2
app/src/main/res/values/themes.xml
View File

@@ -10,7 +10,7 @@
<item name="colorSecondaryVariant">@color/teal_700</item>
<item name="colorOnSecondary">@color/black</item>
<!-- Status bar color. -->
<item name="android:statusBarColor" >?attr/colorPrimaryVariant</item>
<item name="android:statusBarColor">?attr/colorPrimaryVariant</item>
<!-- Customize your theme here. -->
</style>