diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 40840fd..c1e53ea 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,8 +1,8 @@ - + + + android:exported="true" /> - - + android:exported="true"> - - + android:exported="true"> - - + android:exported="true"> - - - + - + \ No newline at end of file diff --git a/app/src/main/java/com/example/tampopo_client/views/RegisterActivity.java b/app/src/main/java/com/example/tampopo_client/views/RegisterActivity.java index bc194c6..a02a716 100644 --- a/app/src/main/java/com/example/tampopo_client/views/RegisterActivity.java +++ b/app/src/main/java/com/example/tampopo_client/views/RegisterActivity.java @@ -86,7 +86,7 @@ tampopo.setToken(token); // 画面遷移 - Intent intent = new Intent(RegisterActivity.this, MainActivity.class); + Intent intent = new Intent(RegisterActivity.this, UserInfoActivity.class); startActivity(intent); finish(); } else { diff --git a/app/src/main/java/com/example/tampopo_client/views/UserInfoActivity.java b/app/src/main/java/com/example/tampopo_client/views/UserInfoActivity.java new file mode 100644 index 0000000..58f3cdb --- /dev/null +++ b/app/src/main/java/com/example/tampopo_client/views/UserInfoActivity.java @@ -0,0 +1,132 @@ +package com.example.tampopo_client.views; + +import android.content.Intent; +import android.graphics.Bitmap; +import android.graphics.BitmapFactory; +import android.graphics.drawable.BitmapDrawable; +import android.net.Uri; +import android.os.Bundle; +import android.view.View; +import android.widget.Button; +import android.widget.EditText; +import android.widget.ImageButton; +import android.widget.Toast; + +import androidx.activity.EdgeToEdge; +import androidx.activity.result.ActivityResultCallback; +import androidx.activity.result.ActivityResultLauncher; +import androidx.activity.result.contract.ActivityResultContracts; +import androidx.appcompat.app.AppCompatActivity; +import androidx.core.graphics.Insets; +import androidx.core.view.ViewCompat; +import androidx.core.view.WindowInsetsCompat; +import androidx.lifecycle.Observer; +import androidx.lifecycle.ViewModelProvider; + +import com.bumptech.glide.Glide; +import com.example.tampopo_client.R; +import com.example.tampopo_client.Tampopo; +import com.example.tampopo_client.models.User; +import com.example.tampopo_client.viewmodels.UserViewModel; +import com.google.android.material.imageview.ShapeableImageView; + +import java.io.BufferedInputStream; +import java.io.ByteArrayOutputStream; +import java.io.FileNotFoundException; +import java.io.InputStream; +import java.util.Base64; + +public class UserInfoActivity extends AppCompatActivity { + private UserViewModel userViewModel; + Tampopo app; + private String changeIconUrl; + private boolean iconFlag; + + private ActivityResultLauncher launcher = registerForActivityResult(new ActivityResultContracts.OpenDocument(), new ActivityResultCallback() { + @Override + public void onActivityResult(Uri uri) { + if(uri == null){ + iconFlag = false; + return; + } + ShapeableImageView changeIconButton = findViewById(R.id.changeIcon); + changeIconButton.setImageURI(uri); + try { + InputStream inputStream = getApplicationContext().getContentResolver().openInputStream(uri); + Bitmap bitmap = BitmapFactory.decodeStream(new BufferedInputStream(inputStream)); + ByteArrayOutputStream stream = new ByteArrayOutputStream(); + bitmap.compress(Bitmap.CompressFormat.JPEG, 100, stream); + byte[] byteArray = stream.toByteArray(); + changeIconUrl = Base64.getEncoder().encodeToString(byteArray); + iconFlag = true; + } catch (FileNotFoundException e) { + e.printStackTrace(); + } + } + }); + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + EdgeToEdge.enable(this); + setContentView(R.layout.activity_user_info); + ViewCompat.setOnApplyWindowInsetsListener(findViewById(R.id.main), (v, insets) -> { + Insets systemBars = insets.getInsets(WindowInsetsCompat.Type.systemBars()); + v.setPadding(systemBars.left, systemBars.top, systemBars.right, systemBars.bottom); + return insets; + }); + + userViewModel = new ViewModelProvider(this).get(UserViewModel.class); + + app = (Tampopo) getApplication(); + + ShapeableImageView iconView = findViewById(R.id.myicon); + ShapeableImageView changeIconView = findViewById(R.id.changeIcon); + + changeIconView.setOnClickListener(new View.OnClickListener(){ + public void onClick(View v) { + launcher.launch(new String[] {"image/*"}); + } + + }); + + userViewModel.getIcon().observe(this, new Observer() { + @Override + public void onChanged(String iconUrl) { + Glide.with(UserInfoActivity.this).load(iconUrl).into(iconView); + } + }); + //決定ボタン + Button dicisionbutton = findViewById(R.id.enter_button); + dicisionbutton.setOnClickListener(new View.OnClickListener() { + public void onClick(View v) { + + + EditText usernicknameInput = findViewById(R.id.nickname); + String usernickname = usernicknameInput.getText().toString(); + + // Application（Tampopo）に保存 + app.setNickname(usernickname); + + userViewModel.updateName(app.getUserId(), usernickname, app.getToken()); + if(iconFlag){ + Bitmap iconBitmap = ((BitmapDrawable) changeIconView.getDrawable()).getBitmap(); + userViewModel.updateIcon(app.getUserId(),changeIconUrl,app.getToken()); + app.setIcon(changeIconUrl); + } + + if(usernicknameInput == null){ + Toast.makeText(UserInfoActivity.this, "ニックネームを入力してください", Toast.LENGTH_SHORT).show(); + } else if (changeIconUrl == null) { + Toast.makeText(UserInfoActivity.this, "アイコンを設定してください", Toast.LENGTH_SHORT).show(); + } else if (usernicknameInput == null && changeIconUrl == null) { + Toast.makeText(UserInfoActivity.this, "ニックネームとアイコンを設定してください", Toast.LENGTH_SHORT).show(); + }else { + //メイン画面に進む + Intent intent = new Intent(UserInfoActivity.this, MainActivity.class); + startActivity(intent); + } + } + }); + + } +} \ No newline at end of file diff --git a/app/src/main/res/drawable/tampopo.png b/app/src/main/res/drawable/tampopo.png new file mode 100644 index 0000000..642625f --- /dev/null +++ b/app/src/main/res/drawable/tampopo.png Binary files differ diff --git a/app/src/main/res/layout/activity_user_info.xml b/app/src/main/res/layout/activity_user_info.xml new file mode 100644 index 0000000..779518b --- /dev/null +++ b/app/src/main/res/layout/activity_user_info.xml @@ -0,0 +1,96 @@ + + + + + + + + + + + + +