Skip to content

Commit 3b7a915

Browse files
LuSuAllenLuSuAllen
committed
delete summoner repo
1 parent aae6af0 commit 3b7a915

File tree

9 files changed

+37
-67
lines changed

9 files changed

+37
-67
lines changed

‎app/src/main/java/com/example/searchlol/SavedSummonerActivity.java‎

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
11
package com.example.searchlol;
22

33
import androidx.annotation.NonNull;
4-
import androidx.appcompat.app.ActionBarDrawerToggle;
54
import androidx.appcompat.app.AppCompatActivity;
6-
import androidx.appcompat.widget.Toolbar;
7-
import androidx.drawerlayout.widget.DrawerLayout;
85
import androidx.lifecycle.Observer;
96
import androidx.lifecycle.ViewModelProvider;
107
import androidx.recyclerview.widget.ItemTouchHelper;
@@ -15,13 +12,11 @@
1512

1613
import android.content.Intent;
1714
import android.os.Bundle;
18-
import android.view.MenuItem;
1915
import android.widget.Toast;
2016

21-
import com.example.searchlol.dataclass.SummonerRepo;
17+
import com.example.searchlol.dataclass.SummonerClass;
2218
import com.example.searchlol.adapter.SavedSummonerAdapter;
2319
import com.example.searchlol.viewmodel.SavedSummonerViewModel;
24-
import com.google.android.material.navigation.NavigationView;
2520

