Skip to content

Commit f41b3da

Browse files
grossyoangrossyoan
committedMay 8, 2019
🚧 Transition between activities and Memo page improved
1 parent 5454af2 commit f41b3da

File tree

7 files changed

+56
-99
lines changed

7 files changed

+56
-99
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/src/main/AndroidManifest.xml

+11-8
Original file line numberDiff line numberDiff line change
@@ -5,20 +5,23 @@
55
<application
66
android:allowBackup="true"
77
android:icon="@mipmap/ic_launcher"
8-
android:label="@string/app_name"
98
android:roundIcon="@mipmap/ic_launcher_round"
109
android:supportsRtl="true"
11-
android:theme="@style/AppTheme">
12-
<activity android:name=".addMemo">
10+
android:theme="@style/AppTheme.NoActionBar">
11+
<activity
12+
android:label="@string/add_memo_uptext"
13+
android:name=".AddMemo"
14+
android:theme="@style/AppTheme">
15+
1316
</activity>
1417
<activity
15-
android:name=".MainActivity"
1618
android:label="@string/app_name"
17-
android:theme="@style/AppTheme.NoActionBar">
18-
//android:windowSoftInputMode="adjustResize"
19-
<intent-filter>
20-
<action android:name="android.intent.action.MAIN"/>
19+
android:name=".MainActivity"
20+
android:theme="@style/AppTheme">
21+
2122

23+
<intent-filter>
24+
<action android:name="android.intent.action.MAIN"/>
2225
<category android:name="android.intent.category.LAUNCHER"/>
2326
</intent-filter>
2427
</activity>

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

+4-21
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
package com.example.kotlin_reminder
22

3+
import android.content.Intent
34
import android.os.Bundle
4-
import com.google.android.material.snackbar.Snackbar
55
import androidx.appcompat.app.AppCompatActivity
66
import android.view.Menu
77
import android.view.MenuItem
8+
import kotlinx.android.synthetic.main.activity_add_memo.*
89

910
import kotlinx.android.synthetic.main.activity_main.*
1011

@@ -13,28 +14,10 @@ class MainActivity : AppCompatActivity() {
1314
override fun onCreate(savedInstanceState: Bundle?) {
1415
super.onCreate(savedInstanceState)
1516
setContentView(R.layout.activity_main)
16-
setSupportActionBar(toolbar)
17-
1817
addButton.setOnClickListener { view ->
19-
setContentView(R.layout.activity_add_memo)
18+
val MainActivity2AddMemo = Intent(this, AddMemo::class.java)
19+
startActivity(MainActivity2AddMemo)
2020
}
21-
2221
}
2322

24-
25-
override fun onCreateOptionsMenu(menu: Menu): Boolean {
26-
// Inflate the menu; this adds items to the action bar if it is present.
27-
menuInflater.inflate(R.menu.menu_main, menu)
28-
return true
29-
}
30-
31-
override fun onOptionsItemSelected(item: MenuItem): Boolean {
32-
// Handle action bar item clicks here. The action bar will
33-
// automatically handle clicks on the Home/Up button, so long
34-
// as you specify a parent activity in AndroidManifest.xml.
35-
return when (item.itemId) {
36-
R.id.action_settings -> true
37-
else -> super.onOptionsItemSelected(item)
38-
}
39-
}
4023
}

‎app/src/main/java/com/example/kotlin_reminder/addMemo.kt

+6-5
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,19 @@
11
package com.example.kotlin_reminder
22

3+
import android.content.Intent
34
import androidx.appcompat.app.AppCompatActivity
45
import android.os.Bundle
5-
import android.widget.Toast
6-
import android.widget.TextView
76
import kotlinx.android.synthetic.main.activity_add_memo.*
87

