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/MyAdapter.java b/app/src/main/java/com/example/citrusclient/views/MyAdapter.java index 965f91c..425c268 100644 --- a/app/src/main/java/com/example/citrusclient/views/MyAdapter.java +++ b/app/src/main/java/com/example/citrusclient/views/MyAdapter.java @@ -109,6 +109,7 @@ favoritesMap.put(currentBook.getAccountId(), new HashSet<>()); } favoritesMap.get(currentBook.getAccountId()).add(currentBook.getBookId()); + currentBook.setFavoritedCount(currentBook.getFavoritedCount()+1); }else if(holder.LikeTextView.getTag().equals("liked")){ System.out.println(citrus.getAccountId()+"が"+currentBook.getAccountId()+"の"+currentBook.getBookId()+"を解除しました"); booksViewModel.unregisterFavoriteCount(currentBook.getAccountId(), currentBook.getBookId()); @@ -117,7 +118,9 @@ holder.LikeTextView.setImageResource(R.drawable.baseline_favorite_border_24); holder.LikeTextView.setTag("unliked"); favoritesMap.get(currentBook.getAccountId()).remove(currentBook.getBookId()); + currentBook.setFavoritedCount(currentBook.getFavoritedCount()-1); } + holder.LikedCountTextView.setText(context.getString(R.string.liked_count_format, currentBook.getFavoritedCount())); }); } 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 08d1510..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 @@ -83,8 +72,9 @@ FavoritesViewModel favoritesViewModel; private Integer strAccountColor; //色 - private Integer totalamount = 0; + private int totalamount = 0; + private List bookList = new ArrayList<>(); @@ -203,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); @@ -214,7 +204,7 @@ //観察部 //ユーザ(主)が持つ本一覧 - List bookList = new ArrayList<>(); + //List bookList = new ArrayList<>(); List point = new ArrayList<>(); booksLiveData.observe(getViewLifecycleOwner(), new Observer>() { @@ -223,13 +213,12 @@ if(integerBookHashMap != null){ bookList.clear(); bookList.addAll(integerBookHashMap.keySet()); - for(int i=0;i