diff --git a/app/src/main/java/it/unisannio/ding/ids/wedroid/app/view/BoardsListsActivity.kt b/app/src/main/java/it/unisannio/ding/ids/wedroid/app/view/BoardsListsActivity.kt index f5be060..d3c6924 100644 --- a/app/src/main/java/it/unisannio/ding/ids/wedroid/app/view/BoardsListsActivity.kt +++ b/app/src/main/java/it/unisannio/ding/ids/wedroid/app/view/BoardsListsActivity.kt @@ -18,6 +18,7 @@ import it.unisannio.ding.ids.wedroid.wrapper.entity.BoardBackgroundColor import kotlinx.android.synthetic.main.activity_boards_lists.* import kotlinx.android.synthetic.main.content_boards_lists.* +import java.util.Locale class BoardsListsActivity : AppCompatActivity() { private lateinit var viewModel: BoardsListViewModel @@ -118,7 +119,11 @@ class BoardsListsActivity : AppCompatActivity() { val isPrivate = data.getBooleanExtra(NewBoardActivity.BOARD_PRIVATE, true) - viewModel.insertBoard(title, isPrivate, BoardBackgroundColor.LIMEGREEN) // TODO + val colorName = data.getStringExtra(NewBoardActivity.BOARD_BACKGROUND_COLOR) ?: "belize" + val backgroundColor = BoardBackgroundColor + .valueOf(colorName.toUpperCase(Locale.ROOT)) + + viewModel.insertBoard(title, isPrivate, backgroundColor) } companion object { diff --git a/app/src/main/java/it/unisannio/ding/ids/wedroid/app/view/NewBoardActivity.java b/app/src/main/java/it/unisannio/ding/ids/wedroid/app/view/NewBoardActivity.java index 85eb857..887b245 100644 --- a/app/src/main/java/it/unisannio/ding/ids/wedroid/app/view/NewBoardActivity.java +++ b/app/src/main/java/it/unisannio/ding/ids/wedroid/app/view/NewBoardActivity.java @@ -6,16 +6,21 @@ import android.os.Bundle; import androidx.appcompat.app.AppCompatActivity; import androidx.appcompat.widget.Toolbar; +import android.util.Log; import android.view.View; +import android.widget.ArrayAdapter; import android.widget.EditText; +import android.widget.Spinner; import android.widget.Switch; import android.widget.Toast; import it.unisannio.ding.ids.wedroid.app.R; +import it.unisannio.ding.ids.wedroid.wrapper.entity.BoardBackgroundColor; public class NewBoardActivity extends AppCompatActivity { private EditText boardName; private Switch isPrivate; + private Spinner colorPicker; @Override protected void onCreate(Bundle savedInstanceState) { @@ -26,6 +31,16 @@ public class NewBoardActivity extends AppCompatActivity { boardName = findViewById(R.id.newBoardName); isPrivate = findViewById(R.id.newBoardPermission); + + colorPicker = findViewById(R.id.newBoardColor); + ArrayAdapter adapter = ArrayAdapter.createFromResource( + this, + R.array.board_background_colors, + android.R.layout.simple_spinner_item + ); + adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item); + colorPicker.setAdapter(adapter); + } public void onDone(View v) { @@ -38,6 +53,7 @@ public class NewBoardActivity extends AppCompatActivity { Intent data = new Intent(); data.putExtra(BOARD_NAME, boardName.getText().toString()); data.putExtra(BOARD_PRIVATE, isPrivate.isChecked()); + data.putExtra(BOARD_BACKGROUND_COLOR, colorPicker.getSelectedItem().toString()); setResult(RESULT_OK, data); finish(); } @@ -49,4 +65,5 @@ public class NewBoardActivity extends AppCompatActivity { public static final int RESULT_OK = 17; public static final String BOARD_NAME = "BOARD_NAME"; public static final String BOARD_PRIVATE = "BOARD_PRIVATE"; + public static final String BOARD_BACKGROUND_COLOR = "BOARD_BACKGROUND_COLOR"; } diff --git a/app/src/main/res/layout/content_new_board.xml b/app/src/main/res/layout/content_new_board.xml index ad7e6da..851e4dd 100644 --- a/app/src/main/res/layout/content_new_board.xml +++ b/app/src/main/res/layout/content_new_board.xml @@ -9,18 +9,18 @@ tools:showIn="@layout/activity_new_board"> + android:id="@+id/newBoardName" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:ems="10" + android:hint="@string/new_board_name_field" + android:importantForAutofill="no" + android:inputType="textPersonName" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" + app:layout_constraintVertical_bias="0.20999998" />