Skip to content

Commit 5454af2

Browse files
committed
✨ New memo page added
1 parent dd0ffa3 commit 5454af2

File tree

9 files changed

+121
-4
lines changed

9 files changed

+121
-4
lines changed

.idea/misc.xml

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

app/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ android {
2424

2525
dependencies {
2626
implementation fileTree(dir: 'libs', include: ['*.jar'])
27-
implementation"org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
27+
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
2828
implementation 'androidx.appcompat:appcompat:1.0.2'
2929
implementation 'androidx.core:core-ktx:1.0.1'
3030
implementation 'androidx.constraintlayout:constraintlayout:1.1.3'

app/src/main/AndroidManifest.xml

+3
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,13 @@
99
android:roundIcon="@mipmap/ic_launcher_round"
1010
android:supportsRtl="true"
1111
android:theme="@style/AppTheme">
12+
<activity android:name=".addMemo">
13+
</activity>
1214
<activity
1315
android:name=".MainActivity"
1416
android:label="@string/app_name"
1517
android:theme="@style/AppTheme.NoActionBar">
18+
//android:windowSoftInputMode="adjustResize"
1619
<intent-filter>
1720
<action android:name="android.intent.action.MAIN"/>
1821

app/src/main/java/com/example/kotlin_reminder/MainActivity.kt

+3-2
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,12 @@ class MainActivity : AppCompatActivity() {
1616
setSupportActionBar(toolbar)
1717

1818
addButton.setOnClickListener { view ->
19-
Snackbar.make(view, "Replace with your own action", Snackbar.LENGTH_LONG)
20-
.setAction("Action", null).show()
19+
setContentView(R.layout.activity_add_memo)
2120
}
21+
2222
}
2323

24+
2425
override fun onCreateOptionsMenu(menu: Menu): Boolean {
2526
// Inflate the menu; this adds items to the action bar if it is present.
2627
menuInflater.inflate(R.menu.menu_main, menu)
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
package com.example.kotlin_reminder
2+
3+
import androidx.appcompat.app.AppCompatActivity
4+
import android.os.Bundle
5+
import android.widget.Toast
6+
import android.widget.TextView
7+
import kotlinx.android.synthetic.main.activity_add_memo.*
8+
9+
class addMemo : AppCompatActivity() {
10+
11+
override fun onCreate(savedInstanceState: Bundle?) {
12+
super.onCreate(savedInstanceState)
13+
setContentView(R.layout.activity_add_memo)
14+
MemoValidateButton.setOnClickListener {
15+
Toast.makeText(this, "You clicked me.", Toast.LENGTH_SHORT).show()
16+
}
17+
}
18+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,82 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<androidx.constraintlayout.widget.ConstraintLayout
3+
xmlns:android="http://schemas.android.com/apk/res/android"
4+
xmlns:tools="http://schemas.android.com/tools"
5+
xmlns:app="http://schemas.android.com/apk/res-auto"
6+
android:layout_width="match_parent"
7+
android:layout_height="match_parent"
8+
tools:context=".addMemo">
9+
<androidx.appcompat.widget.Toolbar
10+
android:layout_width="0dp"
11+
android:layout_height="0dp"
12+
android:background="?attr/colorPrimary"
13+
android:theme="?attr/actionBarTheme"
14+
android:minHeight="?attr/actionBarSize"
15+
android:id="@+id/toolbar2"
16+
app:layout_constraintBottom_toTopOf="@+id/guideline3" app:layout_constraintTop_toTopOf="parent"
17+
app:layout_constraintVertical_bias="0.0"
18+
app:layout_constraintEnd_toEndOf="parent"
19+
app:layout_constraintStart_toStartOf="parent"/>
20+
<TextView
21+
android:text="@string/add_memo_uptext"
22+
android:layout_width="0dp"
23+
android:layout_height="wrap_content"
24+
android:id="@+id/textView"
25+
android:textAppearance="@style/topBar"
26+
android:textColor="@color/topBarText" android:layout_marginBottom="8dp"
27+
app:layout_constraintBottom_toTopOf="@+id/guideline3" android:layout_marginTop="8dp"
28+
app:layout_constraintTop_toTopOf="parent"
29+
app:layout_constraintEnd_toEndOf="@+id/toolbar2" app:layout_constraintStart_toStartOf="@+id/toolbar2"
30+
android:layout_marginStart="8dp"/>
31+
<EditText
32+
android:layout_width="0dp"
33+
android:layout_height="wrap_content"
34+
android:inputType="textPersonName"
35+
android:ems="10"
36+
android:id="@+id/taskName" android:layout_marginBottom="8dp"
37+
app:layout_constraintBottom_toTopOf="@+id/guideline2"
38+
style="@style/taskNameText" android:layout_marginEnd="8dp" app:layout_constraintEnd_toEndOf="parent"
39+
android:layout_marginStart="8dp" app:layout_constraintStart_toStartOf="parent"
40+
android:layout_marginTop="8dp" app:layout_constraintTop_toTopOf="@+id/guideline4"
41+
android:hint="@string/task_name"/>
42+
<androidx.constraintlayout.widget.Guideline android:layout_width="wrap_content" android:layout_height="wrap_content"
43+
android:id="@+id/guideline2"
44+
android:orientation="horizontal"
45+
app:layout_constraintGuide_percent="0.30369356"/>
46+
<androidx.constraintlayout.widget.Guideline android:layout_width="wrap_content" android:layout_height="wrap_content"
47+
android:id="@+id/guideline6"
48+
android:orientation="horizontal"
49+
app:layout_constraintGuide_end="419dp"/>
50+
<androidx.constraintlayout.widget.Guideline android:layout_width="wrap_content" android:layout_height="wrap_content"
51+
android:id="@+id/guideline7"
52+
android:orientation="horizontal"
53+
app:layout_constraintGuide_end="62dp"/>
54+
<androidx.constraintlayout.widget.Guideline android:layout_width="wrap_content" android:layout_height="wrap_content"
55+
android:id="@+id/guideline4"
56+
android:orientation="horizontal"
57+
app:layout_constraintGuide_end="624dp"/>
58+
<androidx.constraintlayout.widget.Guideline android:layout_width="wrap_content" android:layout_height="wrap_content"
59+
android:id="@+id/guideline3" app:layout_constraintGuide_begin="56dp"
60+
android:orientation="horizontal"/>
61+
<EditText
62+
android:layout_width="0dp"
63+
android:layout_height="wrap_content"
64+
android:inputType="textMultiLine"
65+
android:gravity="start|top"
66+
android:ems="10"
67+
android:id="@+id/TaskDescription" android:layout_marginEnd="8dp"
68+
app:layout_constraintEnd_toEndOf="parent" android:layout_marginStart="8dp"
69+
app:layout_constraintStart_toStartOf="parent" android:layout_marginTop="8dp"
70+
app:layout_constraintTop_toTopOf="@+id/guideline2" android:hint="@string/task_description"
71+
style="@style/taskNameText" app:layout_constraintHorizontal_bias="0.0" android:layout_marginBottom="8dp"
72+
app:layout_constraintBottom_toTopOf="@+id/guideline6" app:layout_constraintVertical_bias="0.048"/>
73+
<Button
74+
android:text="@string/validate_button"
75+
android:layout_width="0dp"
76+
android:layout_height="wrap_content"
77+
android:id="@+id/MemoValidateButton" app:layout_constraintEnd_toEndOf="parent" android:layout_marginEnd="8dp"
78+
app:layout_constraintStart_toStartOf="parent" android:layout_marginStart="8dp"
79+
android:layout_marginBottom="8dp" app:layout_constraintBottom_toBottomOf="parent"
80+
android:layout_marginTop="8dp" app:layout_constraintTop_toTopOf="@+id/guideline7"/>
81+
82+
</androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/res/values/colors.xml

+1
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,5 @@
33
<color name="colorPrimary">#3498db</color>
44
<color name="colorPrimaryDark">#00574B</color>
55
<color name="colorAccent">#D81B60</color>
6+
<color name="topBarText">#FFFFFF</color>
67
</resources>

app/src/main/res/values/strings.xml

+5
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,9 @@
22
<string name="app_name">Reminder</string>
33
<string name="action_settings">Settings</string>
44
<string name="homepage_placeholder">No memo yet!</string>
5+
<string name="add_memo_uptext">Create a new memo</string>
6+
<string name="task_name">Task Name</string>
7+
<string name="task_description">Describe your task here</string>
8+
<string name="validate_button">Add my memo</string>
9+
510
</resources>

app/src/main/res/values/styles.xml

+7
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,13 @@
1010
<style name="homePageText">
1111
<item name="android:textSize">32sp</item>
1212
</style>
13+
<style name="topBar">
14+
<item name="android:textColor">@color/topBarText</item>
15+
<item name="android:textSize">20sp</item>
16+
</style>
17+
<style name="taskNameText" parent="Base.Widget.MaterialComponents.TextInputEditText">
18+
<item name="android:textSize">20sp</item>
19+
</style>
1320
<style name="AppTheme.NoActionBar">
1421
<item name="windowActionBar">false</item>
1522
<item name="windowNoTitle">true</item>

0 commit comments

Comments
 (0)