Skip to content
Open
Show file tree
Hide file tree
Changes from all 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
55 changes: 55 additions & 0 deletions app/src/main/java/com/example/kotlinhomework/MainActivity
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
import android.content.Intent
Copy link

@kazakov24alex kazakov24alex Dec 16, 2020

Choose a reason for hiding this comment

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

нужно было всё-таки заменить своими kotlin-файлами исходные на java)
плюс kotlin файлы должны иметь расширение .kt

import android.os.Bundle
import android.view.View
import android.widget.Button
import android.widget.TextView
import androidx.appcompat.app.AppCompatActivity

class MainActivity: AppCompatActivity {
private var greetings: String?
private var name: String?
private var textView: TextView?

override protected fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
setContentView(R.layout.activity_main);
greetings = getString(R.string.hello);
if (savedInstanceState != null && savedInstanceState.getString(NAME_KEY) != null) {
name = savedInstanceState.getString(NAME_KEY)
} else {
name = getString(R.string.anon)
}
textView = findViewById(R.id.textViewHello)
val button: Button = findViewById(R.id.buttonNameYourSelf)
button.setOnClickListener(object : OnClickListener() {
override fun onClick(view: View) {
val intent = Intent(MainActivity, SecondActivity::class)
startActivityForResult(intent, SecondActivity.GET_NAME_REQUEST_CODE)
}
})
}

override protected fun onActivityResult (requestCode: Int , resultCode: Int , data: Intent?): Unit {
super.onActivityResult(requestCode, resultCode, data)
if (requestCode == SecondActivity.GET_NAME_REQUEST_CODE && resultCode == RESULT_OK && data != null) {
val nameFromData: String = data.getStringExtra(SecondActivity.NAME_KEY)
if (nameFromData != null) {
name = nameFromData;
}
}
}

protected fun onResume(): Unit {
super.onResume()
textView.setText("$greetings, $name!")
}

protected fun onSaveInstanceState(outState: Bundle) : Unit {
super.onSaveInstanceState(outState)
outState.putString(NAME_KEY, name)
}

companion object {
public const val NAME_KEY: String = "com.example.kotlinhomework.MainActivity.NAME_KEY"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
import android.view.View;
import android.widget.Button;
import android.widget.TextView;

import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.appcompat.app.AppCompatActivity;
Expand All @@ -20,16 +19,13 @@ public class MainActivity extends AppCompatActivity {
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_main);

greetings = getString(R.string.hello);
if (savedInstanceState != null && savedInstanceState.getString(NAME_KEY) != null) {
name = savedInstanceState.getString(NAME_KEY);
} else {
name = getString(R.string.anon);
}

textView = findViewById(R.id.textViewHello);

Button button = findViewById(R.id.buttonNameYourSelf);
button.setOnClickListener(new View.OnClickListener() {
@Override
Expand Down
54 changes: 54 additions & 0 deletions app/src/main/java/com/example/kotlinhomework/MySecondActivity
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
import android.content.Intent
import android.os.Bundle
import android.text.Editable
import android.text.TextUtils
import android.text.TextWatcher
import android.view.View
import android.widget.Button
import android.widget.EditText
import androidx.appcompat.app.AppCompatActivity

internal open class SecondActivity : AppCompatActivity {

private var editText: EditText
private var button: Button

protected fun onCreate(savedInstanceState: Bundle) : Unit {
super.onCreate(savedInstanceState)
setContentView(R.layout.activity_second)
editText = findViewById(R.id.editTextTextPersonName)
button = findViewById(R.id.buttonName)
button.setEnabled(false)

editText.addTextChangedListener(object : TextWatcher() {

public override fun beforeTextChanged(charSequence: CharSequence, i: Int, i1: Int, i2: Int ) : Unit {
// Nothing to do
}

public override fun onTextChanged(charSequence: CharSequence, i: Int, i1: Int, i2: Int) : Unit {
// Nothing to do
}

public override fun afterTextChanged(editable: Editable) : Unit {
button.setEnabled(!TextUtils.isEmpty(editable))
}
})
button.setOnClickListener(object: OnClickListener() {
public override fun onClick(view: View) : Unit {
val intent: Intent = Intent()
intent.putExtra(NAME_KEY, editText.getText().toString())
setResult(RESULT_OK, intent)
finish()
}
})
}

companion object {
public const val NAME_KEY: String = "com.example.kotlinhomework.SecondActivity.NAME_KEY"
}

companion object {
public const val GET_NAME_REQUEST_CODE: Int = 1234
}
}
55 changes: 24 additions & 31 deletions app/src/main/java/com/example/kotlinhomework/SecondActivity.java
Original file line number Diff line number Diff line change
Expand Up @@ -8,50 +8,43 @@
import android.view.View;
import android.widget.Button;
import android.widget.EditText;

import androidx.appcompat.app.AppCompatActivity;

public class SecondActivity extends AppCompatActivity {

private EditText editText;
private Button button;

@Override
protected void onCreate(Bundle savedInstanceState) {
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_second);

editText = findViewById(R.id.editTextTextPersonName);
button = findViewById(R.id.buttonName);
button.setEnabled(false);
editText.addTextChangedListener(new TextWatcher() {
@Override
public void beforeTextChanged(CharSequence charSequence, int i, int i1, int i2) {
// Nothing to do
}

@Override
public void onTextChanged(CharSequence charSequence, int i, int i1, int i2) {
// Nothing to do
}

@Override
public void afterTextChanged(Editable editable) {
button.setEnabled(!TextUtils.isEmpty(editable));
}

@Override
public void beforeTextChanged(CharSequence charSequence, int i, int i1, int i2) {
// Nothing to do
}
@Override
public void onTextChanged(CharSequence charSequence, int i, int i1, int i2) {
//Nothing to do
}
@Override
public void afterTextChanged(Editable editable) {
button.setEnabled(!TextUtils.isEmpty(editable));
}
});
button.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
Intent intent = new Intent();
intent.putExtra(NAME_KEY, editText.getText().toString());
setResult(RESULT_OK, intent);
finish();
}
@Override
public void onClick(View view) {
Intent intent = new Intent();
intent.putExtra(NAME_KEY, editText.getText().toString());
setResult(RESULT_OK, intent);
finish();
}
});
}

public static final String NAME_KEY = "com.example.kotlinhomework.SecondActivity.NAME_KEY";
public static final int GET_NAME_REQUEST_CODE = 1234;
}
public static final String NAME_KEY = "com.example.kotlinhomework.SecondActivity.NAME_KEY";
public static final int GET_NAME_REQUEST_CODE = 1234;
}