refactoring

11 files changed, 15 insertions, 19 deletions

diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/BoardAdapter.java b/app/src/main/java/it/niedermann/nextcloud/deck/BoardAdapter.java
index 3a5cf6cd6..4d31cb008 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/BoardAdapter.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/BoardAdapter.java
@@ -12,7 +12,7 @@ import java.util.List;
 
 import butterknife.BindView;
 import butterknife.ButterKnife;
-import it.niedermann.nextcloud.deck.model.board.Board;
+import it.niedermann.nextcloud.deck.model.Board;
 
 class BoardAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
 
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/MainActivity.java b/app/src/main/java/it/niedermann/nextcloud/deck/MainActivity.java
index 0abc1a3a6..fd9278968 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/MainActivity.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/MainActivity.java
@@ -15,7 +15,6 @@ import android.util.Log;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
-import android.widget.TextView;
 
 import com.nextcloud.android.sso.api.NextcloudAPI;
 import com.nextcloud.android.sso.helper.SingleAccountHelper;
@@ -28,7 +27,7 @@ import butterknife.ButterKnife;
 import io.reactivex.functions.Consumer;
 import it.niedermann.nextcloud.deck.api.ApiProvider;
 import it.niedermann.nextcloud.deck.model.DataBaseAdapter;
-import it.niedermann.nextcloud.deck.model.board.Board;
+import it.niedermann.nextcloud.deck.model.Board;
 
 public class MainActivity extends AppCompatActivity
         implements NavigationView.OnNavigationItemSelectedListener {
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/api/DeckAPI.java b/app/src/main/java/it/niedermann/nextcloud/deck/api/DeckAPI.java
index 6d3c760fd..26cfb4ad9 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/api/DeckAPI.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/api/DeckAPI.java
@@ -4,8 +4,8 @@ package it.niedermann.nextcloud.deck.api;
 import java.util.List;
 
 import io.reactivex.Observable;
-import it.niedermann.nextcloud.deck.model.board.Board;
-import it.niedermann.nextcloud.deck.model.board.Card;
+import it.niedermann.nextcloud.deck.model.Board;
+import it.niedermann.nextcloud.deck.model.Card;
 import retrofit2.http.GET;
 import retrofit2.http.POST;
 
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/api/DeckAPI_SSO.java b/app/src/main/java/it/niedermann/nextcloud/deck/api/DeckAPI_SSO.java
index b5c78f9b0..bdcb5cfec 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/api/DeckAPI_SSO.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/api/DeckAPI_SSO.java
@@ -4,12 +4,11 @@ package it.niedermann.nextcloud.deck.api;
 import com.nextcloud.android.sso.aidl.NextcloudRequest;
 import com.nextcloud.android.sso.api.NextcloudAPI;
 
-import java.lang.reflect.Type;
 import java.util.List;
 
 import io.reactivex.Observable;
-import it.niedermann.nextcloud.deck.model.board.Board;
-import it.niedermann.nextcloud.deck.model.board.Card;
+import it.niedermann.nextcloud.deck.model.Board;
+import it.niedermann.nextcloud.deck.model.Card;
 
 public class DeckAPI_SSO implements DeckAPI {
 
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/api/GsonConfig.java b/app/src/main/java/it/niedermann/nextcloud/deck/api/GsonConfig.java
index 71e7fc7d8..fb8c09977 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/api/GsonConfig.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/api/GsonConfig.java
@@ -6,8 +6,8 @@ import com.google.gson.reflect.TypeToken;
 
 import java.lang.reflect.Type;
 
-import it.niedermann.nextcloud.deck.model.board.Board;
-import it.niedermann.nextcloud.deck.model.board.Card;
+import it.niedermann.nextcloud.deck.model.Board;
+import it.niedermann.nextcloud.deck.model.Card;
 
 /**
  * Created by david on 27.06.17.
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/api/NextcloudDeserializer.java b/app/src/main/java/it/niedermann/nextcloud/deck/api/NextcloudDeserializer.java
index 8d233241f..964607a7e 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/api/NextcloudDeserializer.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/api/NextcloudDeserializer.java
@@ -11,8 +11,8 @@ import java.lang.reflect.Type;
 import java.util.ArrayList;
 import java.util.List;
 
-import it.niedermann.nextcloud.deck.model.board.Board;
-import it.niedermann.nextcloud.deck.model.board.Card;
+import it.niedermann.nextcloud.deck.model.Board;
+import it.niedermann.nextcloud.deck.model.Card;
 
 /**
  * Created by david on 24.05.17.
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/model/board/Board.java b/app/src/main/java/it/niedermann/nextcloud/deck/model/Board.java
index 0436b1e18..5b1ce9411 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/model/board/Board.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/model/Board.java
@@ -1,4 +1,4 @@
-package it.niedermann.nextcloud.deck.model.board;
+package it.niedermann.nextcloud.deck.model;
 
 import it.niedermann.nextcloud.deck.model.DBStatus;
 import it.niedermann.nextcloud.deck.model.RemoteEntity;
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/model/board/Card.java b/app/src/main/java/it/niedermann/nextcloud/deck/model/Card.java
index 2cffedac3..63b1a6949 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/model/board/Card.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/model/Card.java
@@ -1,11 +1,9 @@
-package it.niedermann.nextcloud.deck.model.board;
+package it.niedermann.nextcloud.deck.model;
 
 import java.time.LocalDate;
 import java.util.ArrayList;
 import java.util.List;
 
-import it.niedermann.nextcloud.deck.model.RemoteEntity;
-
 public class Card extends RemoteEntity {
 
     private String title;
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/model/board/Label.java b/app/src/main/java/it/niedermann/nextcloud/deck/model/Label.java
index 4fee803f3..a880c934d 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/model/board/Label.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/model/Label.java
@@ -1,4 +1,4 @@
-package it.niedermann.nextcloud.deck.model.board;
+package it.niedermann.nextcloud.deck.model;
 
 import it.niedermann.nextcloud.deck.model.RemoteEntity;
 
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/model/board/Stack.java b/app/src/main/java/it/niedermann/nextcloud/deck/model/Stack.java
index 40b934098..8d3658154 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/model/board/Stack.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/model/Stack.java
@@ -1,4 +1,4 @@
-package it.niedermann.nextcloud.deck.model.board;
+package it.niedermann.nextcloud.deck.model;
 
 import java.io.Serializable;
 import java.time.LocalDate;
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/model/board/User.java b/app/src/main/java/it/niedermann/nextcloud/deck/model/User.java
index 34c4210ad..fda173534 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/model/board/User.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/model/User.java
@@ -1,4 +1,4 @@
-package it.niedermann.nextcloud.deck.model.board;
+package it.niedermann.nextcloud.deck.model;
 
 import java.io.Serializable;