2621
public class SavedSummonerActivity extends AppCompatActivity implements SavedSummonerAdapter.OnNameItemClickListener {
2722

@@ -47,10 +42,10 @@ protected void onCreate(Bundle savedInstanceState) {
4742
new ViewModelProvider.AndroidViewModelFactory(getApplication())
4843
).get(SavedSummonerViewModel.class);
4944

50-
mViewModel.getAllSummoners().observe(this, new Observer<List<SummonerRepo>>() {
45+
mViewModel.getAllSummoners().observe(this, new Observer<List<SummonerClass>>() {
5146
@Override
5247

53-
public void onChanged(List<SummonerRepo> gitHubRepos) {
48+
public void onChanged(List<SummonerClass> gitHubRepos) {
5449
adapter.updateLocationList(gitHubRepos);
5550
}
5651
});
@@ -71,7 +66,7 @@ public void onSwiped(@NonNull RecyclerView.ViewHolder viewHolder, int direction)
7166
}
7267

7368
@Override
74-
public void onNameItemClick(SummonerRepo summonerClass) {
69+
public void onNameItemClick(SummonerClass summonerClass) {
7570
//load summoner name
7671
Intent intent = new Intent(this, SummonerDetailActivity.class);
7772
intent.putExtra(SummonerDetailActivity.EXTRA_GITHUB_REPO, summonerClass);

‎app/src/main/java/com/example/searchlol/SummonerDetailActivity.java‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
import java.util.Date;
2828

2929
import com.example.searchlol.dataclass.RankClass;
30-
import com.example.searchlol.dataclass.SummonerRepo;
3130
import com.example.searchlol.utils.ChampionInfoUtil;
3231
import com.example.searchlol.utils.NetworkUtils;
3332
import com.example.searchlol.viewmodel.SavedSummonerViewModel;
@@ -211,9 +210,9 @@ public void onClick(View v) {
211210
new ViewModelProvider.AndroidViewModelFactory(getApplication())
212211
).get(SavedSummonerViewModel.class);
213212

214-
savedSummonerViewModel.getAllSummoners().observe(this, new Observer<List<SummonerRepo>>() {
213+
savedSummonerViewModel.getAllSummoners().observe(this, new Observer<List<SummonerClass>>() {
215214
@Override
216-
public void onChanged(List<SummonerRepo> gitHubRepos) {
215+
public void onChanged(List<SummonerClass> gitHubRepos) {
217216
Log.d("SQL size", String.valueOf(gitHubRepos.size()));
218217
}
219218
});
@@ -244,7 +243,7 @@ public boolean onCreateOptionsMenu(Menu menu) {
244243
public boolean onOptionsItemSelected(@NonNull MenuItem item) {
245244
switch (item.getItemId()) {
246245
case R.id.action_save_favorite_summoner:
247-
SummonerRepo repo = new SummonerRepo();
246+
SummonerClass repo = new SummonerClass();
248247
repo.id = mId;
249248
repo.name = myUsername;
250249
if (like) {

‎app/src/main/java/com/example/searchlol/adapter/SavedSummonerAdapter.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,28 +9,28 @@
99
import androidx.recyclerview.widget.RecyclerView;
1010

1111
import com.example.searchlol.R;
12-
import com.example.searchlol.dataclass.SummonerRepo;
12+
import com.example.searchlol.dataclass.SummonerClass;
1313

1414
import java.util.List;
1515

1616
public class SavedSummonerAdapter extends RecyclerView.Adapter<SavedSummonerAdapter.SavedItemViewHolder> {
17-
private List<SummonerRepo> mNameList;
17+
private List<SummonerClass> mNameList;
1818
private OnNameItemClickListener mOnNameItemClickListener;
1919

2020
public interface OnNameItemClickListener {
21-
void onNameItemClick(SummonerRepo summonerClass);
21+
void onNameItemClick(SummonerClass summonerClass);
2222
}
2323

2424
public SavedSummonerAdapter(OnNameItemClickListener clickListener) {
2525
mOnNameItemClickListener = clickListener;
2626
}
2727

28-
public void updateLocationList(List<SummonerRepo> nameList) {
28+
public void updateLocationList(List<SummonerClass> nameList) {
2929
mNameList = nameList;
3030
notifyDataSetChanged();
3131
}
3232

33-
public SummonerRepo getNameAt(int position) {
33+
public SummonerClass getNameAt(int position) {
3434
return mNameList.get(position);
3535
}
3636

@@ -64,13 +64,13 @@ public SavedItemViewHolder(View itemView) {
6464
itemView.setOnClickListener(this);
6565
}
6666

67-
public void bind(SummonerRepo nameClass) {
67+
public void bind(SummonerClass nameClass) {
6868
mNameTV.setText("Summoner ID: " + nameClass.name);
6969
}
7070

7171
@Override
7272
public void onClick(View v) {
73-
SummonerRepo name = mNameList.get(getAdapterPosition());
73+
SummonerClass name = mNameList.get(getAdapterPosition());
7474
mOnNameItemClickListener.onNameItemClick(name);
7575
}
7676
}

‎app/src/main/java/com/example/searchlol/data/AppDatabase.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
import androidx.room.Room;
77
import androidx.room.RoomDatabase;
88

9-
import com.example.searchlol.dataclass.SummonerRepo;
9+
import com.example.searchlol.dataclass.SummonerClass;
1010

11-
@Database(entities = {SummonerRepo.class}, version = 1,exportSchema = false)
11+
@Database(entities = {SummonerClass.class}, version = 1,exportSchema = false)
1212
public abstract class AppDatabase extends RoomDatabase{
1313
public abstract SummonerClassDao summonerClassDao();
1414
private static volatile AppDatabase INSTANCE;

‎app/src/main/java/com/example/searchlol/data/SavedSummonerRepository.java‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
import androidx.lifecycle.LiveData;
99

10-
import com.example.searchlol.dataclass.SummonerRepo;
10+
import com.example.searchlol.dataclass.SummonerClass;
1111

1212
public class SavedSummonerRepository {
1313
private SummonerClassDao mDAO;
@@ -18,15 +18,15 @@ public SavedSummonerRepository(Application application) {
1818
mDAO = db.summonerClassDao();
1919
}
2020

21-
public void insertSavedSummoner(SummonerRepo summoner) {
21+
public void insertSavedSummoner(SummonerClass summoner) {
2222
new InsertAsyncTask(mDAO).execute(summoner);
2323
}
2424

25-
public void deleteSavedSummoner(SummonerRepo summoner) {
25+
public void deleteSavedSummoner(SummonerClass summoner) {
2626
new DeleteAsyncTask(mDAO).execute(summoner);
2727
}
2828

29-
public LiveData<List<SummonerRepo>> getAllSummoners() {
29+
public LiveData<List<SummonerClass>> getAllSummoners() {
3030
return mDAO.getAllSummoners();
3131
}
3232

@@ -35,29 +35,29 @@ public boolean getSummonerByName(String fullName) {
3535
return in;
3636
}
3737

38-
private static class InsertAsyncTask extends AsyncTask<SummonerRepo, Void, Void> {
38+
private static class InsertAsyncTask extends AsyncTask<SummonerClass, Void, Void> {
3939
private SummonerClassDao mAsyncTaskDAO;
4040

4141
InsertAsyncTask(SummonerClassDao dao) {
4242
mAsyncTaskDAO = dao;
4343
}
4444

4545
@Override
46-
protected Void doInBackground(SummonerRepo... summonerClasses) {
46+
protected Void doInBackground(SummonerClass... summonerClasses) {
4747
mAsyncTaskDAO.insert(summonerClasses[0]);
4848
return null;
4949
}
5050
}
5151

52-
private static class DeleteAsyncTask extends AsyncTask<SummonerRepo, Void, Void> {
52+
private static class DeleteAsyncTask extends AsyncTask<SummonerClass, Void, Void> {
5353
private SummonerClassDao mAsyncTaskDAO;
5454

5555
DeleteAsyncTask(SummonerClassDao dao) {
5656
mAsyncTaskDAO = dao;
5757
}
5858

5959
@Override
60-
protected Void doInBackground(SummonerRepo... summonerClasses) {
60+
protected Void doInBackground(SummonerClass... summonerClasses) {
6161
mAsyncTaskDAO.delete(summonerClasses[0]);
6262
return null;
6363
}

‎app/src/main/java/com/example/searchlol/data/SummonerClassDao.java‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,25 +3,24 @@
33
import androidx.room.Dao;
44
import androidx.room.Delete;
55
import androidx.room.Insert;
6-
import androidx.room.OnConflictStrategy;
76
import androidx.room.Query;
8-
import androidx.room.Update;
7+
98
import java.util.List;
109
import androidx.lifecycle.LiveData;
1110

12-
import com.example.searchlol.dataclass.SummonerRepo;
11+
import com.example.searchlol.dataclass.SummonerClass;
1312

1413
@Dao
1514
public interface SummonerClassDao {
1615
@Insert
17-
void insert(SummonerRepo summoner);
16+
void insert(SummonerClass summoner);
1817

1918
@Delete
20-
void delete(SummonerRepo summoner);
19+
void delete(SummonerClass summoner);
2120

22-
@Query("SELECT * FROM repos")
23-
LiveData<List<SummonerRepo>> getAllSummoners();
21+
@Query("SELECT * FROM summoners")
22+
LiveData<List<SummonerClass>> getAllSummoners();
2423

25-
@Query("SELECT * FROM repos WHERE id = :sumId LIMIT 1")
26-
SummonerRepo getSummonerById(String sumId);
24+
@Query("SELECT * FROM summoners WHERE id = :sumId LIMIT 1")
25+
SummonerClass getSummonerById(String sumId);
2726
}

‎app/src/main/java/com/example/searchlol/dataclass/SummonerClass.java‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,20 @@
11
package com.example.searchlol.dataclass;
22

3-
import org.jetbrains.annotations.NotNull;
43
import java.io.Serializable;
54
import androidx.annotation.NonNull;
6-
import androidx.room.ColumnInfo;
75
import androidx.room.Entity;
86
import androidx.room.PrimaryKey;
97

108
@Entity(tableName = "summoners")
119
public class SummonerClass implements Serializable {
1210
@PrimaryKey
1311
@NonNull
12+
public String id;
1413
public String name;
1514

16-
public String id;
1715
public String summonerLevel;
1816
public String accountId;
19-
//public String puuid;
2017

2118
public int profileIconId;
2219
public long revisionDate;
23-
24-
25-
2620
}

‎app/src/main/java/com/example/searchlol/dataclass/SummonerRepo.java‎

Lines changed: 0 additions & 17 deletions
This file was deleted.

‎app/src/main/java/com/example/searchlol/viewmodel/SavedSummonerViewModel.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import android.app.Application;
44

55
import com.example.searchlol.data.SavedSummonerRepository;
6-
import com.example.searchlol.dataclass.SummonerRepo;
6+
import com.example.searchlol.dataclass.SummonerClass;
77

88
import java.util.List;
99

@@ -18,15 +18,15 @@ public SavedSummonerViewModel(Application application) {
1818
mRepository = new SavedSummonerRepository(application);
1919
}
2020

21-
public void insertSavedSummoner(SummonerRepo summoner) {
21+
public void insertSavedSummoner(SummonerClass summoner) {
2222
mRepository.insertSavedSummoner(summoner);
2323
}
2424

25-
public void deleteSavedSummoner(SummonerRepo summoner) {
25+
public void deleteSavedSummoner(SummonerClass summoner) {
2626
mRepository.deleteSavedSummoner(summoner);
2727
}
2828

29-
public LiveData<List<SummonerRepo>> getAllSummoners() {
29+
public LiveData<List<SummonerClass>> getAllSummoners() {
3030
return mRepository.getAllSummoners();
3131
}
3232

0 commit comments

Comments
 (0)