From 82b85c20c851de712a31d2c244bbedd3e9235e45 Mon Sep 17 00:00:00 2001
From: sockenklaus <sockenklaus@gmail.com>
Date: Fri, 15 Jul 2022 14:42:56 +0200
Subject: [PATCH] Jetpack Compose????

---
 .idea/deploymentTargetDropDown.xml            | 17 -----
 app/build.gradle                              | 37 ++++++++--
 app/src/main/AndroidManifest.xml              |  5 ++
 .../sockenklaus/batterytracker/AddBattery.kt  | 71 +++++++++++++++++++
 .../batterytracker/MainActivity.kt            |  2 -
 .../batterytracker/ui/AddBatteryFragment.kt   |  2 +
 .../ui/add_charge/AddChargeFragment.kt        |  1 -
 .../batterytracker/ui/theme/Color.kt          |  8 +++
 .../batterytracker/ui/theme/Shape.kt          | 11 +++
 .../batterytracker/ui/theme/Theme.kt          | 47 ++++++++++++
 .../batterytracker/ui/theme/Type.kt           | 28 ++++++++
 app/src/main/res/layout/app_bar_main.xml      |  2 +-
 app/src/main/res/layout/nav_header_main.xml   |  7 +-
 app/src/main/res/values/strings.xml           |  1 +
 app/src/main/res/values/themes.xml            |  2 +-
 build.gradle                                  |  8 ++-
 16 files changed, 215 insertions(+), 34 deletions(-)
 delete mode 100644 .idea/deploymentTargetDropDown.xml
 create mode 100644 app/src/main/java/com/sockenklaus/batterytracker/AddBattery.kt
 create mode 100644 app/src/main/java/com/sockenklaus/batterytracker/ui/theme/Color.kt
 create mode 100644 app/src/main/java/com/sockenklaus/batterytracker/ui/theme/Shape.kt
 create mode 100644 app/src/main/java/com/sockenklaus/batterytracker/ui/theme/Theme.kt
 create mode 100644 app/src/main/java/com/sockenklaus/batterytracker/ui/theme/Type.kt

diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml
deleted file mode 100644
index d706a1f..0000000
--- a/.idea/deploymentTargetDropDown.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="deploymentTargetDropDown">
-    <runningDeviceTargetSelectedWithDropDown>
-      <Target>
-        <type value="RUNNING_DEVICE_TARGET" />
-        <deviceKey>
-          <Key>
-            <type value="SERIAL_NUMBER" />
-            <value value="7abcf1eb" />
-          </Key>
-        </deviceKey>
-      </Target>
-    </runningDeviceTargetSelectedWithDropDown>
-    <timeTargetWasSelectedWithDropDown value="2022-07-13T21:15:07.915788300Z" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
index 08af63b..07fb30b 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -14,6 +14,9 @@ android {
         versionName "1.0"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+        vectorDrawables {
+            useSupportLibrary true
+        }
     }
 
     buildTypes {
@@ -31,28 +34,50 @@ android {
     }
     buildFeatures {
         viewBinding true
+        compose true
+    }
+
+    composeOptions {
+        kotlinCompilerExtensionVersion '1.2.0'
+    }
+    packagingOptions {
+        resources {
+            excludes += '/META-INF/{AL2.0,LGPL2.1}'
+        }
     }
 }
 
 dependencies {
-    def room_version = "2.4.2"
+    implementation 'androidx.room:room-runtime:2.5.0-alpha02'
+    implementation "androidx.compose.ui:ui:$compose_version"
+    implementation "androidx.compose.ui:ui-tooling-preview:$compose_version"
+    implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.3.1'
+    annotationProcessor 'androidx.room:room-compiler:2.5.0-alpha02'
 
-    implementation "androidx.room:room-runtime:$room_version"
-    annotationProcessor "androidx.room:room-compiler:$room_version"
-
-    implementation "androidx.room:room-rxjava3:$room_version"
+    implementation 'androidx.room:room-rxjava3:2.5.0-alpha02'
     implementation "androidx.room:room-paging:2.5.0-alpha02"
 
+    implementation 'com.google.android.material:material:1.6.1'
+
     implementation 'androidx.core:core-ktx:1.8.0'
     implementation 'androidx.appcompat:appcompat:1.4.2'
-    implementation 'com.google.android.material:material:1.6.1'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
     implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.5.0'
     implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.0'
     implementation 'androidx.navigation:navigation-fragment-ktx:2.5.0'
     implementation 'androidx.navigation:navigation-ui-ktx:2.5.0'
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
+
+    implementation 'androidx.activity:activity-compose:1.5.0'
+    implementation 'androidx.compose.material:material:1.2.0-rc03'
+    implementation 'androidx.compose.animation:animation:1.2.0-rc03'
+    implementation 'androidx.compose.ui:ui-tooling:1.2.0-rc03'
+    implementation 'androidx.lifecycle:lifecycle-viewmodel-compose:2.5.0'
+    implementation 'com.google.android.material:compose-theme-adapter:1.1.14'
+
     testImplementation 'junit:junit:4.13.2'
+    androidTestImplementation 'androidx.compose.ui:ui-test-junit4:1.2.0-rc03'
     androidTestImplementation 'androidx.test.ext:junit:1.1.3'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
+    debugImplementation "androidx.compose.ui:ui-test-manifest:$compose_version"
 }
