diff --git a/app/src/main/java/com/example/tampopo_client/views/MainActivity.java b/app/src/main/java/com/example/tampopo_client/views/MainActivity.java index 21e3aae..5fb81c2 100644 --- a/app/src/main/java/com/example/tampopo_client/views/MainActivity.java +++ b/app/src/main/java/com/example/tampopo_client/views/MainActivity.java @@ -1,7 +1,6 @@ package com.example.tampopo_client.views; import android.content.Intent; -import android.graphics.Color; import android.os.Bundle; import android.view.View; import android.view.inputmethod.InputMethodManager; @@ -11,7 +10,6 @@ import android.widget.GridView; import android.widget.ImageButton; import android.widget.LinearLayout; -import android.widget.TextView; import androidx.activity.EdgeToEdge; import androidx.appcompat.app.AlertDialog; @@ -19,8 +17,12 @@ import androidx.core.graphics.Insets; import androidx.core.view.ViewCompat; import androidx.core.view.WindowInsetsCompat; +import androidx.lifecycle.ViewModelProvider; import com.example.tampopo_client.R; +import com.example.tampopo_client.Tampopo; +import com.example.tampopo_client.viewmodels.ActivityViewModel; +import com.example.tampopo_client.viewmodels.UserViewModel; public class MainActivity extends AppCompatActivity { @@ -29,9 +31,13 @@ private GridView wordGroup; private LinearLayout messageList; //アクティビティの選択肢 - private String[] words = {"ひまnow","あそぼ!","そろそろ会いたない〜?", "勉強なう", "電話しよ~", "お風呂入ってくる~","今暇だよー!","いそがしい~!!"}; + private String[] words = {"ひまnow", "あそぼ!", "そろそろ会いたない〜?", "勉強なう", "電話しよ~", "お風呂入ってくる~", "今暇だよー!", "いそがしい~!!"}; private Button openDialogButton; + ActivityViewModel activityViewModel; + Tampopo tampopo; + + @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); @@ -52,6 +58,12 @@ } }); + //activityViewModelを宣言する + activityViewModel = new ViewModelProvider(this).get(ActivityViewModel.class); + //tampopoを宣言する + tampopo = (Tampopo) getApplication(); + + //メイン画面から通知一覧画面への遷移 // ImageButton notificationButton = (ImageButton)findViewById(R.id.notification); // notificationButton.setOnClickListener(new View.OnClickListener() { @@ -77,6 +89,7 @@ openDialogButton.setOnClickListener(v -> showInputDialog()); } + private void showInputDialog() { // カスタムビュー読み込み View dialogView = getLayoutInflater().inflate(R.layout.main_dialog, null); @@ -84,6 +97,10 @@ GridView wordGrid = dialogView.findViewById(R.id.wordGrid); ImageButton sendButton = dialogView.findViewById(R.id.sendButton); + //tokenとuserIdを代入する + String token = tampopo.getToken(); + String userId = tampopo.getUserId(); + // 語群セット ArrayAdapter adapter = new ArrayAdapter<>(this, android.R.layout.simple_list_item_1, words); wordGrid.setAdapter(adapter); @@ -107,19 +124,20 @@ String message = editTextInput.getText().toString().trim(); int length = message.length(); if (!message.isEmpty()) { - if(length > 20){ + activityViewModel.createActivity(userId, token, message); + if (length > 20) { openDialogButton.setTextSize(7); - }else if(length > 10){ + } else if (length > 10) { openDialogButton.setTextSize(10); - }else{ + } else { openDialogButton.setTextSize(12); } openDialogButton.setMaxLines(10); - openDialogButton.setLineSpacing(4.0f,1.2f); + openDialogButton.setLineSpacing(4.0f, 1.2f); openDialogButton.setText(message); editTextInput.setText(""); dialog.dismiss(); // ダイアログを閉じる - }else{ + } else { openDialogButton.setText(""); } }); @@ -127,21 +145,4 @@ dialog.show(); } - private void addMessageToHome(String message) { - TextView textView = new TextView(this); - textView.setText(message); - textView.setPadding(10, 10, 10, 10); - textView.setBackgroundColor(Color.parseColor("#E0E0E0")); - int length = message.length(); - if(length > 10){ - textView.setTextSize(5); - }else if(length > 7){ - textView.setTextSize(8); - }else{ - textView.setTextSize(10); - } - textView.setMaxLines(10); - textView.setLineSpacing(4.0f,1.2f); - messageList.addView(textView); - } } \ No newline at end of file