diff --git a/app/build.gradle b/app/build.gradle index 2b3280c..f67ab19 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -34,4 +34,10 @@ dependencies { testImplementation 'junit:junit:4.12' androidTestImplementation 'androidx.test.ext:junit:1.1.2' androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0' + + //ShapeableImageView + implementation 'com.google.android.material:material:1.2.1' + + //CircleImageView + implementation 'de.hdodenhof:circleimageview:3.1.0' } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 94e0e73..f854f4d 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -9,13 +9,15 @@ android:roundIcon="@mipmap/ic_launcher_round" android:supportsRtl="true" android:theme="@style/AppTheme"> - + + + \ No newline at end of file diff --git a/app/src/main/java/com/example/myapplication/MainActivity.kt b/app/src/main/java/com/example/myapplication/MainActivity.kt index 6ca80fa..1832bbb 100644 --- a/app/src/main/java/com/example/myapplication/MainActivity.kt +++ b/app/src/main/java/com/example/myapplication/MainActivity.kt @@ -2,11 +2,39 @@ package com.example.myapplication import androidx.appcompat.app.AppCompatActivity import android.os.Bundle +import android.text.Editable +import android.util.Log +import android.view.View +import kotlinx.android.synthetic.main.activity_main.* class MainActivity : AppCompatActivity() { + var isEdit: Boolean = false override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) setContentView(R.layout.activity_main) + button.setOnClickListener { edit() } + setData() + } + + private fun setData() { + name.text = intent.getStringExtra("name") + age.text = intent.getStringExtra("mail") + textView.text = intent.getStringExtra("id") + } + + private fun edit() { + if (!isEdit) { + editText.visibility = View.VISIBLE + textView.visibility = View.INVISIBLE + editText.setText(textView.text) + button.text = "Сохранить" + } else { + textView.text = editText.text + editText.visibility = View.INVISIBLE + textView.visibility = View.VISIBLE + button.text = "Редактировать" + } + isEdit = !isEdit } } diff --git a/app/src/main/java/com/example/myapplication/RegisterActivity.kt b/app/src/main/java/com/example/myapplication/RegisterActivity.kt new file mode 100644 index 0000000..fa6753b --- /dev/null +++ b/app/src/main/java/com/example/myapplication/RegisterActivity.kt @@ -0,0 +1,25 @@ +package com.example.myapplication + +import android.content.Intent +import androidx.appcompat.app.AppCompatActivity +import android.os.Bundle +import android.util.Log +import android.view.View +import kotlinx.android.synthetic.main.activity_register.* + +class RegisterActivity : AppCompatActivity() { + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setContentView(R.layout.activity_register) + + } + + fun click(view: View) { + val intent = Intent(this, MainActivity::class.java) + intent.putExtra("name", et_name.text.toString()) + intent.putExtra("mail", et_mail.text.toString()) + intent.putExtra("id", et_id.text.toString()) + startActivity(intent) + } +} diff --git a/app/src/main/res/drawable-v24/ava.jpg b/app/src/main/res/drawable-v24/ava.jpg new file mode 100644 index 0000000..8b0c608 Binary files /dev/null and b/app/src/main/res/drawable-v24/ava.jpg differ diff --git a/app/src/main/res/drawable/ic_accessibility_black_24dp.xml b/app/src/main/res/drawable/ic_accessibility_black_24dp.xml new file mode 100644 index 0000000..350c148 --- /dev/null +++ b/app/src/main/res/drawable/ic_accessibility_black_24dp.xml @@ -0,0 +1,5 @@ + + + diff --git a/app/src/main/res/drawable/ic_adb_black_24dp.xml b/app/src/main/res/drawable/ic_adb_black_24dp.xml new file mode 100644 index 0000000..3795ad7 --- /dev/null +++ b/app/src/main/res/drawable/ic_adb_black_24dp.xml @@ -0,0 +1,5 @@ + + + diff --git a/app/src/main/res/drawable/ic_camera_alt_black_24dp.xml b/app/src/main/res/drawable/ic_camera_alt_black_24dp.xml new file mode 100644 index 0000000..4ac4cbf --- /dev/null +++ b/app/src/main/res/drawable/ic_camera_alt_black_24dp.xml @@ -0,0 +1,6 @@ + + + + diff --git a/app/src/main/res/drawable/ic_edit_black_24dp.xml b/app/src/main/res/drawable/ic_edit_black_24dp.xml new file mode 100644 index 0000000..baafe09 --- /dev/null +++ b/app/src/main/res/drawable/ic_edit_black_24dp.xml @@ -0,0 +1,5 @@ + + + diff --git a/app/src/main/res/drawable/ic_info_black_24dp.xml b/app/src/main/res/drawable/ic_info_black_24dp.xml new file mode 100644 index 0000000..7cb306d --- /dev/null +++ b/app/src/main/res/drawable/ic_info_black_24dp.xml @@ -0,0 +1,5 @@ + + + diff --git a/app/src/main/res/drawable/ic_photo_black_24dp.xml b/app/src/main/res/drawable/ic_photo_black_24dp.xml new file mode 100644 index 0000000..8e90719 --- /dev/null +++ b/app/src/main/res/drawable/ic_photo_black_24dp.xml @@ -0,0 +1,5 @@ + + + diff --git a/app/src/main/res/drawable/ic_school_black_24dp.xml b/app/src/main/res/drawable/ic_school_black_24dp.xml new file mode 100644 index 0000000..7c4af4c --- /dev/null +++ b/app/src/main/res/drawable/ic_school_black_24dp.xml @@ -0,0 +1,5 @@ + + + diff --git a/app/src/main/res/drawable/ic_slow_motion_video_black_24dp.xml b/app/src/main/res/drawable/ic_slow_motion_video_black_24dp.xml new file mode 100644 index 0000000..92dc18a --- /dev/null +++ b/app/src/main/res/drawable/ic_slow_motion_video_black_24dp.xml @@ -0,0 +1,5 @@ + + + diff --git a/app/src/main/res/drawable/ic_wifi_black_24dp.xml b/app/src/main/res/drawable/ic_wifi_black_24dp.xml new file mode 100644 index 0000000..132112c --- /dev/null +++ b/app/src/main/res/drawable/ic_wifi_black_24dp.xml @@ -0,0 +1,5 @@ + + + diff --git a/app/src/main/res/drawable/ic_work_black_24dp.xml b/app/src/main/res/drawable/ic_work_black_24dp.xml new file mode 100644 index 0000000..ec74864 --- /dev/null +++ b/app/src/main/res/drawable/ic_work_black_24dp.xml @@ -0,0 +1,5 @@ + + + diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 4fc2444..d0a336a 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -6,13 +6,213 @@ android:layout_height="match_parent" tools:context=".MainActivity"> + + + + + + + + + + + + + + + + + + +