diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 0ff4bd5..a3f844e 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -23,6 +23,26 @@ android:exported="true"> + + + + + + + + + + + + @@ -41,4 +61,4 @@ android:exported="true" /> - + \ No newline at end of file diff --git a/app/src/main/java/com/example/tampopo_client/Tampopo.java b/app/src/main/java/com/example/tampopo_client/Tampopo.java index 3cff24c..d406e51 100644 --- a/app/src/main/java/com/example/tampopo_client/Tampopo.java +++ b/app/src/main/java/com/example/tampopo_client/Tampopo.java @@ -6,6 +6,9 @@ private String token; private String userId; private String password; + private String mailaddress; + private String nickname; + private String icon; public String getToken() { return token; @@ -30,4 +33,16 @@ public void setPassword(String password) { this.password = password; } + + public String getMailaddress() { return mailaddress; } + + public void setMailaddress(String mailaddress) {this.mailaddress = mailaddress; } + + public String getNickname() { return nickname; } + + public void setNickname(String nickname) {this.nickname = nickname; } + + public String getIcon() { return icon; } + + public void setIcon(String icon) {this.icon = icon; } } diff --git a/app/src/main/java/com/example/tampopo_client/views/AccountActivity.java b/app/src/main/java/com/example/tampopo_client/views/AccountActivity.java new file mode 100644 index 0000000..5340c05 --- /dev/null +++ b/app/src/main/java/com/example/tampopo_client/views/AccountActivity.java @@ -0,0 +1,100 @@ +package com.example.tampopo_client.views; + +import android.content.Intent; +import android.os.Bundle; +import android.view.View; +import android.widget.Button; +import android.widget.EditText; +import android.widget.ImageButton; + +import androidx.activity.EdgeToEdge; +import androidx.appcompat.app.AppCompatActivity; +import androidx.core.graphics.Insets; +import androidx.core.view.ViewCompat; +import androidx.core.view.WindowInsetsCompat; + +import com.example.tampopo_client.R; +import com.example.tampopo_client.Tampopo; + +public class AccountActivity extends AppCompatActivity { + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + EdgeToEdge.enable(this); + setContentView(R.layout.activity_account); + 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; + }); + + + //アカウント編集画面から設定画面への遷移 + ImageButton buttonReturn = (ImageButton)findViewById(R.id.buttonReturn); + buttonReturn.setOnClickListener(new View.OnClickListener() { + public void onClick(View v) { + Intent intent = new Intent(AccountActivity.this, SettingActivity.class); + startActivity(intent); + } + }); + + //もともとのメールアドレスを表示 + EditText mailbuttonInput = (EditText) findViewById(R.id.mailbutton); + mailbuttonInput.setText(((Tampopo) AccountActivity.this.getApplication()).getNickname()); + + //決定ボタンを押したときにパスワードとメールアドレスを保存 + Button dicisionbutton = (Button) findViewById(R.id.dicisionbutton); + dicisionbutton.setOnClickListener(new View.OnClickListener() { + + private Object getApplication; + + public void onClick(View v) { + //現在のパスワード + EditText beforepasswordbuttonInput = (EditText) findViewById(R.id.beforepasswordbutton); + String beforepasswordbutton = beforepasswordbuttonInput.getText().toString(); + + //パスワード変更 + EditText afterpasswordbutton1Input = (EditText) findViewById(R.id.afterpasswordbutton1); + String afterpasswordbutton1 = afterpasswordbutton1Input.getText().toString(); + + EditText afterpasswordbutton2Input = (EditText) findViewById(R.id.afterpasswordbutton2); + String afterpasswordbutton2 = afterpasswordbutton1Input.getText().toString(); + ((Tampopo) AccountActivity.this.getApplication()).setPassword(afterpasswordbutton2); + + //メールアドレス登録 + EditText mailbuttonInput = (EditText) findViewById(R.id.mailbutton); + String mailbutton = mailbuttonInput.getText().toString(); + ((Tampopo) AccountActivity.this.getApplication()).setMailaddress(mailbutton); + + } + }); + + //もし前のパスワードが合っていなかったはじくようにする + + + //決定を押したら設定画面に遷移 + dicisionbutton.setOnClickListener(new View.OnClickListener() { + + private Object getApplication; + + public void onClick(View v) { + + Intent intent = new Intent(AccountActivity.this, SettingActivity.class); + startActivity(intent); + + + } + }); + + } + @Override + protected void onStart() { + super.onStart(); + + //もともとのメールアドレスを表示 + EditText mailbuttonInput = (EditText) findViewById(R.id.mailbutton); + mailbuttonInput.setText(((Tampopo) AccountActivity.this.getApplication()).getNickname()); + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/example/tampopo_client/views/LoginActivity.java b/app/src/main/java/com/example/tampopo_client/views/LoginActivity.java index 4e598b5..52837ad 100644 --- a/app/src/main/java/com/example/tampopo_client/views/LoginActivity.java +++ b/app/src/main/java/com/example/tampopo_client/views/LoginActivity.java @@ -53,13 +53,13 @@ } }); - Button button_login = (Button) findViewById(R.id.loginbutton); + Button button_login = (Button) findViewById(R.id.dicisionbutton); button_login.setOnClickListener(new OnClickListener() { private Object getApplication; public void onClick(View v) { - EditText useridInput = (EditText) findViewById(R.id.userIDText); + EditText useridInput = (EditText) findViewById(R.id.idbutton); String userid = useridInput.getText().toString(); ((Tampopo) LoginActivity.this.getApplication()).setUserId(userid); EditText passwordInput = (EditText) findViewById(R.id.PasswordText); diff --git a/app/src/main/java/com/example/tampopo_client/views/LogoutActivity.java b/app/src/main/java/com/example/tampopo_client/views/LogoutActivity.java new file mode 100644 index 0000000..35b0561 --- /dev/null +++ b/app/src/main/java/com/example/tampopo_client/views/LogoutActivity.java @@ -0,0 +1,49 @@ +package com.example.tampopo_client.views; + +import android.content.Intent; +import android.os.Bundle; +import android.view.View; +import android.widget.Button; +import android.widget.ImageButton; + +import androidx.activity.EdgeToEdge; +import androidx.appcompat.app.AppCompatActivity; +import androidx.core.graphics.Insets; +import androidx.core.view.ViewCompat; +import androidx.core.view.WindowInsetsCompat; + +import com.example.tampopo_client.R; + +public class LogoutActivity extends AppCompatActivity { + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + EdgeToEdge.enable(this); + setContentView(R.layout.activity_logout); + 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; + }); + + //ログアウト画面から設定画面への遷移 + Button cancelbutton = (Button) findViewById(R.id.cancelbutton); + cancelbutton.setOnClickListener(new View.OnClickListener() { + public void onClick(View v) { + Intent intent = new Intent(LogoutActivity.this, SettingActivity.class); + startActivity(intent); + } + }); + + //ログアウト画面から新規登録画面への遷移 + Button logoutbutton = (Button) findViewById(R.id.logoutbutton); + logoutbutton.setOnClickListener(new View.OnClickListener() { + public void onClick(View v) { + Intent intent = new Intent(LogoutActivity.this, SettingActivity.class); + startActivity(intent); + } + }); + + } +} \ No newline at end of file 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 5fb81c2..4553ea6 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 @@ -74,13 +74,13 @@ // }); //メイン画面から設定画面への遷移 -// ImageButton settingButton = (ImageButton)findViewById(R.id.setting); -// settingButton.setOnClickListener(new View.OnClickListener() { -// public void onClick(View v) { -// Intent intent = new Intent(MainActivity.this,settingActivity. class); -// startActivity(intent); -// } -// }); + ImageButton settingButton = (ImageButton)findViewById(R.id.setting); + settingButton.setOnClickListener(new View.OnClickListener() { + public void onClick(View v) { + Intent intent = new Intent(MainActivity.this,SettingActivity. class); + startActivity(intent); + } + }); messageList = findViewById(R.id.messageList); diff --git a/app/src/main/java/com/example/tampopo_client/views/ProfileActivity.java b/app/src/main/java/com/example/tampopo_client/views/ProfileActivity.java new file mode 100644 index 0000000..2f7ad0f --- /dev/null +++ b/app/src/main/java/com/example/tampopo_client/views/ProfileActivity.java @@ -0,0 +1,108 @@ +package com.example.tampopo_client.views; + +import android.content.Intent; +import android.os.Bundle; +import android.view.View; +import android.widget.Button; +import android.widget.EditText; +import android.widget.ImageButton; + +import androidx.activity.EdgeToEdge; +import androidx.appcompat.app.AppCompatActivity; +import androidx.core.graphics.Insets; +import androidx.core.view.ViewCompat; +import androidx.core.view.WindowInsetsCompat; + +import com.example.tampopo_client.R; +import com.example.tampopo_client.Tampopo; + +public class ProfileActivity extends AppCompatActivity { + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + EdgeToEdge.enable(this); + setContentView(R.layout.activity_profile); + 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; + }); + + + //プロフィール編集画面から設定画面への遷移 + ImageButton buttonReturn = (ImageButton)findViewById(R.id.buttonReturn); + buttonReturn.setOnClickListener(new View.OnClickListener() { + public void onClick(View v) { + Intent intent = new Intent(ProfileActivity.this, SettingActivity.class); + startActivity(intent); + } + }); + + //もともとのidとニックネームを表示 + EditText nicknameInput = (EditText) findViewById(R.id.nicknamebutton); + nicknameInput.setText(((Tampopo) ProfileActivity.this.getApplication()).getNickname()); + + EditText useridInput = (EditText) findViewById(R.id.idbutton); + useridInput.setText(((Tampopo) ProfileActivity.this.getApplication()).getUserId()); + + + //決定ボタンを押したときにidとニックネームを保存 + Button dicisionbutton = (Button) findViewById(R.id.dicisionbutton); + dicisionbutton.setOnClickListener(new View.OnClickListener() { + + private Object getApplication; + + public void onClick(View v) { + //ニックネームの変更 + EditText usernicknameInput = (EditText) findViewById(R.id.nicknamebutton); + String usernickname = usernicknameInput.getText().toString(); + ((Tampopo) ProfileActivity.this.getApplication()).setNickname(usernickname); + + //idの変更 + EditText useridInput = (EditText) findViewById(R.id.idbutton); + String userid = useridInput.getText().toString(); + ((Tampopo) ProfileActivity.this.getApplication()).setUserId(userid); + + Intent intent = new Intent(ProfileActivity.this, SettingActivity.class); + startActivity(intent); + + + } + }); + + //決定を押したら設定画面に遷移 +// dicisionbutton.setOnClickListener(new View.OnClickListener() { +// +// private Object getApplication; +// +// public void onClick(View v) { +// +// //決定を押したら設定画面に遷移 +// Intent intent = new Intent(ProfileActivity.this, SettingActivity.class); +// startActivity(intent); +// +// +// } +// }); + + + } + + @Override + protected void onStart() { + super.onStart(); + + //もともとのidとニックネームを表示 + EditText nicknameInput = (EditText) findViewById(R.id.nicknamebutton); + nicknameInput.setText(((Tampopo) ProfileActivity.this.getApplication()).getNickname()); + + EditText useridInput = (EditText) findViewById(R.id.idbutton); + useridInput.setText(((Tampopo) ProfileActivity.this.getApplication()).getUserId()); + + } + + + + +} diff --git a/app/src/main/java/com/example/tampopo_client/views/SettingActivity.java b/app/src/main/java/com/example/tampopo_client/views/SettingActivity.java new file mode 100644 index 0000000..067402c --- /dev/null +++ b/app/src/main/java/com/example/tampopo_client/views/SettingActivity.java @@ -0,0 +1,69 @@ +package com.example.tampopo_client.views; + +import android.content.Intent; +import android.os.Bundle; +import android.view.View; +import android.widget.Button; +import android.widget.ImageButton; + +import androidx.activity.EdgeToEdge; +import androidx.appcompat.app.AppCompatActivity; +import androidx.core.graphics.Insets; +import androidx.core.view.ViewCompat; +import androidx.core.view.WindowInsetsCompat; + +import com.example.tampopo_client.R; + +public class SettingActivity extends AppCompatActivity { + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + EdgeToEdge.enable(this); + setContentView(R.layout.activity_setting); + 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; + }); + + //設定画面からメイン画面への遷移 + ImageButton buttonReturn = (ImageButton)findViewById(R.id.buttonReturn); + buttonReturn.setOnClickListener(new View.OnClickListener() { + public void onClick(View v) { + Intent intent = new Intent(SettingActivity.this, MainActivity.class); + startActivity(intent); + } + }); + + + + + //設定画面からプロフィール編集画面の遷移 + Button profilebutton = (Button)findViewById(R.id.profilebutton); + profilebutton.setOnClickListener(new View.OnClickListener() { + public void onClick(View v) { + Intent intent = new Intent(SettingActivity.this, ProfileActivity.class); + startActivity(intent); + } + }); + + //設定画面からアカウント編集画面の遷移 + Button accountbutton = (Button)findViewById(R.id.accountbutton); + accountbutton.setOnClickListener(new View.OnClickListener() { + public void onClick(View v) { + Intent intent = new Intent(SettingActivity.this, AccountActivity.class); + startActivity(intent); + } + }); + + //設定画面からログアウト画面の遷移 + Button logoutbutton = (Button)findViewById(R.id.logoutbutton); + logoutbutton.setOnClickListener(new View.OnClickListener() { + public void onClick(View v) { + Intent intent = new Intent(SettingActivity.this, LogoutActivity.class); + startActivity(intent); + } + }); + } +} \ No newline at end of file diff --git a/app/src/main/res/layout/activity_account.xml b/app/src/main/res/layout/activity_account.xml new file mode 100644 index 0000000..35c59d0 --- /dev/null +++ b/app/src/main/res/layout/activity_account.xml @@ -0,0 +1,170 @@ + + + +