\ No newline at end of file
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 07ecc5d..a334e98 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -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"
diff --git a/app/src/main/java/com/sockenklaus/batterytracker/AddBattery.kt b/app/src/main/java/com/sockenklaus/batterytracker/AddBattery.kt
new file mode 100644
index 0000000..b7ca605
--- /dev/null
+++ b/app/src/main/java/com/sockenklaus/batterytracker/AddBattery.kt
@@ -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")
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/sockenklaus/batterytracker/MainActivity.kt b/app/src/main/java/com/sockenklaus/batterytracker/MainActivity.kt
index 8d8c84a..5e18229 100644
--- a/app/src/main/java/com/sockenklaus/batterytracker/MainActivity.kt
+++ b/app/src/main/java/com/sockenklaus/batterytracker/MainActivity.kt
@@ -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
diff --git a/app/src/main/java/com/sockenklaus/batterytracker/ui/AddBatteryFragment.kt b/app/src/main/java/com/sockenklaus/batterytracker/ui/AddBatteryFragment.kt
index 881c772..57babcb 100644
--- a/app/src/main/java/com/sockenklaus/batterytracker/ui/AddBatteryFragment.kt
+++ b/app/src/main/java/com/sockenklaus/batterytracker/ui/AddBatteryFragment.kt
@@ -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)
diff --git a/app/src/main/java/com/sockenklaus/batterytracker/ui/add_charge/AddChargeFragment.kt b/app/src/main/java/com/sockenklaus/batterytracker/ui/add_charge/AddChargeFragment.kt
index b0c247a..4c9b48d 100644
--- a/app/src/main/java/com/sockenklaus/batterytracker/ui/add_charge/AddChargeFragment.kt
+++ b/app/src/main/java/com/sockenklaus/batterytracker/ui/add_charge/AddChargeFragment.kt
@@ -69,7 +69,6 @@ class AddChargeFragment : Fragment() {
     }
 
     private fun openDatePicker() {
-        println("Clicked edit Field")
 
         val datePicker = MaterialDatePicker.Builder.datePicker()
             .setTitleText("Select date")
diff --git a/app/src/main/java/com/sockenklaus/batterytracker/ui/theme/Color.kt b/app/src/main/java/com/sockenklaus/batterytracker/ui/theme/Color.kt
new file mode 100644
index 0000000..3870eb0
--- /dev/null
+++ b/app/src/main/java/com/sockenklaus/batterytracker/ui/theme/Color.kt
@@ -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)
\ No newline at end of file
diff --git a/app/src/main/java/com/sockenklaus/batterytracker/ui/theme/Shape.kt b/app/src/main/java/com/sockenklaus/batterytracker/ui/theme/Shape.kt
new file mode 100644
index 0000000..8c4e070
--- /dev/null
+++ b/app/src/main/java/com/sockenklaus/batterytracker/ui/theme/Shape.kt
@@ -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)
+)
\ No newline at end of file
diff --git a/app/src/main/java/com/sockenklaus/batterytracker/ui/theme/Theme.kt b/app/src/main/java/com/sockenklaus/batterytracker/ui/theme/Theme.kt
new file mode 100644
index 0000000..867d449
--- /dev/null
+++ b/app/src/main/java/com/sockenklaus/batterytracker/ui/theme/Theme.kt
@@ -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
+    )
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/sockenklaus/batterytracker/ui/theme/Type.kt b/app/src/main/java/com/sockenklaus/batterytracker/ui/theme/Type.kt
new file mode 100644
index 0000000..6b7ed3e
--- /dev/null
+++ b/app/src/main/java/com/sockenklaus/batterytracker/ui/theme/Type.kt
@@ -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
+    )
+    */
+)
\ No newline at end of file
diff --git a/app/src/main/res/layout/app_bar_main.xml b/app/src/main/res/layout/app_bar_main.xml
index 75bd898..3f2bd1e 100644
--- a/app/src/main/res/layout/app_bar_main.xml
+++ b/app/src/main/res/layout/app_bar_main.xml
@@ -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"
diff --git a/app/src/main/res/layout/nav_header_main.xml b/app/src/main/res/layout/nav_header_main.xml
index 0a3d053..37881c1 100644
--- a/app/src/main/res/layout/nav_header_main.xml
+++ b/app/src/main/res/layout/nav_header_main.xml
@@ -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>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 540ff0c..8994e4f 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -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>
\ No newline at end of file
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 933e8ee..5f930e3 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -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>
 
diff --git a/build.gradle b/build.gradle
index 932e4c5..d19836f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,8 +1,12 @@
-// Top-level build file where you can add configuration options common to all sub-projects/modules.
+buildscript {
+    ext {
+        compose_version = '1.1.0-beta01'
+    }
+}// Top-level build file where you can add configuration options common to all sub-projects/modules.
 plugins {
     id 'com.android.application' version '7.2.1' apply false
     id 'com.android.library' version '7.2.1' apply false
-    id 'org.jetbrains.kotlin.android' version '1.7.10' apply false
+    id 'org.jetbrains.kotlin.android' version '1.7.0' apply false
 }
 
 task clean(type: Delete) {