From 04714a447986b782e13c023741277eae54497f3e Mon Sep 17 00:00:00 2001
From: norangebit <git@norangeb.it>
Date: Sat, 11 Jan 2020 14:49:43 +0100
Subject: [PATCH] remove duplicated class and package

---
 app/src/main/AndroidManifest.xml              |  2 +-
 .../wedroid/app/view/BoardsListsActivity.kt   |  2 +-
 .../wedroid/app/view/WListsListActivity.java  |  2 +-
 .../app/viewModel/WListsListViewModel.java    | 47 -------------------
 .../app/viewmodel/BoardsListViewModel.java    |  2 +-
 .../app/viewmodel/WListsListViewModel.java    |  2 +-
 6 files changed, 5 insertions(+), 52 deletions(-)
 delete mode 100644 app/src/main/java/it/unisannio/ding/ids/wedroid/app/viewModel/WListsListViewModel.java

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 9f0c4c4..d6d9155 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -20,7 +20,7 @@
         <activity
             android:name=".view.NewBoardActivity"
             android:label="@string/title_activity_new_board"
-            android:theme="@style/AppTheme.NoActionBar" />
+            android:theme="@style/AppTheme.NoActionBar"/>
 
         <activity
             android:name=".view.BoardViewActivity"
diff --git a/app/src/main/java/it/unisannio/ding/ids/wedroid/app/view/BoardsListsActivity.kt b/app/src/main/java/it/unisannio/ding/ids/wedroid/app/view/BoardsListsActivity.kt
index 228a206..d3c6924 100644
--- a/app/src/main/java/it/unisannio/ding/ids/wedroid/app/view/BoardsListsActivity.kt
+++ b/app/src/main/java/it/unisannio/ding/ids/wedroid/app/view/BoardsListsActivity.kt
@@ -13,7 +13,7 @@ import it.unisannio.ding.ids.wedroid.app.R
 import it.unisannio.ding.ids.wedroid.app.util.PreferenceReader
 import it.unisannio.ding.ids.wedroid.app.util.SharedPreferenceHelper
 import it.unisannio.ding.ids.wedroid.app.view.adapter.BoardsListAdapter
-import it.unisannio.ding.ids.wedroid.app.viewModel.BoardsListViewModel
+import it.unisannio.ding.ids.wedroid.app.viewmodel.BoardsListViewModel
 import it.unisannio.ding.ids.wedroid.wrapper.entity.BoardBackgroundColor
 
 import kotlinx.android.synthetic.main.activity_boards_lists.*
diff --git a/app/src/main/java/it/unisannio/ding/ids/wedroid/app/view/WListsListActivity.java b/app/src/main/java/it/unisannio/ding/ids/wedroid/app/view/WListsListActivity.java
index c2e838c..e42b9f9 100644
--- a/app/src/main/java/it/unisannio/ding/ids/wedroid/app/view/WListsListActivity.java
+++ b/app/src/main/java/it/unisannio/ding/ids/wedroid/app/view/WListsListActivity.java
@@ -23,10 +23,10 @@ import java.util.Objects;
 
 import it.unisannio.ding.ids.wedroid.app.R;
 
-import it.unisannio.ding.ids.wedroid.app.viewModel.WListsListViewModel;
 import it.unisannio.ding.ids.wedroid.app.data.entity.WList;
 import it.unisannio.ding.ids.wedroid.app.util.SharedPreferenceHelper;
 import it.unisannio.ding.ids.wedroid.app.view.adapter.WListsAdapter;
+import it.unisannio.ding.ids.wedroid.app.viewmodel.WListsListViewModel;
 
 public class WListsListActivity extends AppCompatActivity {
 
diff --git a/app/src/main/java/it/unisannio/ding/ids/wedroid/app/viewModel/WListsListViewModel.java b/app/src/main/java/it/unisannio/ding/ids/wedroid/app/viewModel/WListsListViewModel.java
deleted file mode 100644
index 962433d..0000000
--- a/app/src/main/java/it/unisannio/ding/ids/wedroid/app/viewModel/WListsListViewModel.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package it.unisannio.ding.ids.wedroid.app.viewModel;
-
-import android.app.Application;
-
-import androidx.annotation.NonNull;
-import androidx.lifecycle.AndroidViewModel;
-import androidx.lifecycle.LiveData;
-
-import java.util.List;
-
-import it.unisannio.ding.ids.wedroid.app.data.database.WListDatabase;
-import it.unisannio.ding.ids.wedroid.app.data.entity.WList;
-import it.unisannio.ding.ids.wedroid.app.data.repository.WListRepository;
-import it.unisannio.ding.ids.wedroid.app.util.PreferenceReader;
-import it.unisannio.ding.ids.wedroid.app.util.ServicesFactory;
-import it.unisannio.ding.ids.wedroid.app.util.SharedPreferenceHelper;
-
-
-public class WListsListViewModel extends AndroidViewModel {
-    private WListRepository wListRepository;
-    private LiveData<List<WList>> allWLists;
-
-    public WListsListViewModel(@NonNull Application application) {
-        super(application);
-        PreferenceReader reader = new SharedPreferenceHelper(application);
-        wListRepository = new WListRepository(
-                WListDatabase.getDatabase(application).wListDao(),
-                ServicesFactory.Companion.getInstance(reader).getListService(),
-                reader);
-        allWLists = wListRepository.getAllWLists();
-    }
-
-    public  LiveData<List<WList>> getAllWLists(){
-        return allWLists;
-    }
-
-    public void deleteWList(int position, String idBoard) {
-        List<WList> wList = allWLists.getValue();
-
-        if (wList != null)
-            wListRepository.deleteWList(idBoard, wList.get(position).getId());
-    }
-
-    public void refresh() {
-        wListRepository.synchronize();
-    }
-}
diff --git a/app/src/main/java/it/unisannio/ding/ids/wedroid/app/viewmodel/BoardsListViewModel.java b/app/src/main/java/it/unisannio/ding/ids/wedroid/app/viewmodel/BoardsListViewModel.java
index 56b1037..0d1a79e 100644
--- a/app/src/main/java/it/unisannio/ding/ids/wedroid/app/viewmodel/BoardsListViewModel.java
+++ b/app/src/main/java/it/unisannio/ding/ids/wedroid/app/viewmodel/BoardsListViewModel.java
@@ -1,4 +1,4 @@
-package it.unisannio.ding.ids.wedroid.app.viewModel;
+package it.unisannio.ding.ids.wedroid.app.viewmodel;
 
 import android.app.Application;
 
diff --git a/app/src/main/java/it/unisannio/ding/ids/wedroid/app/viewmodel/WListsListViewModel.java b/app/src/main/java/it/unisannio/ding/ids/wedroid/app/viewmodel/WListsListViewModel.java
index 1bb5f1e..d8d722c 100644
--- a/app/src/main/java/it/unisannio/ding/ids/wedroid/app/viewmodel/WListsListViewModel.java
+++ b/app/src/main/java/it/unisannio/ding/ids/wedroid/app/viewmodel/WListsListViewModel.java
@@ -1,4 +1,4 @@
-package it.unisannio.ding.ids.wedroid.app.viewModel;
+package it.unisannio.ding.ids.wedroid.app.viewmodel;
 
 import android.app.Application;