Cleanup

hypertrack · Jul 6, 2023 · 612d596 · 612d596
1 parent 484a8da
commit 612d596
Show file tree

Hide file tree

Showing 14 changed files with 15 additions and 220 deletions.
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/app/build.gradle b/app/build.gradle
@@ -9,7 +9,7 @@ android {
 
     defaultConfig {
         applicationId "com.hypertrack.quickstart.android.webview"
-        minSdk 24
+        minSdk 19
         targetSdk 33
         versionCode 1
         versionName "1.0"
@@ -34,7 +34,7 @@ android {
         jvmTarget = '1.8'
     }
     buildFeatures {
-        compose true
+        compose false
     }
     composeOptions {
         kotlinCompilerExtensionVersion '1.3.2'
@@ -47,21 +47,6 @@ android {
 }
 
 dependencies {
-
-    implementation 'androidx.core:core-ktx:1.8.0'
+    implementation 'androidx.core:core-ktx:1.10.1'
     implementation platform('org.jetbrains.kotlin:kotlin-bom:1.8.0')
-    implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.3.1'
-    implementation 'androidx.activity:activity-compose:1.5.1'
-    implementation platform('androidx.compose:compose-bom:2022.10.00')
-    implementation 'androidx.compose.ui:ui'
-    implementation 'androidx.compose.ui:ui-graphics'
-    implementation 'androidx.compose.ui:ui-tooling-preview'
-    implementation 'androidx.compose.material3:material3'
-    testImplementation 'junit:junit:4.13.2'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.5'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
-    androidTestImplementation platform('androidx.compose:compose-bom:2022.10.00')
-    androidTestImplementation 'androidx.compose.ui:ui-test-junit4'
-    debugImplementation 'androidx.compose.ui:ui-tooling'
-    debugImplementation 'androidx.compose.ui:ui-test-manifest'
 }
diff --git a/...src/androidTest/java/com/hypertrack/quickstart/android/webview/ExampleInstrumentedTest.kt b/...src/androidTest/java/com/hypertrack/quickstart/android/webview/ExampleInstrumentedTest.kt
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -10,13 +10,13 @@
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
-        android:theme="@style/Theme.Quickstart_webview"
+        android:theme="@style/AppTheme"
         tools:targetApi="31">
         <activity
             android:name=".MainActivity"
             android:exported="true"
             android:label="@string/app_name"
-            android:theme="@style/Theme.Quickstart_webview">
+            android:theme="@style/AppTheme">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 

diff --git a/app/src/main/java/com/hypertrack/quickstart/android/webview/MainActivity.kt b/app/src/main/java/com/hypertrack/quickstart/android/webview/MainActivity.kt
@@ -1,46 +1,11 @@
 package com.hypertrack.quickstart.android.webview
 
+import android.app.Activity
 import android.os.Bundle
-import androidx.activity.ComponentActivity
-import androidx.activity.compose.setContent
-import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.Surface
-import androidx.compose.material3.Text
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.tooling.preview.Preview
-import com.hypertrack.quickstart.android.webview.ui.theme.Quickstart_webviewTheme
 
-class MainActivity : ComponentActivity() {
+class MainActivity : Activity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        setContent {
-            Quickstart_webviewTheme {
-                // A surface container using the 'background' color from the theme
-                Surface(
-                    modifier = Modifier.fillMaxSize(),
-                    color = MaterialTheme.colorScheme.background
-                ) {
-                    Greeting("Android")
-                }
-            }
-        }
-    }
-}
-
-@Composable
-fun Greeting(name: String, modifier: Modifier = Modifier) {
-    Text(
-        text = "Hello $name!",
-        modifier = modifier
-    )
-}
 
-@Preview(showBackground = true)
-@Composable
-fun GreetingPreview() {
-    Quickstart_webviewTheme {
-        Greeting("Android")
     }
 }
diff --git a/app/src/main/java/com/hypertrack/quickstart/android/webview/ui/theme/Color.kt b/app/src/main/java/com/hypertrack/quickstart/android/webview/ui/theme/Color.kt
diff --git a/app/src/main/java/com/hypertrack/quickstart/android/webview/ui/theme/Theme.kt b/app/src/main/java/com/hypertrack/quickstart/android/webview/ui/theme/Theme.kt
diff --git a/app/src/main/java/com/hypertrack/quickstart/android/webview/ui/theme/Type.kt b/app/src/main/java/com/hypertrack/quickstart/android/webview/ui/theme/Type.kt
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -1,3 +1,3 @@
 <resources>
-    <string name="app_name">quickstart_webview</string>
-</resources>
+    <string name="app_name">Quickstart Webview</string>
+</resources>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-
-    <style name="Theme.Quickstart_webview" parent="android:Theme.Material.Light.NoActionBar" />
+    <style name="AppTheme" parent="android:Theme.Material.Light.NoActionBar" />
 </resources>
diff --git a/app/src/test/java/com/hypertrack/quickstart/android/webview/ExampleUnitTest.kt b/app/src/test/java/com/hypertrack/quickstart/android/webview/ExampleUnitTest.kt
diff --git a/settings.gradle b/settings.gradle
@@ -12,5 +12,5 @@ dependencyResolutionManagement {
         mavenCentral()
     }
 }
-rootProject.name = "quickstart_webview"
+rootProject.name = "quickstart-webview"
 include ':app'