From 1f22b5c8c88bc25cd40d9ff04b37fc6012281d66 Mon Sep 17 00:00:00 2001
From: 2ndbeam <2ndbeam@disroot.org>
Date: Wed, 30 Jul 2025 09:40:25 +0300
Subject: [PATCH] Second Activity and bitmap

---
 app/build.gradle.kts                          |  5 +++-
 app/src/main/AndroidManifest.xml              |  3 +++
 .../java/com/mirenkov/ktheightmap/Config.kt   | 12 ++++++++++
 .../com/mirenkov/ktheightmap/MainActivity.kt  |  5 +++-
 .../mirenkov/ktheightmap/SettingsActivity.kt  | 18 +++++++++++++++
 .../java/com/mirenkov/ktheightmap/Tile.kt     | 23 +++++++++++++++----
 gradle/libs.versions.toml                     |  6 +++++
 7 files changed, 66 insertions(+), 6 deletions(-)
 create mode 100644 app/src/main/java/com/mirenkov/ktheightmap/Config.kt
 create mode 100644 app/src/main/java/com/mirenkov/ktheightmap/SettingsActivity.kt

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 8a647cf..17a80af 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -11,7 +11,7 @@ android {
 
     defaultConfig {
         applicationId = "com.mirenkov.ktheightmap"
-        minSdk = 24
+        minSdk = 26
         targetSdk = 35
         versionCode = 1
         versionName = "1.0"
@@ -44,6 +44,9 @@ dependencies {
     implementation(libs.androidx.room.common.jvm)
     implementation(libs.androidx.room.runtime.android)
     implementation(libs.androidx.lifecycle.viewmodel.compose.android)
+    implementation(libs.androidx.appcompat)
+    implementation(libs.material)
+    implementation(libs.androidx.activity)
     val room_version = "2.7.2"
 
     ksp("androidx.room:room-compiler:$room_version")
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 2496e91..fd10a14 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -12,6 +12,9 @@
         android:supportsRtl="true"
         android:theme="@style/Theme.KtHeightMap"
         tools:targetApi="31">
+        <activity
+            android:name=".SettingsActivity"
+            android:exported="false" />
         <activity
             android:name=".MainActivity"
             android:exported="true"
diff --git a/app/src/main/java/com/mirenkov/ktheightmap/Config.kt b/app/src/main/java/com/mirenkov/ktheightmap/Config.kt
new file mode 100644
index 0000000..06c386a
--- /dev/null
+++ b/app/src/main/java/com/mirenkov/ktheightmap/Config.kt
@@ -0,0 +1,12 @@
+package com.mirenkov.ktheightmap
+
+class Config {
+    companion object {
+        private var INSTANCE: Config = Config()
+        fun getInstance(): Config {
+            synchronized(this) {
+                return INSTANCE
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/mirenkov/ktheightmap/MainActivity.kt b/app/src/main/java/com/mirenkov/ktheightmap/MainActivity.kt
index f11bc4a..530984c 100644
--- a/app/src/main/java/com/mirenkov/ktheightmap/MainActivity.kt
+++ b/app/src/main/java/com/mirenkov/ktheightmap/MainActivity.kt
@@ -1,6 +1,7 @@
 package com.mirenkov.ktheightmap
 
 import android.app.Application
+import android.content.Intent
 import android.os.Bundle
 import android.util.Log
 import androidx.activity.ComponentActivity
@@ -80,9 +81,11 @@ fun Main(vm: TileViewModel = viewModel()) {
 
 @Composable
 fun ToolButton() {
+    val context = LocalContext.current
     FloatingActionButton(
         onClick = {
-            Log.i(TAG, "Hello, gryadki!")
+            val intent = Intent(context, SettingsActivity::class.java)
+            context.startActivity(intent)
         }
     ) { Icon(Icons.Filled.Build, contentDescription = "Tools") }
 }
diff --git a/app/src/main/java/com/mirenkov/ktheightmap/SettingsActivity.kt b/app/src/main/java/com/mirenkov/ktheightmap/SettingsActivity.kt
new file mode 100644
index 0000000..dd15f19
--- /dev/null
+++ b/app/src/main/java/com/mirenkov/ktheightmap/SettingsActivity.kt
@@ -0,0 +1,18 @@
+package com.mirenkov.ktheightmap
+
+import android.os.Bundle
+import androidx.activity.ComponentActivity
+import androidx.activity.compose.setContent
+import androidx.activity.enableEdgeToEdge
+import com.mirenkov.ktheightmap.ui.theme.KtHeightMapTheme
+
+class SettingsActivity : ComponentActivity() {
+        override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        enableEdgeToEdge()
+        setContent {
+            KtHeightMapTheme {
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/mirenkov/ktheightmap/Tile.kt b/app/src/main/java/com/mirenkov/ktheightmap/Tile.kt
index 359aa5b..4420051 100644
--- a/app/src/main/java/com/mirenkov/ktheightmap/Tile.kt
+++ b/app/src/main/java/com/mirenkov/ktheightmap/Tile.kt
@@ -1,8 +1,10 @@
 package com.mirenkov.ktheightmap
 
+import android.graphics.Bitmap
+import android.graphics.BitmapFactory
 import androidx.room.ColumnInfo
 import androidx.room.Entity
-import androidx.room.PrimaryKey
+import java.util.Base64
 
 @Entity(tableName = "tiles", primaryKeys = [ "x", "y", "level" ])
 class Tile {
@@ -18,13 +20,26 @@ class Tile {
     @ColumnInfo(name = "data")
     var base64: String? = null
 
-
-
-    constructor() {}
+    constructor()
 
     constructor(x: Int, y: Int, level: Int) {
         this.x = x
         this.y = y
         this.level = level
     }
+
+    constructor(x: Int, y: Int, level: Int, base64: String) {
+        this.x = x
+        this.y = y
+        this.level = level
+        this.base64 = base64
+    }
+
+    fun getBitmap(): Bitmap? {
+        if (this.base64 == null)
+            return null
+        val ba = Base64.getDecoder().decode(this.base64)
+        val bmp = BitmapFactory.decodeByteArray(ba, 0, ba.size)
+        return bmp
+    }
 }
\ No newline at end of file
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 1290105..3642cb8 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -11,6 +11,9 @@ composeBom = "2024.09.00"
 roomCommonJvm = "2.7.2"
 roomRuntimeAndroid = "2.7.2"
 lifecycleViewmodelComposeAndroid = "2.9.2"
+appcompat = "1.6.1"
+material = "1.10.0"
+activity = "1.10.1"
 
 [libraries]
 androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "coreKtx" }
@@ -30,6 +33,9 @@ androidx-material3 = { group = "androidx.compose.material3", name = "material3"
 androidx-room-common-jvm = { group = "androidx.room", name = "room-common-jvm", version.ref = "roomCommonJvm" }
 androidx-room-runtime-android = { group = "androidx.room", name = "room-runtime-android", version.ref = "roomRuntimeAndroid" }
 androidx-lifecycle-viewmodel-compose-android = { group = "androidx.lifecycle", name = "lifecycle-viewmodel-compose-android", version.ref = "lifecycleViewmodelComposeAndroid" }
+androidx-appcompat = { group = "androidx.appcompat", name = "appcompat", version.ref = "appcompat" }
+material = { group = "com.google.android.material", name = "material", version.ref = "material" }
+androidx-activity = { group = "androidx.activity", name = "activity", version.ref = "activity" }
 
 [plugins]
 android-application = { id = "com.android.application", version.ref = "agp" }