Merge remote-tracking branch 'origin/feature_integrate_login' into feature_board_view

# Conflicts:
#	app/build.gradle
#	app/src/main/AndroidManifest.xml
#	app/src/main/java/it/unisannio/ding/ids/wedroid/app/MainActivity.kt
#	app/src/main/java/it/unisannio/ding/ids/wedroid/app/util/PreferenceReader.java
#	app/src/main/java/it/unisannio/ding/ids/wedroid/app/util/PreferenceWriter.java
#	app/src/main/java/it/unisannio/ding/ids/wedroid/app/util/ServicesFactory.kt
#	app/src/main/java/it/unisannio/ding/ids/wedroid/app/util/SharedPreferenceHelper.kt
#	app/src/main/res/layout/activity_main.xml
#	app/src/main/res/values/dimens.xml
#	app/src/main/res/values/strings.xml
#	app/src/main/res/values/styles.xml
#	build.gradle

app/src/main/java/it/unisannio/ding/ids/wedroid/app/data/database/BoardDatabase.java

@@ -12,6 +12,7 @@ import it.unisannio.ding.ids.wedroid.app.data.entity.Board;
 @Database(entities = Board.class, version = 1, exportSchema = false)
 public abstract class BoardDatabase extends RoomDatabase {
     private static volatile BoardDatabase INSTANCE;
+
     public abstract BoardDao boardDao();
 
     public static BoardDatabase getDatabase(Context context) {

app/src/main/java/it/unisannio/ding/ids/wedroid/app/data/database/WListDatabase.java

@@ -12,6 +12,7 @@ import it.unisannio.ding.ids.wedroid.app.data.entity.WList;
 @Database(entities = WList.class, version = 2, exportSchema = false)
 public abstract class WListDatabase extends RoomDatabase {
     private static volatile WListDatabase INSTANCE;
+
     public abstract WListDao wListDao();
 
     public static WListDatabase getDatabase(Context context) {

app/src/main/java/it/unisannio/ding/ids/wedroid/app/data/repository/WListRepository.kt

@@ -50,8 +50,8 @@ class WListRepository(
     }
 
     private fun synchronizeCallback(
-        response: Response<MutableList<it.unisannio.ding.ids.wedroid.wrapper.entity.WList>>)
+        response: Response<MutableList<it.unisannio.ding.ids.wedroid.wrapper.entity.WList>>
-    {
+    ) {
         if (!response.isSuccessful) {
             logNetworkError("${response.code()} ${response.message()}")
             return
@@ -67,7 +67,10 @@ class WListRepository(
     fun deleteWList(idBoard: String, idWList: String) {
         service.deleteList(idBoard, idWList).enqueue(
             object : Callback<it.unisannio.ding.ids.wedroid.wrapper.entity.WList> {
-                override fun onFailure(call: Call<it.unisannio.ding.ids.wedroid.wrapper.entity.WList>, t: Throwable) {
+                override fun onFailure(
+                    call: Call<it.unisannio.ding.ids.wedroid.wrapper.entity.WList>,
+                    t: Throwable
+                ) {
                     logNetworkError(t.message)
                 }
 
@@ -82,15 +85,15 @@ class WListRepository(
             })
     }
 
-    private fun deleteWListCallBack(response: Response<it.unisannio.ding.ids.wedroid.wrapper.entity.WList>,
+    private fun deleteWListCallBack(
-                                    id: String) {
+        response: Response<it.unisannio.ding.ids.wedroid.wrapper.entity.WList>,
+        id: String
+    ) {
         if (!response.isSuccessful) {
             logNetworkError("${response.code()} ${response.message()}")
             return
         }
-
         dao.delete(WList(id))
-
     }
 
     private fun addNewWListToDb(wLists: Collection<WList>) {
@@ -99,7 +102,6 @@ class WListRepository(
         }
     }
 
-
     private fun removeOldWListsFromDb(wLists: Collection<WList>) {
         allWLists.value?.minus(wLists)
             ?.forEach {

app/src/main/java/it/unisannio/ding/ids/wedroid/app/util/PreferenceReader.java

@@ -2,7 +2,10 @@ package it.unisannio.ding.ids.wedroid.app.util;
 
 public interface PreferenceReader {
     String getBaseUrl();
+
     String getUserId();
+
     String getToken();
+
     String getBoardId();
 }

app/src/main/java/it/unisannio/ding/ids/wedroid/app/util/PreferenceWriter.java

@@ -2,7 +2,10 @@ package it.unisannio.ding.ids.wedroid.app.util;
 
 public interface PreferenceWriter {
     void setBaseUrl(String baseUrl);
+
     void setUserId(String userId);
+
     void setToken(String token);
+
     void setBoardId(String boardId);
 }

app/src/main/java/it/unisannio/ding/ids/wedroid/app/util/ServicesFactory.kt

@@ -1,6 +1,12 @@
 package it.unisannio.ding.ids.wedroid.app.util
 
-import it.unisannio.ding.ids.wedroid.wrapper.api.*
+import it.unisannio.ding.ids.wedroid.wrapper.api.BoardService
+import it.unisannio.ding.ids.wedroid.wrapper.api.CardCommentService
+import it.unisannio.ding.ids.wedroid.wrapper.api.CardService
+import it.unisannio.ding.ids.wedroid.wrapper.api.ChecklistService
+import it.unisannio.ding.ids.wedroid.wrapper.api.UserService
+import it.unisannio.ding.ids.wedroid.wrapper.api.ListService
+import it.unisannio.ding.ids.wedroid.wrapper.api.SwimlanesService
 import okhttp3.OkHttpClient
 import retrofit2.Retrofit
 import retrofit2.converter.gson.GsonConverterFactory

app/src/main/java/it/unisannio/ding/ids/wedroid/app/util/SharedPreferenceHelper.kt

@@ -20,7 +20,6 @@ class SharedPreferenceHelper(context : Context) : PreferenceReader, PreferenceWr
     override fun setBaseUrl(baseUrl: String?) {
         val editor = sp.edit()
         editor.putString("url", baseUrl).apply()
-
     }
 
     override fun setUserId(userId: String?) {

app/src/main/java/it/unisannio/ding/ids/wedroid/app/view/BoardViewActivity.java

@@ -15,6 +15,7 @@ import androidx.annotation.Nullable;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.widget.Toolbar;
 import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
+
 import org.jetbrains.annotations.NotNull;
 
 import java.util.ArrayList;
@@ -149,6 +150,7 @@ public class BoardViewActivity extends AppCompatActivity {
                     listView.setAdapter(adapter);
                 }
             }
+
             @Override
             public void onFailure(@NotNull Call<Board> call, @NotNull Throwable t) {
                 Toast.makeText(getApplicationContext(),
@@ -162,38 +164,27 @@ public class BoardViewActivity extends AppCompatActivity {
         String encodedColor;
         if (color.equalsIgnoreCase("belize")) {
             encodedColor = "#2980B9";
-        }
+        } else if (color.equalsIgnoreCase("nephritis")) {
-        else if(color.equalsIgnoreCase("nephritis")){
             encodedColor = "#27AE60";
-        }
+        } else if (color.equalsIgnoreCase("pomegranate")) {
-        else if(color.equalsIgnoreCase("pomegranate")){
             encodedColor = "#C0392B";
-        }
+        } else if (color.equalsIgnoreCase("pumpkin")) {
-        else if(color.equalsIgnoreCase("pumpkin")){
             encodedColor = "#E67E22";
-        }
+        } else if (color.equalsIgnoreCase("wisteria")) {
-        else if(color.equalsIgnoreCase("wisteria")){
             encodedColor = "#8E44AD";
-        }
+        } else if (color.equalsIgnoreCase("moderatepink")) {
-        else if(color.equalsIgnoreCase("moderatepink")){
             encodedColor = "#CD5A91";
-        }
+        } else if (color.equalsIgnoreCase("strongcyan")) {
-        else if(color.equalsIgnoreCase("strongcyan")){
             encodedColor = "#00AECC";
-        }
+        } else if (color.equalsIgnoreCase("dark")) {
-        else if(color.equalsIgnoreCase("dark")){
             encodedColor = "#2C3E51";
-        }
+        } else if (color.equalsIgnoreCase("midnight")) {
-        else if(color.equalsIgnoreCase("midnight")){
             encodedColor = "#2C3E50";
-        }
+        } else if (color.equalsIgnoreCase("relax")) {
-        else if(color.equalsIgnoreCase("relax")){
             encodedColor = "#27AE61";
-        }
+        } else if (color.equalsIgnoreCase("corteza")) {
-        else if(color.equalsIgnoreCase("corteza")){
             encodedColor = "#568BA2";
-        }
+        } else
-        else
             encodedColor = "#38DF87";
 
         return encodedColor;
@@ -209,8 +200,7 @@ public class BoardViewActivity extends AppCompatActivity {
                 username = u.getUsername();
                 if (u.isAdmin()) {
                     members.append("Admin:  " + username + ";\n");
-                }
+                } else
-                else
                     members.append("Other member:  " + username + ";\n");
             }
 

app/src/main/java/it/unisannio/ding/ids/wedroid/app/view/WListsListActivity.java

@@ -23,7 +23,7 @@ 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.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;

app/src/main/java/it/unisannio/ding/ids/wedroid/app/view/adapter/BoardsListAdapter.kt

@@ -42,7 +42,6 @@ class BoardsListAdapter internal constructor(
             val intent = Intent(holder.itemView.context, BoardViewActivity::class.java)
             intent.putExtra("idBoard", board.id)
             holder.itemView.context.startActivity(intent)
-
         }
     }
 

app/src/main/java/it/unisannio/ding/ids/wedroid/app/view/adapter/WListsAdapter.java

@@ -51,6 +51,7 @@ public class WListsAdapter extends RecyclerView.Adapter<WListsAdapter.WListViewH
         private final TextView wListItemView;
         ListView listView;
         Button button;
+
         private WListViewHolder(View itemView) {
             super(itemView);
             wListItemView = itemView.findViewById(R.id.wListTitle);
@@ -92,6 +93,7 @@ public class WListsAdapter extends RecyclerView.Adapter<WListsAdapter.WListViewH
                                 }
                             });
                         }
+
                         @Override
                         public void onFailure(@NotNull Call<List<Card>> call, @NotNull Throwable t) {
                         }
@@ -161,6 +163,7 @@ public class WListsAdapter extends RecyclerView.Adapter<WListsAdapter.WListViewH
                                                                 Toast.makeText(mContext, "card doesn't posted",
                                                                         Toast.LENGTH_LONG).show();
                                                         }
+
                                                         @Override
                                                         public void onFailure(@NotNull Call<Card> call, @NotNull Throwable t) {
 
@@ -180,8 +183,7 @@ public class WListsAdapter extends RecyclerView.Adapter<WListsAdapter.WListViewH
 
                                         }
                                     });
-                        }
+                        } else
-                        else
                             Toast.makeText(mContext, "cancel", Toast.LENGTH_LONG).show();
                     }
                 })

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;
 

app/src/main/res/drawable/rounded_shape.xml

@@ -1,12 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <shape
+    <shape android:shape="rectangle">
-        android:shape="rectangle"   >
+        <solid android:color="@color/colorAccent"></solid>
-        <solid
+        <corners android:radius="11dp"></corners>
-            android:color="@color/colorAccent" >
-        </solid>
-        <corners
-            android:radius="11dp"   >
-        </corners>
     </shape>
 </selector>

app/src/main/res/layout/wlist_recyclerview_item.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content">
+    android:layout_height="wrap_content"
+    android:orientation="vertical">
 
     <TextView
         android:id="@+id/wListTitle"
@@ -17,8 +17,7 @@
     <ListView
         android:id="@+id/listViewCard"
         android:layout_width="match_parent"
-        android:layout_height="match_parent" >
+        android:layout_height="match_parent" />
-    </ListView>
 
     <Button
         android:id="@+id/buttonAddCard"