Skip to content
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 7 additions & 25 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,28 +1,10 @@
### Gradle ###
.gradle/
build/

### IDE ###
.gradle
*.iml

/.idea/
/.idea/caches
/.idea/libraries
/.idea/modules.xml
/.idea/workspace.xml
/.idea/navEditor.xml
/.idea/assetWizardSettings.xml

### Kotlin ###

/.kotlin/

### Android ###
.idea/
build/
out/
local.properties
/captures
.externalNativeBuild
.cxx

### OS ###

.DS_Store
xcuserdata/
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should't this file have the same contents as on #42 ?

Pods/
/.kotlin/
9 changes: 3 additions & 6 deletions app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@ kotlin {
}

android {
compileSdk = 35
compileSdk = libs.versions.android.compileSdk.get().toInt()

defaultConfig {
applicationId = "com.jetbrains.simplelogin.androidapp"
minSdk = 24
targetSdk = 35
minSdk = libs.versions.android.minSdk.get().toInt()
targetSdk = libs.versions.android.targetSdk.get().toInt()
versionCode = 1
versionName = "1.0"

Expand All @@ -38,9 +38,6 @@ android {
sourceCompatibility = JavaVersion.VERSION_11
targetCompatibility = JavaVersion.VERSION_11
}
buildFeatures {
compose = true
}
namespace = "com.jetbrains.simplelogin.androidapp"
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import android.os.Bundle
import android.util.Log
import android.widget.Toast
import androidx.activity.compose.setContent
import androidx.activity.enableEdgeToEdge
import androidx.appcompat.app.AppCompatActivity
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Surface
Expand All @@ -18,6 +19,7 @@ import com.jetbrains.simplelogin.shared.data.LoginRepository
class LoginActivity : AppCompatActivity() {

override fun onCreate(savedInstanceState: Bundle?) {
enableEdgeToEdge()
super.onCreate(savedInstanceState)

Log.i("Login Activity", "Hello from shared module: " + (Greeting().greet()))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.focus.FocusRequester
import androidx.compose.ui.focus.focusRequester
import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.input.ImeAction
import androidx.compose.ui.text.input.KeyboardType
Expand Down Expand Up @@ -42,8 +41,8 @@ fun LoginScreen(

Column(
modifier = Modifier
.fillMaxSize()
.padding(16.dp),
.safeContentPadding()
.fillMaxSize(),
horizontalAlignment = Alignment.CenterHorizontally,
verticalArrangement = Arrangement.Center
) {
Expand Down
21 changes: 10 additions & 11 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,27 +1,26 @@
[versions]
android-gradlePlugin = "8.9.0"
android-gradlePlugin = "8.10.1"
android-compileSdk = "35"
android-minSdk = "24"
android-targetSdk = "35"
androidx-activityCompose = "1.10.1"
androidx-appcompat = "1.7.0"
androidx-appcompat = "1.7.1"
androidx-constraintlayout = "2.2.1"
androidx-core-ktx = "1.16.0"
androidx-espresso-core = "3.6.1"
androidx-material = "1.12.0"
androidx-test-junit = "1.2.1"
annotation = "1.9.1"
compose = "1.7.8"
compose-plugin = "1.7.3"
compose = "1.8.3"
junit = "4.13.2"
kotlin = "2.1.10"
kotlinxCoroutinesCore = "1.10.1"
lifecycleLivedataKtx = "2.8.7"
lifecycleRuntimeKtx = "2.8.7"
lifecycleViewmodelCompose = "2.8.7"
kotlin = "2.2.0"
kotlinxCoroutinesCore = "1.10.2"
lifecycleLivedataKtx = "2.9.1"
lifecycleRuntimeKtx = "2.9.1"
lifecycleViewmodelCompose = "2.9.1"
material3 = "1.3.2"
kotlinStdlib = "2.1.10"
kotlinTest = "2.1.10"
kotlinStdlib = "2.2.0"
kotlinTest = "2.1.21"
runner = "1.6.2"
core = "1.6.1"

Expand Down
Binary file not shown.

This file was deleted.

This file was deleted.

Loading