diff --git a/app/src/main/java/com/example/citrusclient/rest/AccountsRest.java b/app/src/main/java/com/example/citrusclient/rest/AccountsRest.java index 7f52b2b..20c68b9 100644 --- a/app/src/main/java/com/example/citrusclient/rest/AccountsRest.java +++ b/app/src/main/java/com/example/citrusclient/rest/AccountsRest.java @@ -1,6 +1,5 @@ package com.example.citrusclient.rest; -import dalvik.annotation.optimization.FastNative; import retrofit2.Call; import retrofit2.http.DELETE; import retrofit2.http.Field; @@ -46,7 +45,6 @@ //仮 //アカウント削除 - @FormUrlEncoded @DELETE("accounts/{account_id}") Call deleteId( @Path("account_id") String account_id, diff --git a/app/src/main/java/com/example/citrusclient/views/SettingsFragment.java b/app/src/main/java/com/example/citrusclient/views/SettingsFragment.java index 12d0925..d7ed1bf 100644 --- a/app/src/main/java/com/example/citrusclient/views/SettingsFragment.java +++ b/app/src/main/java/com/example/citrusclient/views/SettingsFragment.java @@ -4,6 +4,24 @@ import android.content.res.ColorStateList; import android.graphics.Color; import android.os.Bundle; +import android.text.Editable; +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 com.example.citrusclient.Citrus; +import com.example.citrusclient.R; +import com.example.citrusclient.models.Book; +import com.example.citrusclient.viewmodels.BooksViewModel; +import com.example.citrusclient.viewmodels.FavoritesViewModel; +import com.example.citrusclient.viewmodels.SettingsViewModel; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; import androidx.annotation.NonNull; import androidx.annotation.Nullable; @@ -11,35 +29,6 @@ import androidx.lifecycle.MutableLiveData; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; - -import android.text.Editable; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.Button; -import android.widget.CompoundButton; -import android.widget.EditText; -import android.widget.Switch; -import android.widget.TextView; - -import com.example.citrusclient.Citrus; -import com.example.citrusclient.R; -import com.example.citrusclient.models.Book; -import com.example.citrusclient.rest.AccountsRest; -import com.example.citrusclient.viewmodels.BooksViewModel; -import com.example.citrusclient.viewmodels.FavoritesViewModel; -import com.example.citrusclient.viewmodels.SettingsViewModel; -import com.example.citrusclient.viewmodels.TodosViewModel; -import com.google.android.material.floatingactionbutton.FloatingActionButton; - -import java.util.ArrayList; -import java.util.Collections; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; /** * A simple {@link Fragment} subclass. Use the {@link SettingsFragment#newInstance} factory method @@ -204,7 +193,7 @@ TextView textNotes3 = (TextView) view.findViewById(R.id.textNotes3); textNotes3.setText("アカウントが削除されました"); //画面遷移処理 - Intent intent = (new Intent(getActivity(), SignUpActivity.class)); + Intent intent = (new Intent(getActivity(),LoginActivity.class)); startActivity(intent); }else if(integer == 404 || integer == 401){ TextView textNotes3 = (TextView) view.findViewById(R.id.textNotes3); @@ -337,18 +326,18 @@ //アカウント削除 view.findViewById(R.id.UpdatePass3).setOnClickListener(new View.OnClickListener() { @Override - public void onClick(View view) { + public void onClick(View view2) { EditText enter_nowPassword = (EditText) view.findViewById(R.id.EnterNowPassword3); - Editable editable_nowPasswrd = enter_nowPassword.getText(); + Editable editable_nowPassword = enter_nowPassword.getText(); TextView textNotes3 = (TextView) view.findViewById(R.id.textNotes3); - if (editable_nowPasswrd.length() == 0){ + if (editable_nowPassword.length() == 0){ textNotes3.setText("現在のパスワードを入力してください"); }else{ - String nowPassword = editable_nowPasswrd.toString().trim(); - settingsViewModel.deleteId(accountId, token, nowPassword); + String password = editable_nowPassword.toString().trim(); + settingsViewModel.deleteId(accountId, token, password); } } });