Adding view activity

awxkee · Sep 20, 2024 · 15d2647 · 15d2647
1 parent a68861a
commit 15d2647
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 17 deletions.
diff --git a/app/src/main/java/com/awxkee/jxlcoder/app/glide/MainActivity.kt b/app/src/main/java/com/awxkee/jxlcoder/app/glide/MainActivity.kt
@@ -4,10 +4,13 @@ import android.content.Intent
 import android.os.Bundle
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
+import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.width
 import androidx.compose.material3.Button
+import androidx.compose.material3.FilledTonalButton
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Surface
 import androidx.compose.material3.Text
@@ -32,20 +35,22 @@ class MainActivity : ComponentActivity() {
                 ) {
                     Greeting("Android")
 
-                    Button(modifier = Modifier
-                        .width(50.dp)
-                        .height(
-                            50.dp
-                        ), onClick = {
-                        startActivity(Intent(this@MainActivity, ProbeActivity::class.java))
-                    }) {
-                        Text("View Activity")
-                    }
+                    Column {
+                        GlideImage(
+                            model = "https://wh.aimuse.online/preset/jxl_icc_12.bit.jxl",
+                            contentDescription = ""
+                        )
 
-                    GlideImage(
-                        model = "https://wh.aimuse.online/preset/jxl_icc_12.bit.jxl",
-                        contentDescription = ""
-                    )
+                        FilledTonalButton(modifier = Modifier
+                            .padding(start = 8.dp, top = 8.dp)
+                            .height(
+                                50.dp
+                            ), onClick = {
+                            startActivity(Intent(this@MainActivity, ProbeActivity::class.java))
+                        }) {
+                            Text("View View Activity")
+                        }
+                    }
 
                 }
             }

diff --git a/app/src/main/java/com/awxkee/jxlcoder/app/glide/ProbeActivity.kt b/app/src/main/java/com/awxkee/jxlcoder/app/glide/ProbeActivity.kt
@@ -29,6 +29,7 @@
 package com.awxkee.jxlcoder.app.glide
 
 import android.os.Bundle
+import android.widget.Button
 import androidx.activity.ComponentActivity
 import com.bumptech.glide.Glide
 
@@ -42,6 +43,10 @@ class ProbeActivity: ComponentActivity() {
             .asBitmap()
             .load("https://wh.aimuse.online/preset/jxl_icc_12.bit.jxl")
             .into(findViewById(R.id.image_view))
+
+        findViewById<Button>(R.id.out_button).setOnClickListener {
+            finish()
+        }
     }
 
 }
diff --git a/app/src/main/res/layout/activity_probe.xml b/app/src/main/res/layout/activity_probe.xml
@@ -27,13 +27,21 @@
   -->
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:orientation="vertical">
 
     <ImageView
-        android:layout_width="wrap_content"
         android:id="@+id/image_view"
-        android:layout_height="wrap_content"/>
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content" />
+
+    <Button
+        android:id="@+id/out_button"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="8dp"
+        android:layout_marginTop="8dp"
+        android:text="@string/finish" />
 
 </LinearLayout>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -1,3 +1,4 @@
 <resources>
     <string name="app_name">JxlCoderGlide</string>
+    <string name="finish">Finish</string>
 </resources>