Merge pull request #80 from LeoAndo/release-v1.0.3

Release v1.0.3

Author: LeoAndo

.github/workflows/ci.yml

@@ -1,6 +1,7 @@
 name: Android CI
 
 on:
+  push:
   pull_request:
   workflow_dispatch:
 

README.md

@@ -5,6 +5,9 @@ Minimalist template for personal app development<br>
 - IDE: Android Studio Electric Eel 2022.1.1
 - Support OS version: 10.0 later
 
+# setup
+see [wiki](https://github.com/LeoAndo/AndroidAppTemplate/wiki)
+
 # features
 - M3 (Custom)
 - added basic library (network / DI etc.)
@@ -14,7 +17,4 @@ Minimalist template for personal app development<br>
 
 # capture: Android Resizable Emulator API 33
 
-<img src="https://user-images.githubusercontent.com/16476224/221370788-e7929893-7519-4f6c-ae0c-6a311291492c.png" width=320 />
-
-# refs
-https://github.com/LeoAndo/AndroidGithubSearch<br>
+<img src="https://user-images.githubusercontent.com/16476224/222953372-32fc783a-c7da-480f-8529-6c794779d636.png" width=320 />

app/build.gradle

@@ -18,8 +18,8 @@ android {
         applicationId "com.leoleo.androidapptemplate"
         minSdk 29
         targetSdk 33
-        versionCode 102
-        versionName "1.0.2"
+        versionCode 100
+        versionName "1.0.0"
 
         testInstrumentationRunner "com.leoleo.androidapptemplate.CustomTestRunner"
         vectorDrawables {

app/src/androidTest/java/com/leoleo/androidapptemplate/package-info.kt

@@ -1,4 +1,4 @@
 package com.leoleo.androidapptemplate
 /*
-Tests for Composable functions that use the android library are placed here.
+UITestやAndroid Platform APIに依存するクラスのテストはここに書く
  */

app/src/main/java/com/leoleo/androidapptemplate/ui/compact/CompactMainScreen.kt

@@ -4,8 +4,7 @@ import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.padding
-import androidx.compose.material3.Button
-import androidx.compose.material3.Text
+import androidx.compose.material3.*
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
@@ -18,7 +17,7 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import com.leoleo.androidapptemplate.R
 import com.leoleo.androidapptemplate.ui.component.AppSurface
-import com.leoleo.androidapptemplate.ui.preview.PreviewFoldableDevice
+import com.leoleo.androidapptemplate.ui.preview.PreviewPhoneDevice
 
 @Composable
 fun CompactMainScreen() {
@@ -30,20 +29,26 @@ fun CompactMainScreen() {
     CompactMainScreenStateless(modifier, count, onClick = { count++ })
 }
 
+@OptIn(ExperimentalMaterial3Api::class)
 @Composable
 private fun CompactMainScreenStateless(modifier: Modifier, count: Int, onClick: () -> Unit) {
-    Column(
-        modifier = modifier,
-        verticalArrangement = Arrangement.Center,
-        horizontalAlignment = Alignment.CenterHorizontally
-    ) {
-        Button(onClick = { onClick() }) {
-            Text(text = "CompactMainScreen: $count")
-        }
-    }
+    Scaffold(
+        floatingActionButton = {
+            FloatingActionButton(onClick = { onClick() }) {
+                Text(text = "+")
+            }
+        }, content = { padding ->
+            Column(
+                modifier = modifier.padding(padding),
+                verticalArrangement = Arrangement.Center,
+                horizontalAlignment = Alignment.CenterHorizontally
+            ) {
+                Text(text = "CompactMainScreen: $count")
+            }
+        })
 }
 
-@PreviewFoldableDevice
+@PreviewPhoneDevice
 @Composable
 private fun Prev_CompactMainScreen() {
     val modifier = Modifier

app/src/main/java/com/leoleo/androidapptemplate/ui/component/AppAlertDialog.kt

@@ -0,0 +1,4 @@
+package com.leoleo.androidapptemplate.ui.component
+/*
+Composeの共通コンポーネントはここに配置する
+*/