Skip to content

rsschool2021-Android-task-randomizer #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
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
23 changes: 23 additions & 0 deletions app/src/main/java/com/rsschool/android2021/ErrorDialogFragment.kt
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
package com.rsschool.android2021

import android.app.Dialog
import android.os.Bundle
import androidx.appcompat.app.AlertDialog
import androidx.fragment.app.DialogFragment

class ErrorDialogFragment : DialogFragment() {

public var text: String = ""

override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
return activity?.let {
val builder = AlertDialog.Builder(it)
builder.setTitle("ERROR")
.setMessage(text)
.setPositiveButton("Ok") {
dialog, id -> dialog.cancel()
}
builder.create()
} ?: throw IllegalStateException("Activity cannot be null")
}
}
32 changes: 28 additions & 4 deletions app/src/main/java/com/rsschool/android2021/FirstFragment.kt
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,16 @@ import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import android.widget.Button
import android.widget.EditText
import android.widget.TextView
import androidx.fragment.app.Fragment

class FirstFragment : Fragment() {

private var generateButton: Button? = null
private var previousResult: TextView? = null
private lateinit var minEditText: EditText
private lateinit var maxEditText: EditText

override fun onCreateView(
inflater: LayoutInflater,
Expand All @@ -25,18 +28,39 @@ class FirstFragment : Fragment() {
super.onViewCreated(view, savedInstanceState)
previousResult = view.findViewById(R.id.previous_result)
generateButton = view.findViewById(R.id.generate)
minEditText = view.findViewById(R.id.min_value)
maxEditText = view.findViewById(R.id.max_value)

val result = arguments?.getInt(PREVIOUS_RESULT_KEY)
previousResult?.text = "Previous result: ${result.toString()}"

// TODO: val min = ...
// TODO: val max = ...

generateButton?.setOnClickListener {
// TODO: send min and max to the SecondFragment
val min = minEditText.text.toString()
val max = maxEditText.text.toString()

try {
var minNumber = min.toInt()
var maxNumber = max.toInt()

if (minNumber > maxNumber) {
showError("The minimum number cannot be more than the maximum!")
return@setOnClickListener
}

(requireActivity() as? MainActivity)?.openSecondFragment(minNumber, maxNumber)
} catch (nfe: NumberFormatException) {
showError("Please enter whole numbers!")
}
}
}

private fun showError(str: String) {
val errorDialogFragment = ErrorDialogFragment()
errorDialogFragment.text = str
val manager = requireActivity().supportFragmentManager
errorDialogFragment.show(manager, "errorDialog")
}

companion object {

@JvmStatic
Expand Down
11 changes: 6 additions & 5 deletions app/src/main/java/com/rsschool/android2021/MainActivity.java
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,15 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
openFirstFragment(0);
}

private void openFirstFragment(int previousNumber) {
public void openFirstFragment(int previousNumber) {
final Fragment firstFragment = FirstFragment.newInstance(previousNumber);
final FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();
transaction.replace(R.id.container, firstFragment);
// TODO: invoke function which apply changes of the transaction
transaction.replace(R.id.container, firstFragment).commit();
}

private void openSecondFragment(int min, int max) {
// TODO: implement it
public void openSecondFragment(int min, int max) {
final Fragment secondFragment = SecondFragment.newInstance(min, max);
final FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();
transaction.replace(R.id.container, secondFragment).commit();
}
}
15 changes: 8 additions & 7 deletions app/src/main/java/com/rsschool/android2021/SecondFragment.kt
Original file line number Diff line number Diff line change
Expand Up @@ -29,16 +29,17 @@ class SecondFragment : Fragment() {
val min = arguments?.getInt(MIN_VALUE_KEY) ?: 0
val max = arguments?.getInt(MAX_VALUE_KEY) ?: 0

result?.text = generate(min, max).toString()
val random = generate(min, max)
result?.text = random.toString()

backButton?.setOnClickListener {
// TODO: implement back
(requireActivity() as? MainActivity)?.openFirstFragment(random)
}
}

private fun generate(min: Int, max: Int): Int {
// TODO: generate random number
return 0
val random = (min..max).random()
return random
}

companion object {
Expand All @@ -47,9 +48,9 @@ class SecondFragment : Fragment() {
fun newInstance(min: Int, max: Int): SecondFragment {
val fragment = SecondFragment()
val args = Bundle()

// TODO: implement adding arguments

args.putInt(SecondFragment.MAX_VALUE_KEY, max)
args.putInt(SecondFragment.MIN_VALUE_KEY, min)
fragment.arguments = args
return fragment
}

Expand Down