diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml
index 56f02f6..45eb019 100644
--- a/.idea/deploymentTargetDropDown.xml
+++ b/.idea/deploymentTargetDropDown.xml
@@ -7,11 +7,11 @@
-
+
-
+
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index dc8cf81..7b46144 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -7,7 +7,7 @@
-
+
+
+
+
diff --git a/.idea/statistic.xml b/.idea/statistic.xml
new file mode 100644
index 0000000..a71a751
--- /dev/null
+++ b/.idea/statistic.xml
@@ -0,0 +1,10 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/java/com/example/nemophila/MainActivity.java b/app/src/main/java/com/example/nemophila/MainActivity.java
deleted file mode 100644
index 57930f1..0000000
--- a/app/src/main/java/com/example/nemophila/MainActivity.java
+++ /dev/null
@@ -1,388 +0,0 @@
-//package com.example.nemophila;
-//
-//import androidx.fragment.app.FragmentActivity;
-//
-//import androidx.activity.result.ActivityResultLauncher;
-//import androidx.activity.result.contract.ActivityResultContracts;
-//import androidx.core.app.ActivityCompat;
-//import androidx.core.content.ContextCompat;
-//import androidx.lifecycle.ViewModelProvider;
-//
-//import android.app.ProgressDialog;
-//import android.os.Bundle;
-//import android.view.View;
-//import android.widget.ImageButton;
-//import android.widget.Toast;
-//import android.annotation.SuppressLint;
-//import android.content.pm.PackageManager;
-//import android.location.Location;
-//import android.location.LocationListener;
-//import android.location.LocationManager;
-//import android.content.Intent;
-//import android.provider.Settings;
-//import android.util.Log;
-//import android.Manifest;
-//
-//import com.example.nemophila.entities.Shop;
-//import com.example.nemophila.viewmodels.ShopsViewModel;
-//import com.google.android.gms.maps.CameraUpdateFactory;
-//import com.google.android.gms.maps.GoogleMap;
-//import com.google.android.gms.maps.OnMapReadyCallback;
-//import com.google.android.gms.maps.SupportMapFragment;
-//import com.google.android.gms.maps.model.BitmapDescriptor;
-//import com.google.android.gms.maps.model.BitmapDescriptorFactory;
-//import com.google.android.gms.maps.model.CameraPosition;
-//import com.google.android.gms.maps.model.GroundOverlay;
-//import com.google.android.gms.maps.model.GroundOverlayOptions;
-//import com.google.android.gms.maps.model.LatLng;
-//import com.google.android.gms.maps.model.LatLngBounds;
-//import com.google.android.gms.maps.model.Marker;
-//import com.google.android.gms.maps.model.MarkerOptions;
-//import com.example.nemophila.databinding.ActivityMainBinding;
-//
-//import java.util.Locale;
-//
-//public class MainActivity extends FragmentActivity implements OnMapReadyCallback,LocationListener {
-// ShopsViewModel shopsViewModel;
-//
-// Nemophila nemophila;
-// private GoogleMap mMap;
-// private ActivityMainBinding binding;
-// private LatLng currentLatlng = null;
-// private LatLng initialLatlng;
-// private LatLng shopLatlng;
-// private LatLng testLatlng;
-// private LatLng testLatlng2;
-// private LatLng tapLatlng;
-// private CameraPosition nowCamera;
-// private LatLng nowLatlng;
-//
-// private GroundOverlay currentOverlay;
-// LocationManager locationManager;
-//
-//
-// @Override
-// protected void onCreate(Bundle savedInstanceState) {
-// super.onCreate(savedInstanceState);
-// shopsViewModel = new ViewModelProvider(this).get(ShopsViewModel.class);
-//
-// binding = ActivityMainBinding.inflate(getLayoutInflater());
-// setContentView(binding.getRoot());
-////
-//// nemophila = (Nemophila) this.getApplication();
-////
-//// ImageButton myPageButton = findViewById(R.id.myPageButton);
-//// // lambda式
-//// myPageButton.setOnClickListener( v -> {
-//// Log.d("debug", "myPageButton, マイページに画面遷移");
-//// Intent intent = new Intent(MainActivity.this, MyPageActivity.class);
-//// startActivity(intent);
-//// });
-//
-//
-// if (ActivityCompat.checkSelfPermission(this,
-// Manifest.permission.ACCESS_FINE_LOCATION)
-// != PackageManager.PERMISSION_GRANTED) {
-//
-// requestPermissionLauncher.launch(
-// Manifest.permission.ACCESS_FINE_LOCATION);
-// }
-// else{
-// locationStart();
-// }
-//
-// // Obtain the SupportMapFragment and get notified when the map is ready to be used.
-// SupportMapFragment mapFragment = (SupportMapFragment) getSupportFragmentManager()
-// .findFragmentById(R.id.map);
-// assert mapFragment != null;
-// mapFragment.getMapAsync(this);
-//
-// }
-//
-// @Override
-// public void onMapReady(GoogleMap googleMap) {
-// mMap = googleMap;
-//
-// //ViewModelへのアクセス
-// shopsViewModel = new ViewModelProvider(this).get(ShopsViewModel.class);
-//
-// // LiveDataへの購読
-// shopsViewModel.getShopsLiveData().observe(this, shops -> {
-// //受け取ったshopsに対してMarkerが立っているかを確認
-// //対応するMarkerがなければMarkerを立てる
-// for(Shop shop:shops) {
-// if(shopsViewModel.getMarker(shop)==null){
-//
-// shopLatlng = new LatLng(shop.getLatitude(), shop.getLongitude());
-// System.out.println(shopLatlng);
-// Marker createMaker = mMap.addMarker(new MarkerOptions().position(shopLatlng).title(""));
-// //マーカーに店情報を持たせる
-// createMaker.setTag(shop);
-// //ShopToMarkerに紐づけ
-// shopsViewModel.setShopAndMarker(shop,createMaker);
-// }
-// }
-//
-// });
-//
-///*
-// //研究室周辺の緯度経度
-// double latitude = 34.7308032;
-// double longitude = 135.2630272;
-//
-// //テスト用,仮ピン立て
-// testLatlng = new LatLng(latitude, longitude);
-// testLatlng2 = new LatLng(34.74, 135.26);
-//
-// //店Cの座標にカメラ移動
-// //initialLatlng = new LatLng(34.5,12.3);
-//
-// //標準のマーカー(店用のピン)
-// //setMarker(latitude, longitude);
-//
-// //アイコン画像をマーカーに設定
-// //画像関連がわかっていないのでパス
-// //setIcon(latitude, longitude);
-// */
-//
-// //初期画面の座標（現在地をロードするまで表示）
-// //initialLatlng = new LatLng(39,138);
-// initialLatlng = new LatLng(nemophila.getCameraLatitude(),nemophila.getCameraLongitude());
-// //初期画面に移動
-// //mMap.moveCamera(CameraUpdateFactory.newLatLngZoom(initialLatlng, 15f));
-// mMap.moveCamera(CameraUpdateFactory.newLatLngZoom(initialLatlng, nemophila.getZoom()));
-//
-//
-// //画面が動いたとき
-// mMap.setOnCameraIdleListener(() -> {
-// //カメラの座標とZOOM倍率を保存
-// //nowCamera = mMap.getCameraPosition();
-// nemophila.setCameraLatitude(mMap.getCameraPosition().target.latitude);
-// nemophila.setCameraLongitude(mMap.getCameraPosition().target.longitude);
-// nemophila.setZoom(mMap.getCameraPosition().zoom);
-//
-// //nowLatlng = new LatLng(nowCamera.target.latitude, nowCamera.target.longitude);
-// //nowZoom = nowCamera.zoom;
-// //Shopの描画範囲を指定
-// shopsViewModel.setViewArea(nemophila.getCameraLongitude()+1, nemophila.getCameraLatitude()+1, nemophila.getCameraLongitude()-1, nemophila.getCameraLatitude()-1);
-// });
-//
-// /*
-// //多分使わない
-// // タップした時のリスナーをセット
-// mMap.setOnMapClickListener(tapLocation -> {
-// // map(ピン以外)をtapされた位置の緯度経度
-// tapLatlng = new LatLng(tapLocation.latitude, tapLocation.longitude);
-// mMap.moveCamera(CameraUpdateFactory.newLatLngZoom(tapLatlng, nowZoom));
-// shopsViewModel.setViewArea(tapLatlng.longitude+1, tapLatlng.latitude+1, tapLatlng.longitude-1, tapLatlng.latitude-1);
-// });
-// */
-//
-// //長押し時に店を作成し、その座標にピンを立てる
-// //長押し時にその座標を保存し、投稿画面に移り、Shop作成完了時にはピンを立て、Shop画面に移行
-// mMap.setOnMapLongClickListener(longpushLocation -> {
-// //長押しされた位置の緯度経度を取得
-// //LatLng newlocation = new LatLng(longpushLocation.latitude, longpushLocation.longitude);
-// //Nemophilaに座標を保存
-// nemophila.setCurrentLatitude(longpushLocation.latitude);
-// nemophila.setCurrentLongitude(longpushLocation.longitude);
-// //長押しした場合は今からShopを作成するので、CurrentShopをnullで登録しておく
-// nemophila.setCurrentShop(null);
-// //ShopCreate画面に遷移
-// Intent intent = new Intent(MainActivity.this, ShopCreateActivity.class);
-// startActivity(intent);
-// });
-//
-// // ピンをクリックした場合
-// mMap.setOnMarkerClickListener(new GoogleMap.OnMarkerClickListener() {
-// @Override
-// public boolean onMarkerClick(Marker marker) {
-// //店の詳細と投稿一覧を表示
-// //ここでshopActivityを呼び出す
-//
-// //下からクリックしたことを通知
-// Toast.makeText(MainActivity.this, "ピンクリック", Toast.LENGTH_SHORT).show();
-// //選んだ店をsetする（現状はnullになっているが後で直す）
-// nemophila.setCurrentShop((Shop)marker.getTag());
-// System.out.println(nemophila.getCurrentShop().getName());
-//
-// //ShopActivity画面に遷移
-// Intent intent = new Intent(MainActivity.this, ShopActivity.class);
-// startActivity(intent);
-//
-// return false;
-// }
-// });
-//
-// }
-//
-// //起動時から立っているピンの設定。完成時不要
-// private void setMarker(double latitude, double longitude){
-// MarkerOptions markerOptions = new MarkerOptions();
-// MarkerOptions markerOptions2 = new MarkerOptions();
-//
-// markerOptions.position(testLatlng);
-// markerOptions.title("ntlab");
-// mMap.addMarker(markerOptions);
-//
-// //テスト用
-// markerOptions2.position(testLatlng2);
-// markerOptions2.title(null);
-// mMap.addMarker(markerOptions2);
-//
-// }
-//
-// private void zoomMap(double latitude, double longitude){
-// // 表示する東西南北の緯度経度を設定
-// double south = latitude * (1-0.00005);
-// double west = longitude * (1-0.00005);
-// double north = latitude * (1+0.00005);
-// double east = longitude * (1+0.00005);
-//
-// LatLng latlng = new LatLng(latitude,longitude);
-//
-// // LatLngBounds (LatLng southwest, LatLng northeast)
-// //左下、右上
-// LatLngBounds bounds = LatLngBounds.builder()
-// .include(new LatLng(south , west))
-// .include(new LatLng(north, east))
-// .build();
-//
-// int width = getResources().getDisplayMetrics().widthPixels;
-// int height = getResources().getDisplayMetrics().heightPixels;
-//
-// // static CameraUpdate.newLatLngBounds(LatLngBounds bounds, int width, int height, int padding)
-// mMap.moveCamera(CameraUpdateFactory.
-// newLatLngBounds(bounds, width, height, 0));
-//
-// //ズーム処理
-// mMap.moveCamera(CameraUpdateFactory.newLatLngZoom(latlng, nemophila.getZoom()));
-// }
-//
-// //現在地の表示
-// private void setIcon(double latitude, double longitude){
-// //Drawable ic_current = ResourcesCompat.getDrawable(getResources(),R.drawable.icon_current,null);
-// //更新前の現在地アイコンを消去
-// if(currentOverlay != null) {
-// currentOverlay.remove();
-// }
-//
-// LatLng current_location = new LatLng(latitude,longitude);
-//
-// // マップに貼り付ける BitmapDescriptor生成
-// BitmapDescriptor descriptor = BitmapDescriptorFactory.fromResource(R.drawable.icon_current);
-// //Drawable ic_current = ResourcesCompat.getDrawable(getResources(),R.drawable.ic_current_location,null);
-//
-// // 貼り付設定
-// GroundOverlayOptions overlayOptions = new GroundOverlayOptions();
-// overlayOptions.image(descriptor);
-//
-// //public GroundOverlayOptions anchor (float u, float v)
-// // (0,0):top-left, (0,1):bottom-left, (1,0):top-right, (1,1):bottom-right
-// overlayOptions.anchor(0.5f, 0.5f);
-//
-// // 張り付け画像の大きさ メートル単位
-// // public GroundOverlayOptions position(LatLng location, float width, float height)
-// overlayOptions.position(current_location, 200f, 200f);
-//
-// // マップに貼り付け・アルファを設定
-// currentOverlay = mMap.addGroundOverlay(overlayOptions);
-//
-// // 透明度
-// assert currentOverlay != null;
-// currentOverlay.setTransparency(0.8F);
-// }
-//
-//
-// private final ActivityResultLauncher
-// requestPermissionLauncher = registerForActivityResult(
-// new ActivityResultContracts.RequestPermission(),
-// isGranted -> {
-// if (isGranted) {
-// locationStart();
-// }
-// else {
-// Toast toast = Toast.makeText(this,
-// "これ以上なにもできません", Toast.LENGTH_SHORT);
-// toast.show();
-// }
-// });
-//
-// //現在地の取得
-// @SuppressLint("MissingPermission")
-// private void locationStart(){
-// Log.d("debug","locationStart()");
-//
-// // LocationManager インスタンス生成
-// locationManager =
-// (LocationManager) getSystemService(LOCATION_SERVICE);
-//
-// if (locationManager != null && locationManager.isProviderEnabled(
-// LocationManager.GPS_PROVIDER)) {
-//
-// Log.d("debug", "location manager Enabled");
-// } else {
-// // GPSを設定するように促す
-// Intent settingsIntent =
-// new Intent(Settings.ACTION_LOCATION_SOURCE_SETTINGS);
-// startActivity(settingsIntent);
-// Log.d("debug", "not gpsEnable, startActivity");
-// }
-//
-// if (ContextCompat.checkSelfPermission(this,
-// Manifest.permission.ACCESS_FINE_LOCATION) !=
-// PackageManager.PERMISSION_GRANTED) {
-// ActivityCompat.requestPermissions(this,
-// new String[]{Manifest.permission.ACCESS_FINE_LOCATION,}, 1000);
-//
-// Log.d("debug", "checkSelfPermission false");
-// return;
-// }
-//
-// locationManager.requestLocationUpdates(LocationManager.GPS_PROVIDER,
-// 1000, 50, this);
-//
-// }
-//
-// @Override
-// public void onLocationChanged(Location location) {
-// //初期画面は現在地を中心にするため...
-// if (currentLatlng == null){
-// //↓現在地ロード後画面中心を現在地にする場合
-// //zoomMap(location.getLatitude(), location.getLongitude());
-// //ロード画面の終了
-// findViewById(R.id.LL_Load).setVisibility(View.GONE);
-//
-// //現在地ボタンを表示
-// findViewById(R.id.currentButton).setVisibility(View.VISIBLE);
-// ImageButton button1 = findViewById(R.id.currentButton);
-//
-// button1.setOnClickListener( v -> {
-// Log.d("debug", "currentbutton, 現在地にカメラを移動");
-// System.out.println(shopsViewModel.getShopsLiveData().getValue());
-// //現在地にカメラを移動
-// zoomMap(currentLatlng.latitude, currentLatlng.longitude);
-// });
-// }
-//
-// //現在地が変更されるたびに現在地アイコンを移動
-// //LatLng型で受け取っておく
-// currentLatlng = new LatLng(location.getLatitude(), location.getLongitude());
-//
-// //現在地アイコンを表示.このsetIcon内にzoomMap処理もあるので注意
-// setIcon(location.getLatitude(),location.getLongitude());
-// }
-//
-//
-//
-// @Override
-// public void onProviderEnabled(String provider) {
-//
-// }
-//
-// @Override
-// public void onProviderDisabled(String provider) {
-//
-// }
-//
-//}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/nemophila/MapsFragment.java b/app/src/main/java/com/example/nemophila/MapsFragment.java
index a290a78..dc488fb 100644
--- a/app/src/main/java/com/example/nemophila/MapsFragment.java
+++ b/app/src/main/java/com/example/nemophila/MapsFragment.java
@@ -78,12 +78,9 @@
Nemophila nemophila;
private GoogleMap mMap;
- private GeoApiContext geoApiContext;
- private ActivityMainBinding binding;
private LatLng currentLatlng = null;
private LatLng initialLatlng;
private LatLng shopLatlng;
- private LatLng tapLatlng;
private Marker currentMarker;
private BitmapDescriptor bd;
ArrayList friendsData;
diff --git a/app/src/main/java/com/example/nemophila/MyPageActivity.java b/app/src/main/java/com/example/nemophila/MyPageActivity.java
index 75a2f79..dffa130 100644
--- a/app/src/main/java/com/example/nemophila/MyPageActivity.java
+++ b/app/src/main/java/com/example/nemophila/MyPageActivity.java
@@ -218,30 +218,6 @@
});
}
- // アイコンに画像を設定
-// private void setIcon(ImageView iv) {
-// executor.execute(() -> {
-// try{
-// URL url = new URL(iconUrlString);
-// HttpURLConnection con = (HttpURLConnection) url.openConnection();
-// con.connect();
-//
-// InputStream is = con.getInputStream();
-//
-// Bitmap bitmap = BitmapFactory.decodeStream(is);
-// handler.post(() -> iv.setImageBitmap(bitmap));
-// is.close();
-// con.disconnect();
-// }catch (Exception e){
-// e.printStackTrace();
-// iconUrlString = "http://nitta-lab-www.is.konan-u.ac.jp/nemophila-data/test01.jpg";
-// setIcon(iv);
-// }
-// });
-// }
-
- /* ここからMyPageActivityの内部クラス */
-
// Adapter
abstract public class MyPageActAdapter extends RecyclerView.Adapter {
private List list;
diff --git a/app/src/main/java/com/example/nemophila/PostDataModel.java b/app/src/main/java/com/example/nemophila/PostDataModel.java
deleted file mode 100644
index f4c5bc0..0000000
--- a/app/src/main/java/com/example/nemophila/PostDataModel.java
+++ /dev/null
@@ -1,43 +0,0 @@
-//package com.example.nemophila;
-//
-//public class PostDataModel {
-// private String name;
-// private String date;
-// private String rate;
-// private String genre;
-// private String comment;
-//
-// public String getName() {
-// return name;
-// }
-// public void setName(String name) {
-// this.name = name;
-// }
-//
-// public String getDate() {
-// return date;}
-// public void setDate(String date) {
-// this.date = date;
-// }
-//
-// public String getRate() {
-// return rate;
-// }
-// public void setRate(String rate) {
-// this.rate = rate;
-// }
-//
-// public String getGenre() {
-// return genre;
-// }
-// public void setGenre(String genre) {
-// this.genre = genre;
-// }
-//
-// public String getComment() {
-// return comment;
-// }
-// public void setComment(String comment) {
-// this.comment = comment;
-// }
-//}
diff --git a/app/src/main/java/com/example/nemophila/PostsViewHolder.java b/app/src/main/java/com/example/nemophila/PostsViewHolder.java
deleted file mode 100644
index 1f618d3..0000000
--- a/app/src/main/java/com/example/nemophila/PostsViewHolder.java
+++ /dev/null
@@ -1,24 +0,0 @@
-//package com.example.nemophila;
-//
-//import android.view.View;
-//import android.widget.TextView;
-//
-//import androidx.annotation.NonNull;
-//import androidx.recyclerview.widget.RecyclerView;
-//
-//public class PostsViewHolder extends RecyclerView.ViewHolder {
-// public TextView nameView;
-// public TextView dateView;
-// public TextView rateView;
-// public TextView genreView;
-// public TextView commentView;
-//
-// public PostsViewHolder(@NonNull View itemView) {
-// super(itemView);
-// nameView = (TextView) itemView.findViewById(R.id.userName);
-// dateView = (TextView) itemView.findViewById(R.id.date);
-// rateView = (TextView) itemView.findViewById(R.id.rate);
-// genreView = (TextView) itemView.findViewById(R.id.genre);
-// commentView = (TextView) itemView.findViewById(R.id.comment);
-// }
-//}
diff --git a/app/src/main/java/com/example/nemophila/RequestingActivity.java b/app/src/main/java/com/example/nemophila/RequestingActivity.java
deleted file mode 100644
index f2a6f78..0000000
--- a/app/src/main/java/com/example/nemophila/RequestingActivity.java
+++ /dev/null
@@ -1,286 +0,0 @@
-//package com.example.nemophila;
-//
-//import androidx.annotation.NonNull;
-//import androidx.appcompat.app.AppCompatActivity;
-//import androidx.lifecycle.Observer;
-//import androidx.lifecycle.ViewModelProvider;
-//import androidx.recyclerview.widget.DividerItemDecoration;
-//import androidx.recyclerview.widget.LinearLayoutManager;
-//import androidx.recyclerview.widget.RecyclerView;
-//
-//import android.app.AlertDialog;
-//import android.content.DialogInterface;
-//import android.content.Intent;
-//import android.os.Bundle;
-//import android.view.LayoutInflater;
-//import android.view.View;
-//import android.view.ViewGroup;
-//import android.widget.Button;
-//import android.widget.EditText;
-//import android.widget.ImageView;
-//import android.widget.TextView;
-//import android.widget.Toast;
-//
-//import com.example.nemophila.entities.Account;
-//import com.example.nemophila.entities.AccountNameJson;
-//import com.example.nemophila.entities.ErrorType;
-//import com.example.nemophila.entities.Post;
-//import com.example.nemophila.viewmodels.AccountViewModel;
-//import com.example.nemophila.viewmodels.FriendViewModel;
-//import com.example.nemophila.viewmodels.PostsViewModel;
-//
-//import java.util.ArrayList;
-//import java.util.Collection;
-//import java.util.List;
-//
-//public class RequestingActivity extends AppCompatActivity {
-//
-// FriendViewModel friendViewModel;
-// String uid;
-// String token;
-// String requestingId;
-// String requestingName;
-// String searchingId;
-//
-// @Override
-// protected void onCreate(Bundle savedInstanceState) {
-// super.onCreate(savedInstanceState);
-// setContentView(R.layout.activity_requesting);
-// //Nemophilaから自分のuidとtokenを取得
-// uid = ((Nemophila)getApplication()).getUid();
-// token = ((Nemophila)getApplication()).getToken();
-//
-// //左上のボタンでマイページへ遷移
-// Button returnButton = (Button)findViewById(R.id.requestingAcReturnButton);
-// returnButton.setOnClickListener(new View.OnClickListener(){
-// public void onClick(View v){
-// Intent intent = new Intent(getApplication(), MyPageActivity.class);
-// startActivity(intent);
-// }
-// });
-//
-// //idからアカウント名を検索するためのAccountViewModelを宣言しておく
-// AccountViewModel accountViewModel = new ViewModelProvider(this).get(AccountViewModel.class);
-//
-// //フレンド検索ボタン
-// Button requestingButton = (Button)findViewById(R.id.requestingSearchButton);
-// requestingButton.setOnClickListener(new View.OnClickListener(){
-//
-// @Override
-// public void onClick(View v){
-// //入力されたIDを取得
-// EditText editSearchId = (EditText) findViewById(R.id.inputRequestingId);
-// searchingId = editSearchId.getText().toString();
-// //取得したIDからアカウントを読み込み、検索用LiveDataのonChangeへ
-// accountViewModel.fetchAccount(searchingId);
-// }
-// });
-//
-// //検索用LiveDataへの購読
-// accountViewModel.getAccountLiveData().observe(RequestingActivity.this, new Observer() {
-//
-// //ViewModelから検索結果が返ってくれば(データ変更があれば)実行
-// @Override
-// public void onChanged(Account user) {
-//
-// if (user == null) {
-// new AlertDialog.Builder(RequestingActivity.this)
-// .setTitle("IDが間違っています")
-// .setPositiveButton("OK", null)
-// .create()
-// .show();
-// } else {
-// requestingName = (user.getName());
-//
-// //申請を送るダイアログ
-// RequestingDialogFragment dialog = new RequestingDialogFragment(RequestingActivity.this);
-// //名前を渡す
-// Bundle args = new Bundle();
-// args.putString("message", requestingName);
-// dialog.setArguments(args);
-//
-// //ダイアログの表示
-// dialog.show(getSupportFragmentManager(), "Requesting_dialog");
-// //OK押したら申請するメソッドにuid、requestingId、tokenを渡す
-// }
-// }
-// });
-//
-// //FriendViewModelの初期化
-// friendViewModel = new ViewModelProvider(this).get(FriendViewModel.class);
-//
-// //エラーコードを購読
-// friendViewModel.getErrorLiveData().observe(RequestingActivity.this, new Observer() {
-// @Override
-// public void onChanged(String error) {
-//
-// if (error == ErrorType.ResponseError.getText()) {
-// new AlertDialog.Builder(RequestingActivity.this)
-// .setTitle("既にフレンド、申請を受けているなどの理由で申請できません")
-// .setPositiveButton("OK", null)
-// .create()
-// .show();
-// }
-// }
-// });
-//
-// //RecyclerView(表示の設定、直接表示するところはLivedataを購読しているonChanged内に)
-// List requestingDataList = new ArrayList<>();
-//
-// //xmlからrvにRecyclerViewを取得
-// RecyclerView rv = (RecyclerView) findViewById(R.id.requestingList);
-//
-// //アダプターを宣言し、削除ボタンを押したときの処理をオーバーライド
-// RequestingAdapter adapter = new RequestingAdapter(requestingDataList){
-// @Override
-// void onDeleteClick(View view, int position, RequestingDataModel user) {
-// new AlertDialog.Builder(RequestingActivity.this)
-// .setTitle(user.getName() + "さんへの申請を削除しますか?")
-// .setPositiveButton("OK", new DialogInterface.OnClickListener() {
-// @Override
-// public void onClick(DialogInterface dialog, int which) {
-// Toast.makeText(RequestingActivity.this, user.getName(), Toast.LENGTH_SHORT).show();
-// friendViewModel.deleteRequesting(uid, user.getId(), token);
-// }
-// })
-// .setNegativeButton("キャンセル", null)
-// .create()
-// .show();
-// }
-// };
-//
-// //一行ずつを縦に(LinearLayout)表示するLayoutManagerを宣言
-// LinearLayoutManager llm = new LinearLayoutManager(this);
-// //データごとの区切り線を入れる
-// RecyclerView.ItemDecoration itemDecoration =
-// new DividerItemDecoration(this, DividerItemDecoration.VERTICAL);
-// rv.addItemDecoration(itemDecoration);
-//
-// rv.setHasFixedSize(true);
-// rv.setLayoutManager(llm);
-//
-// //FriendViewModelを初期化し、申請先のデータをロードしておく
-// friendViewModel = new ViewModelProvider(this).get(FriendViewModel.class);
-// friendViewModel.getRequesting(uid);
-//
-// //申請先の一覧のLiveDataへの購読
-// friendViewModel.getRequestingLiveData().observe(this, new Observer>() {
-// //データに変更があった時実行
-// @Override
-// public void onChanged(Collection requestingUsers) {
-//
-// //表示用のDataListを一旦クリアし、LiveDataから受け取ったデータを一つずつセット(重複しないように)
-// requestingDataList.clear();
-// //受け取ったLivedataの要素分繰り返し、セット
-// for (AccountNameJson user: requestingUsers) {
-// //申請先１人に必要な情報をセットするdataを宣言
-// RequestingDataModel data = new RequestingDataModel();
-// //dataをpostsDatasetに追加してリストを作る
-// data.setName(user.getName());
-// data.setId(user.getUid());
-//
-// //申請先一つの情報がdataに全部セットされたらDatasetに追加 重複していたら追加しない
-// if(!(requestingDataList.contains(data))) {
-// requestingDataList.add(0, data);
-// }
-// }
-//
-// //onChange内に書くべき表示部分
-// adapter.setList(requestingDataList);
-// rv.setAdapter(adapter);
-// }
-// });
-// }
-//
-//
-// //ダイアログでOKを押した時に呼び出される フレンド申請を送るメソッド
-// public void putRequesting(){
-// requestingId = searchingId;
-// friendViewModel.putRequesting(uid, requestingId, requestingName, token);
-// }
-//
-// //RecyclerViewのための内部クラス
-// //Adapter
-// public class RequestingAdapter extends RecyclerView.Adapter {
-//
-// private List list;
-//
-// public RequestingAdapter(List list) {
-// this.list =list;
-// }
-//
-// public void setList(List list) {
-// this.list = list;
-// }
-//
-// @NonNull
-// @Override
-// public RequestingViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
-// //1データあたりのレイアウトを読み込み、ビューホルダーを宣言
-// View inflate = LayoutInflater.from(parent.getContext()).inflate(R.layout.layout_requesting_activity, parent,false);
-// RequestingViewHolder vh = new RequestingViewHolder(inflate);
-//
-// // リスト内の削除ボタンを押した時の処理
-// vh.deleteButton.setOnClickListener(new View.OnClickListener() {
-// @Override
-// public void onClick(View v) {
-// int position = vh.getBindingAdapterPosition();
-// // 処理はonDeleteClickに
-// onDeleteClick(v, position, list.get(position));
-// }
-// });
-//
-// return vh;
-// }
-//
-// @Override
-// public void onBindViewHolder(@NonNull RequestingViewHolder holder, int position) {
-// holder.nameView.setText(list.get(position).getName());
-// }
-//
-// @Override
-// public int getItemCount() {
-// return list.size();
-// }
-//
-// void onDeleteClick(View view, int position, RequestingDataModel requesting) {
-// // このメソッドをActivity内でオーバーライドして、クリックイベントの処理を設定する
-// }
-// }
-//
-// //ViewHolder
-// public class RequestingViewHolder extends RecyclerView.ViewHolder {
-// public TextView nameView;
-// public ImageView iconView;
-// public Button deleteButton;
-//
-// public RequestingViewHolder(@NonNull View itemView) {
-// super(itemView);
-// nameView = (TextView) itemView.findViewById(R.id.requestingName);
-// iconView = itemView.findViewById(R.id.requestingIcon);
-// deleteButton = itemView.findViewById(R.id.requestingDeleteButton);
-// }
-// }
-//
-// //DataModel
-// public static class RequestingDataModel extends FriendActivity.RequestingDataModel {
-// private String name;
-// private String id;
-//
-// public String getName() {
-// return name;
-// }
-// public String getId() {
-// return id;
-// }
-//
-// public void setName(String name) {
-// this.name = name;
-// }
-// public void setId(String id){
-// this.id = id;
-// }
-//
-// }
-//
-//}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/nemophila/ShopActivityAdapter.java b/app/src/main/java/com/example/nemophila/ShopActivityAdapter.java
deleted file mode 100644
index 6f5c201..0000000
--- a/app/src/main/java/com/example/nemophila/ShopActivityAdapter.java
+++ /dev/null
@@ -1,46 +0,0 @@
-//package com.example.nemophila;
-//
-//import android.view.LayoutInflater;
-//import android.view.View;
-//import android.view.ViewGroup;
-//
-//import androidx.annotation.NonNull;
-//import androidx.recyclerview.widget.RecyclerView;
-//
-//import java.util.List;
-//
-//public class ShopActivityAdapter extends RecyclerView.Adapter {
-//
-// private List list;
-//
-// public ShopActivityAdapter(List list) {
-// this.list =list;
-// }
-//
-// public void setList(List list) {
-// this.list = list;
-// }
-//
-// @NonNull
-// @Override
-// public PostsViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
-//
-// View inflate = LayoutInflater.from(parent.getContext()).inflate(R.layout.layout_shop_activity_posts, parent,false);
-// PostsViewHolder vh = new PostsViewHolder(inflate);
-// return vh;
-// }
-//
-// @Override
-// public void onBindViewHolder(@NonNull PostsViewHolder holder, int position) {
-// holder.nameView.setText(list.get(position).getName());
-// holder.dateView.setText(list.get(position).getDate());
-// holder.rateView.setText(list.get(position).getRate());
-// holder.genreView.setText(list.get(position).getGenre());
-// holder.commentView.setText(list.get(position).getComment());
-// }
-//
-// @Override
-// public int getItemCount() {
-// return list.size();
-// }
-//}