9-
class addMemo : AppCompatActivity() {
8+
class AddMemo : AppCompatActivity() {
109

1110
override fun onCreate(savedInstanceState: Bundle?) {
1211
super.onCreate(savedInstanceState)
1312
setContentView(R.layout.activity_add_memo)
14-
MemoValidateButton.setOnClickListener {
15-
Toast.makeText(this, "You clicked me.", Toast.LENGTH_SHORT).show()
13+
14+
MemoValidateButton.setOnClickListener { view ->
15+
val AddMemo2MainActivity = Intent(this, MainActivity::class.java)
16+
startActivity(AddMemo2MainActivity)
1617
}
1718
}
1819
}

‎app/src/main/res/layout/activity_add_memo.xml

+7-27
Original file line numberDiff line numberDiff line change
@@ -5,29 +5,7 @@
55
xmlns:app="http://schemas.android.com/apk/res-auto"
66
android:layout_width="match_parent"
77
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"/>
8+
tools:context=".AddMemo">
319
<EditText
3210
android:layout_width="0dp"
3311
android:layout_height="wrap_content"
@@ -38,7 +16,7 @@
3816
style="@style/taskNameText" android:layout_marginEnd="8dp" app:layout_constraintEnd_toEndOf="parent"
3917
android:layout_marginStart="8dp" app:layout_constraintStart_toStartOf="parent"
4018
android:layout_marginTop="8dp" app:layout_constraintTop_toTopOf="@+id/guideline4"
41-
android:hint="@string/task_name"/>
19+
android:hint="@string/task_name" android:importantForAutofill="no"/>
4220
<androidx.constraintlayout.widget.Guideline android:layout_width="wrap_content" android:layout_height="wrap_content"
4321
android:id="@+id/guideline2"
4422
android:orientation="horizontal"
@@ -56,8 +34,9 @@
5634
android:orientation="horizontal"
5735
app:layout_constraintGuide_end="624dp"/>
5836
<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"/>
37+
android:id="@+id/guideline3"
38+
android:orientation="horizontal"
39+
app:layout_constraintGuide_end="675dp"/>
6140
<EditText
6241
android:layout_width="0dp"
6342
android:layout_height="wrap_content"
@@ -69,7 +48,8 @@
6948
app:layout_constraintStart_toStartOf="parent" android:layout_marginTop="8dp"
7049
app:layout_constraintTop_toTopOf="@+id/guideline2" android:hint="@string/task_description"
7150
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"/>
51+
app:layout_constraintBottom_toTopOf="@+id/guideline6" app:layout_constraintVertical_bias="0.048"
52+
android:importantForAutofill="no"/>
7353
<Button
7454
android:text="@string/validate_button"
7555
android:layout_width="0dp"

‎app/src/main/res/layout/activity_main.xml

+27-26
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,24 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<androidx.coordinatorlayout.widget.CoordinatorLayout
3-
xmlns:android="http://schemas.android.com/apk/res/android"
4-
xmlns:app="http://schemas.android.com/apk/res-auto"
5-
xmlns:tools="http://schemas.android.com/tools"
6-
android:layout_width="match_parent"
7-
android:layout_height="match_parent"
8-
tools:context=".MainActivity">
9-
10-
<com.google.android.material.appbar.AppBarLayout
11-
android:layout_height="wrap_content"
12-
android:layout_width="match_parent"
13-
android:theme="@style/AppTheme.AppBarOverlay">
14-
15-
<androidx.appcompat.widget.Toolbar
16-
android:id="@+id/toolbar"
17-
android:layout_width="match_parent"
18-
android:layout_height="?attr/actionBarSize"
19-
android:background="?attr/colorPrimary"
20-
app:popupTheme="@style/AppTheme.PopupOverlay"/>
21-
22-
</com.google.android.material.appbar.AppBarLayout>
23-
24-
<include layout="@layout/content_main" android:layout_height="match_parent" android:layout_width="match_parent"
25-
android:id="@+id/include"/>
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=".MainActivity">
9+
<TextView
10+
android:layout_width="wrap_content"
11+
android:layout_height="wrap_content"
12+
android:text="@string/homepage_placeholder"
13+
style="@style/homePageText"
14+
app:layout_constraintBottom_toBottomOf="parent"
15+
app:layout_constraintLeft_toLeftOf="parent"
16+
app:layout_constraintRight_toRightOf="parent"
17+
app:layout_constraintTop_toTopOf="parent"/>
18+
<androidx.constraintlayout.widget.Guideline
19+
android:layout_width="wrap_content" android:layout_height="wrap_content"
20+
android:id="@+id/guideline3" app:layout_constraintGuide_begin="56dp"
21+
android:orientation="horizontal"/>
2622

2723
<com.google.android.material.floatingactionbutton.FloatingActionButton
2824
android:id="@+id/addButton"
@@ -32,6 +28,11 @@
3228
android:layout_width="62dp"
3329
android:layout_height="62dp"
3430
app:fabCustomSize="62dp"
35-
app:layout_anchorGravity="end|bottom" app:layout_anchor="@+id/include"/>
31+
app:layout_anchorGravity="end|bottom"
32+
android:layout_marginStart="8dp" app:layout_constraintStart_toStartOf="parent"
33+
android:layout_marginEnd="8dp" app:layout_constraintEnd_toEndOf="parent" android:layout_marginBottom="8dp"
34+
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintHorizontal_bias="0.97"
35+
android:layout_marginTop="8dp" app:layout_constraintTop_toTopOf="parent"
36+
app:layout_constraintVertical_bias="0.98"/>
3637

37-
</androidx.coordinatorlayout.widget.CoordinatorLayout>
38+
</androidx.constraintlayout.widget.ConstraintLayout>

‎app/src/main/res/layout/content_main.xml

-11
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,4 @@
88
app:layout_behavior="@string/appbar_scrolling_view_behavior"
99
tools:showIn="@layout/activity_main"
1010
tools:context=".MainActivity">
11-
12-
<TextView
13-
android:layout_width="wrap_content"
14-
android:layout_height="wrap_content"
15-
android:text="@string/homepage_placeholder"
16-
style="@style/homePageText"
17-
app:layout_constraintBottom_toBottomOf="parent"
18-
app:layout_constraintLeft_toLeftOf="parent"
19-
app:layout_constraintRight_toRightOf="parent"
20-
app:layout_constraintTop_toTopOf="parent"/>
21-
2211
</androidx.constraintlayout.widget.ConstraintLayout>

0 commit comments

Comments
 (0)
Please sign in to comment.