Skip to content

Commit

Permalink
Added ic_launcher. Updated AddProjectScreen. Set versionName.
Browse files Browse the repository at this point in the history
  • Loading branch information
Sergio Belda Galbis committed Nov 1, 2020
1 parent afec7cf commit 554ef4a
Show file tree
Hide file tree
Showing 19 changed files with 66 additions and 208 deletions.
4 changes: 2 additions & 2 deletions app/build.gradle
Expand Up @@ -8,14 +8,14 @@ plugins {

android {
compileSdkVersion 30
buildToolsVersion "30.0.1"
buildToolsVersion "30.0.2"

defaultConfig {
applicationId "com.sergiobelda.todometer"
minSdkVersion 24
targetSdkVersion 30
versionCode 1
versionName "1.0"
versionName "1.1.0-dev01"

testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}
Expand Down
Binary file added app/src/main/ic_launcher-playstore.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Expand Up @@ -19,6 +19,8 @@ package com.sergiobelda.todometer.ui.addproject
import androidx.compose.foundation.Icon
import androidx.compose.foundation.Text
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.padding
import androidx.compose.material.Button
import androidx.compose.material.IconButton
import androidx.compose.material.MaterialTheme
Expand All @@ -32,7 +34,9 @@ import androidx.compose.runtime.Composable
import androidx.compose.runtime.getValue
import androidx.compose.runtime.savedinstancestate.savedInstanceState
import androidx.compose.runtime.setValue
import androidx.compose.ui.Modifier
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.input.ImeAction
import androidx.compose.ui.unit.dp
import com.sergiobelda.todometer.R
import com.sergiobelda.todometer.model.Project
Expand Down Expand Up @@ -79,12 +83,27 @@ fun AddProjectScreen(
OutlinedTextField(
value = projectName,
onValueChange = { projectName = it },
label = { Text(stringResource(id = R.string.name)) }
label = { Text(stringResource(id = R.string.name)) },
modifier = Modifier.padding(
start = 16.dp,
end = 16.dp,
top = 8.dp,
bottom = 8.dp
).fillMaxWidth(),
imeAction = ImeAction.Next
)
OutlinedTextField(
value = projectDescription,
onValueChange = { projectDescription = it },
label = { Text(stringResource(id = R.string.description)) }
label = { Text(stringResource(id = R.string.description)) },
modifier = Modifier.padding(
start = 16.dp,
end = 16.dp,
top = 8.dp,
bottom = 8.dp
).fillMaxWidth(),
imeAction = ImeAction.Done,
onImeActionPerformed = { _, softwareKeyboardController -> softwareKeyboardController?.hideSoftwareKeyboard() }
)
}
}
Expand Down
30 changes: 0 additions & 30 deletions app/src/main/res/drawable-v24/ic_launcher_foreground.xml

This file was deleted.

170 changes: 0 additions & 170 deletions app/src/main/res/drawable/ic_launcher_background.xml

This file was deleted.

35 changes: 35 additions & 0 deletions app/src/main/res/drawable/ic_launcher_foreground.xml
@@ -0,0 +1,35 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:aapt="http://schemas.android.com/aapt"
android:width="108dp"
android:height="108dp"
android:viewportWidth="108"
android:viewportHeight="108">
<group android:scaleX="0.1476947"
android:scaleY="0.1476947"
android:translateX="31.32"
android:translateY="31.32">
<path
android:pathData="M0,0h307.12v307.12h-307.12z"
android:fillColor="#073042"/>
<path
android:pathData="M116.76,192.05l14.59,-14.51 11.71,11.54 8.74,-8.66L140.09,168.8l11.71,-11.71 20.37,20.45 8.74,-8.74 -20.37,-20.45 11.63,-11.63 11.71,11.63 8.74,-8.74L180.91,128l11.71,-11.71L213,136.72l8.74,-8.74 -20.37,-20.45L213,95.9l11.62,11.63 8.83,-8.74L221.73,87.16l11.71,-11.71L253.72,95.9l8.83,-8.74L242.18,66.71l14.51,-14.59 35.05,35L151.8,227.09Z"
android:fillColor="#7bd69f"/>
<path
android:pathData="M101.364,207.471l26.241,-26.241l35.03,35.03l-26.241,26.241z">
<aapt:attr name="android:fillColor">
<gradient
android:startY="200.02853"
android:startX="146.26451"
android:endY="226.31255"
android:endX="119.9805"
android:type="linear">
<item android:offset="0" android:color="#FF7BD69F"/>
<item android:offset="1" android:color="#FF073042"/>
</gradient>
</aapt:attr>
</path>
<path
android:pathData="M68.343,142.97l83.721,83.721a0.09,0.09 0,0 1,0 0.127l-19.636,19.636a20,20 93.928,0 1,-28.284 0L42.915,185.227a20,20 0,0 1,-0 -28.284L56.916,142.942A8.09,8.09 90,0 1,68.343 142.97Z"
android:fillColor="#7affb4"/>
</group>
</vector>
4 changes: 2 additions & 2 deletions app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
<background android:drawable="@drawable/ic_launcher_background" />
<foreground android:drawable="@drawable/ic_launcher_foreground" />
<background android:drawable="@color/ic_launcher_background"/>
<foreground android:drawable="@drawable/ic_launcher_foreground"/>
</adaptive-icon>
4 changes: 2 additions & 2 deletions app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
<background android:drawable="@drawable/ic_launcher_background" />
<foreground android:drawable="@drawable/ic_launcher_foreground" />
<background android:drawable="@color/ic_launcher_background"/>
<foreground android:drawable="@drawable/ic_launcher_foreground"/>
</adaptive-icon>
Binary file modified app/src/main/res/mipmap-hdpi/ic_launcher.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/src/main/res/mipmap-hdpi/ic_launcher_round.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/src/main/res/mipmap-mdpi/ic_launcher.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/src/main/res/mipmap-mdpi/ic_launcher_round.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/src/main/res/mipmap-xhdpi/ic_launcher.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/src/main/res/mipmap-xxhdpi/ic_launcher.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 4 additions & 0 deletions app/src/main/res/values/ic_launcher_background.xml
@@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<color name="ic_launcher_background">#073042</color>
</resources>

0 comments on commit 554ef4a

Please sign in to comment.