From 8b6104e0fa6199e3c66beb6d7a6ee0a415d680a2 Mon Sep 17 00:00:00 2001 From: Umberto Furno Date: Fri, 10 Jan 2020 16:27:30 +0100 Subject: [PATCH] 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/AndroidManifest.xml | 2 +- .../ids/wedroid/app/data/dao/WListDao.java | 2 +- .../app/data/database/BoardDatabase.java | 1 + .../app/data/database/WListDatabase.java | 1 + .../ding/ids/wedroid/app/data/entity/WList.kt | 2 +- .../app/data/repository/BoardRepository.kt | 2 +- .../app/data/repository/WListRepository.kt | 28 ++-- .../wedroid/app/util/PreferenceReader.java | 3 + .../wedroid/app/util/PreferenceWriter.java | 3 + .../ids/wedroid/app/util/ServicesFactory.kt | 8 +- .../app/util/SharedPreferenceHelper.kt | 5 +- .../wedroid/app/view/BoardViewActivity.java | 90 ++++++------ .../ids/wedroid/app/view/LoginActivity.kt | 2 +- .../wedroid/app/view/WListsListActivity.java | 4 +- .../app/view/adapter/BoardsListAdapter.kt | 1 - .../app/view/adapter/WListsAdapter.java | 128 +++++++++--------- .../app/viewmodel/WListsListViewModel.java | 4 +- app/src/main/res/drawable/rounded_shape.xml | 11 +- .../res/layout/wlist_recyclerview_item.xml | 7 +- 19 files changed, 152 insertions(+), 152 deletions(-) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 8e8c47a..9f0c4c4 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -29,7 +29,7 @@ + android:theme="@style/AppTheme.NoActionBar" /> > getAllWList(); @Insert(onConflict = OnConflictStrategy.REPLACE) - void insert(WList wList); + void insert(WList wList); @Delete void delete(WList wList); diff --git a/app/src/main/java/it/unisannio/ding/ids/wedroid/app/data/database/BoardDatabase.java b/app/src/main/java/it/unisannio/ding/ids/wedroid/app/data/database/BoardDatabase.java index 07181ba..b9c6021 100644 --- a/app/src/main/java/it/unisannio/ding/ids/wedroid/app/data/database/BoardDatabase.java +++ b/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) { diff --git a/app/src/main/java/it/unisannio/ding/ids/wedroid/app/data/database/WListDatabase.java b/app/src/main/java/it/unisannio/ding/ids/wedroid/app/data/database/WListDatabase.java index 7eeff70..f35da1e 100644 --- a/app/src/main/java/it/unisannio/ding/ids/wedroid/app/data/database/WListDatabase.java +++ b/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) { diff --git a/app/src/main/java/it/unisannio/ding/ids/wedroid/app/data/entity/WList.kt b/app/src/main/java/it/unisannio/ding/ids/wedroid/app/data/entity/WList.kt index 07786f7..1fedd70 100644 --- a/app/src/main/java/it/unisannio/ding/ids/wedroid/app/data/entity/WList.kt +++ b/app/src/main/java/it/unisannio/ding/ids/wedroid/app/data/entity/WList.kt @@ -12,4 +12,4 @@ data class WList( fun it.unisannio.ding.ids.wedroid.wrapper.entity.WList.convert(): WList { return WList(this.id, this.title) -} \ No newline at end of file +} diff --git a/app/src/main/java/it/unisannio/ding/ids/wedroid/app/data/repository/BoardRepository.kt b/app/src/main/java/it/unisannio/ding/ids/wedroid/app/data/repository/BoardRepository.kt index 1218371..0c9e4de 100644 --- a/app/src/main/java/it/unisannio/ding/ids/wedroid/app/data/repository/BoardRepository.kt +++ b/app/src/main/java/it/unisannio/ding/ids/wedroid/app/data/repository/BoardRepository.kt @@ -151,7 +151,7 @@ class BoardRepository( private suspend fun removeOldBoardsFromDb(boards: Collection) { allBoards.value?.minus(boards) ?.forEach { - dao.delete(it) + dao.delete(it) } } diff --git a/app/src/main/java/it/unisannio/ding/ids/wedroid/app/data/repository/WListRepository.kt b/app/src/main/java/it/unisannio/ding/ids/wedroid/app/data/repository/WListRepository.kt index d704b55..c377bbc 100644 --- a/app/src/main/java/it/unisannio/ding/ids/wedroid/app/data/repository/WListRepository.kt +++ b/app/src/main/java/it/unisannio/ding/ids/wedroid/app/data/repository/WListRepository.kt @@ -21,7 +21,7 @@ class WListRepository( private val reader: PreferenceReader ) { - val allWLists: LiveData> by lazy{ + val allWLists: LiveData> by lazy { dao.allWList } @@ -29,7 +29,7 @@ class WListRepository( synchronize() } - fun synchronize() { + fun synchronize() { service.getAllList(reader.boardId) .enqueue(object : Callback> { @@ -50,8 +50,8 @@ class WListRepository( } private fun synchronizeCallback( - response: Response>) - { + response: Response> + ) { if (!response.isSuccessful) { logNetworkError("${response.code()} ${response.message()}") return @@ -64,10 +64,13 @@ class WListRepository( removeOldWListsFromDb(wLists) } - fun deleteWList(idBoard: String, idWList:String) { + fun deleteWList(idBoard: String, idWList: String) { service.deleteList(idBoard, idWList).enqueue( object : Callback { - override fun onFailure(call: Call, t: Throwable) { + override fun onFailure( + call: Call, + t: Throwable + ) { logNetworkError(t.message) } @@ -76,21 +79,21 @@ class WListRepository( response: Response ) { CoroutineScope(Dispatchers.IO).launch { - deleteWListCallBack(response,idWList) + deleteWListCallBack(response, idWList) } } }) } - private fun deleteWListCallBack(response: Response, - id: String) { + private fun deleteWListCallBack( + response: Response, + id: String + ) { if (!response.isSuccessful) { logNetworkError("${response.code()} ${response.message()}") return } - dao.delete(WList(id)) - } private fun addNewWListToDb(wLists: Collection) { @@ -99,7 +102,6 @@ class WListRepository( } } - private fun removeOldWListsFromDb(wLists: Collection) { allWLists.value?.minus(wLists) ?.forEach { @@ -111,4 +113,4 @@ class WListRepository( private fun logNetworkError(message: String?) { Log.e("RETROFIT", message) } -} \ No newline at end of file +} diff --git a/app/src/main/java/it/unisannio/ding/ids/wedroid/app/util/PreferenceReader.java b/app/src/main/java/it/unisannio/ding/ids/wedroid/app/util/PreferenceReader.java index f5cfece..2574e01 100644 --- a/app/src/main/java/it/unisannio/ding/ids/wedroid/app/util/PreferenceReader.java +++ b/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(); } diff --git a/app/src/main/java/it/unisannio/ding/ids/wedroid/app/util/PreferenceWriter.java b/app/src/main/java/it/unisannio/ding/ids/wedroid/app/util/PreferenceWriter.java index 2043f53..74685c8 100644 --- a/app/src/main/java/it/unisannio/ding/ids/wedroid/app/util/PreferenceWriter.java +++ b/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); } diff --git a/app/src/main/java/it/unisannio/ding/ids/wedroid/app/util/ServicesFactory.kt b/app/src/main/java/it/unisannio/ding/ids/wedroid/app/util/ServicesFactory.kt index 2001c80..c3c3a83 100644 --- a/app/src/main/java/it/unisannio/ding/ids/wedroid/app/util/ServicesFactory.kt +++ b/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 diff --git a/app/src/main/java/it/unisannio/ding/ids/wedroid/app/util/SharedPreferenceHelper.kt b/app/src/main/java/it/unisannio/ding/ids/wedroid/app/util/SharedPreferenceHelper.kt index 796625c..e69ca56 100644 --- a/app/src/main/java/it/unisannio/ding/ids/wedroid/app/util/SharedPreferenceHelper.kt +++ b/app/src/main/java/it/unisannio/ding/ids/wedroid/app/util/SharedPreferenceHelper.kt @@ -2,7 +2,7 @@ package it.unisannio.ding.ids.wedroid.app.util import android.content.Context -class SharedPreferenceHelper(context : Context) : PreferenceReader, PreferenceWriter { +class SharedPreferenceHelper(context: Context) : PreferenceReader, PreferenceWriter { private val sp = context.getSharedPreferences("userinfo", Context.MODE_PRIVATE) override fun getBaseUrl(): String? { @@ -20,8 +20,7 @@ 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?) { val editor = sp.edit() diff --git a/app/src/main/java/it/unisannio/ding/ids/wedroid/app/view/BoardViewActivity.java b/app/src/main/java/it/unisannio/ding/ids/wedroid/app/view/BoardViewActivity.java index 0d2f5b5..0b77241 100644 --- a/app/src/main/java/it/unisannio/ding/ids/wedroid/app/view/BoardViewActivity.java +++ b/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; @@ -38,7 +39,7 @@ public class BoardViewActivity extends AppCompatActivity { private TextView description, members, permission, creationDate, lastModificationDate; private View divider1, divider2, divider3; private ListView listView; - private Button getListsButton; + private Button getListsButton; private SharedPreferenceHelper sp; private ServicesFactory service; private Toolbar myToolbar; @@ -56,7 +57,7 @@ public class BoardViewActivity extends AppCompatActivity { swipeRefreshLayout.setRefreshing(false); Intent i = getIntent(); - idBoard= i.getStringExtra("idBoard"); + idBoard = i.getStringExtra("idBoard"); getListsButton = findViewById(R.id.getLists); description = findViewById(R.id.descriptionTxt); @@ -66,7 +67,7 @@ public class BoardViewActivity extends AppCompatActivity { lastModificationDate = findViewById(R.id.modifiedDate); divider1 = findViewById(R.id.divider1); divider2 = findViewById(R.id.divider2); - divider3= findViewById(R.id.divider3); + divider3 = findViewById(R.id.divider3); listView = findViewById(R.id.listViewID); sp = new SharedPreferenceHelper(this); @@ -101,7 +102,7 @@ public class BoardViewActivity extends AppCompatActivity { public void onResponse(@NotNull Call call, @NotNull Response response) { assert response.body() != null; board = response.body(); - if (board.getId()==null) { + if (board.getId() == null) { Toast.makeText( getApplicationContext(), getApplicationContext().getString(R.string.board_deleted), @@ -134,7 +135,7 @@ public class BoardViewActivity extends AppCompatActivity { + board.getCreatedAt()); lastModificationDate.setText(R.string.modified_at); lastModificationDate.append("\n" - + board.getModifiedAt()); + + board.getModifiedAt()); divider1.setBackgroundColor(boardColor); divider2.setBackgroundColor(boardColor); @@ -149,57 +150,47 @@ public class BoardViewActivity extends AppCompatActivity { listView.setAdapter(adapter); } } - @Override - public void onFailure (@NotNull Call < Board > call, @NotNull Throwable t){ - Toast.makeText(getApplicationContext(), - getApplicationContext().getString(R.string.board_deleted), - Toast.LENGTH_LONG).show(); - } + + @Override + public void onFailure(@NotNull Call call, @NotNull Throwable t) { + Toast.makeText(getApplicationContext(), + getApplicationContext().getString(R.string.board_deleted), + Toast.LENGTH_LONG).show(); + } }); } - private String encodeColor(String color){ + private String encodeColor(String color) { String encodedColor; - if(color.equalsIgnoreCase("belize")){ - encodedColor="#2980B9"; - } - else if(color.equalsIgnoreCase("nephritis")){ - encodedColor="#27AE60"; - } - else if(color.equalsIgnoreCase("pomegranate")){ - encodedColor="#C0392B"; - } - else if(color.equalsIgnoreCase("pumpkin")){ - encodedColor="#E67E22"; - } - else if(color.equalsIgnoreCase("wisteria")){ - encodedColor="#8E44AD"; - } - else if(color.equalsIgnoreCase("moderatepink")){ - encodedColor="#CD5A91"; - } - else if(color.equalsIgnoreCase("strongcyan")){ - encodedColor="#00AECC"; - } - else if(color.equalsIgnoreCase("dark")){ - encodedColor="#2C3E51"; - } - else if(color.equalsIgnoreCase("midnight")){ - encodedColor="#2C3E50"; - } - else if(color.equalsIgnoreCase("relax")){ - encodedColor="#27AE61"; - } - else if(color.equalsIgnoreCase("corteza")){ - encodedColor="#568BA2"; - } - else + if (color.equalsIgnoreCase("belize")) { + encodedColor = "#2980B9"; + } else if (color.equalsIgnoreCase("nephritis")) { + encodedColor = "#27AE60"; + } else if (color.equalsIgnoreCase("pomegranate")) { + encodedColor = "#C0392B"; + } else if (color.equalsIgnoreCase("pumpkin")) { + encodedColor = "#E67E22"; + } else if (color.equalsIgnoreCase("wisteria")) { + encodedColor = "#8E44AD"; + } else if (color.equalsIgnoreCase("moderatepink")) { + encodedColor = "#CD5A91"; + } else if (color.equalsIgnoreCase("strongcyan")) { + encodedColor = "#00AECC"; + } else if (color.equalsIgnoreCase("dark")) { + encodedColor = "#2C3E51"; + } else if (color.equalsIgnoreCase("midnight")) { + encodedColor = "#2C3E50"; + } else if (color.equalsIgnoreCase("relax")) { + encodedColor = "#27AE61"; + } else if (color.equalsIgnoreCase("corteza")) { + encodedColor = "#568BA2"; + } else encodedColor = "#38DF87"; return encodedColor; } - private void replaceIDUserToUsername(String idUser){ + private void replaceIDUserToUsername(String idUser) { service = new ServicesFactory(sp); service.getUserService().getUser(idUser).enqueue(new Callback() { @Override @@ -207,10 +198,9 @@ public class BoardViewActivity extends AppCompatActivity { User u = response.body(); assert u != null; username = u.getUsername(); - if(u.isAdmin()){ + if (u.isAdmin()) { members.append("Admin: " + username + ";\n"); - } - else + } else members.append("Other member: " + username + ";\n"); } diff --git a/app/src/main/java/it/unisannio/ding/ids/wedroid/app/view/LoginActivity.kt b/app/src/main/java/it/unisannio/ding/ids/wedroid/app/view/LoginActivity.kt index 811db1a..556ad04 100644 --- a/app/src/main/java/it/unisannio/ding/ids/wedroid/app/view/LoginActivity.kt +++ b/app/src/main/java/it/unisannio/ding/ids/wedroid/app/view/LoginActivity.kt @@ -42,7 +42,7 @@ class LoginActivity : AppCompatActivity() { val passwordText = password.text.toString() val instanceServerText = instanceServer.text.toString() - if (!URLUtil.isValidUrl(instanceServerText)){ + if (!URLUtil.isValidUrl(instanceServerText)) { Toast.makeText(this, R.string.login_unformed_instance, Toast.LENGTH_LONG) .show() return 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 fe836ce..c2e838c 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,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; @@ -50,7 +50,7 @@ public class WListsListActivity extends AppCompatActivity { String boardTitle = i.getStringExtra("barTitle"); Objects.requireNonNull(getSupportActionBar()).setTitle(boardTitle); barColor = i.getIntExtra("barColor", 0); - setResult(WListsListActivity.RESULT_OK,i); + setResult(WListsListActivity.RESULT_OK, i); myToolbar.setBackgroundColor(barColor); diff --git a/app/src/main/java/it/unisannio/ding/ids/wedroid/app/view/adapter/BoardsListAdapter.kt b/app/src/main/java/it/unisannio/ding/ids/wedroid/app/view/adapter/BoardsListAdapter.kt index a92fc66..b62567f 100644 --- a/app/src/main/java/it/unisannio/ding/ids/wedroid/app/view/adapter/BoardsListAdapter.kt +++ b/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) - } } diff --git a/app/src/main/java/it/unisannio/ding/ids/wedroid/app/view/adapter/WListsAdapter.java b/app/src/main/java/it/unisannio/ding/ids/wedroid/app/view/adapter/WListsAdapter.java index 5b4ebe0..dfe929d 100644 --- a/app/src/main/java/it/unisannio/ding/ids/wedroid/app/view/adapter/WListsAdapter.java +++ b/app/src/main/java/it/unisannio/ding/ids/wedroid/app/view/adapter/WListsAdapter.java @@ -40,20 +40,21 @@ public class WListsAdapter extends RecyclerView.Adapter cardTitle = new ArrayList<>(); service.getCardService().getAllCards(sp.getBoardId(), current.getId()).enqueue( new Callback>() { - @Override - public void onResponse(@NotNull Call> call, @NotNull Response> response) { - assert response.body() != null; - for(int i = 0; i adapter = new ArrayAdapter<>(mContext, - android.R.layout.simple_list_item_1, cardTitle); - holder.listView.setAdapter(adapter); - holder.wListItemView.setText(current.getTitle()); - holder.button.setText("Add Card to " + current.getTitle()); - holder.button.setOnClickListener(new View.OnClickListener() { @Override - public void onClick(View view) { - showInputDialog(current.getId()); + public void onResponse(@NotNull Call> call, @NotNull Response> response) { + assert response.body() != null; + for (int i = 0; i < response.body().size(); i++) { + cardTitle.add(response.body().get(i).getTitle()); + } + ArrayAdapter adapter = new ArrayAdapter<>(mContext, + android.R.layout.simple_list_item_1, cardTitle); + holder.listView.setAdapter(adapter); + holder.wListItemView.setText(current.getTitle()); + holder.button.setText("Add Card to " + current.getTitle()); + holder.button.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View view) { + showInputDialog(current.getId()); + } + }); + } + + @Override + public void onFailure(@NotNull Call> call, @NotNull Throwable t) { } }); - } - @Override - public void onFailure(@NotNull Call> call, @NotNull Throwable t) { - } - }); /*position of the old content holder**/ @@ -112,7 +114,7 @@ public class WListsAdapter extends RecyclerView.Adapter wList){ + public void setWLists(List wList) { mWLists = wList; notifyDataSetChanged(); } @@ -124,64 +126,64 @@ public class WListsAdapter extends RecyclerView.Adapter>() { - @Override - public void onResponse(@NotNull Call> call, - @NotNull Response> response) { - String idDefaultSwimlane = null; - assert response.body() != null; - for(Swimlane swim: response.body()){ - if(swim.getTitle().equalsIgnoreCase("default")) - idDefaultSwimlane=swim.getTitle(); - } - final Card card = new Card(); - card.setTitle(editText.getText().toString()); - card.setAuthorId(sp.getUserId()); - card.setSwimlaneId(idDefaultSwimlane); - //card.setDescription("new card from app"); - service.getListService().getList(sp.getBoardId(), current).enqueue(new Callback() { @Override - public void onResponse(@NotNull Call call, @NotNull Response response) { + public void onResponse(@NotNull Call> call, + @NotNull Response> response) { + String idDefaultSwimlane = null; + assert response.body() != null; + for (Swimlane swim : response.body()) { + if (swim.getTitle().equalsIgnoreCase("default")) + idDefaultSwimlane = swim.getTitle(); + } + final Card card = new Card(); + card.setTitle(editText.getText().toString()); + card.setAuthorId(sp.getUserId()); + card.setSwimlaneId(idDefaultSwimlane); + //card.setDescription("new card from app"); + service.getListService().getList(sp.getBoardId(), current).enqueue(new Callback() { + @Override + public void onResponse(@NotNull Call call, @NotNull Response response) { - service.getCardService().newCard(sp.getBoardId(), current, card).enqueue(new Callback() { - @Override - public void onResponse(@NotNull Call call, @NotNull Response response){ - if(response.isSuccessful()) - Toast.makeText(mContext, "card posted" , - Toast.LENGTH_LONG).show(); - else - Toast.makeText(mContext, "card doesn't posted" , - Toast.LENGTH_LONG).show(); + service.getCardService().newCard(sp.getBoardId(), current, card).enqueue(new Callback() { + @Override + public void onResponse(@NotNull Call call, @NotNull Response response) { + if (response.isSuccessful()) + Toast.makeText(mContext, "card posted", + Toast.LENGTH_LONG).show(); + else + Toast.makeText(mContext, "card doesn't posted", + Toast.LENGTH_LONG).show(); + } + + @Override + public void onFailure(@NotNull Call call, @NotNull Throwable t) { + + } + }); } + @Override - public void onFailure(@NotNull Call call, @NotNull Throwable t) { + public void onFailure(@NotNull Call call, @NotNull Throwable t) { } }); } @Override - public void onFailure(@NotNull Call call, @NotNull Throwable t) { + public void onFailure(@NotNull Call> call, @NotNull Throwable t) { } }); - } - - @Override - public void onFailure(@NotNull Call> call, @NotNull Throwable t) { - - } - }); - } - else + } else Toast.makeText(mContext, "cancel", Toast.LENGTH_LONG).show(); } }) 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 e5281a5..1bb5f1e 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; @@ -30,7 +30,7 @@ public class WListsListViewModel extends AndroidViewModel { allWLists = wListRepository.getAllWLists(); } - public LiveData> getAllWLists(){ + public LiveData> getAllWLists() { return allWLists; } diff --git a/app/src/main/res/drawable/rounded_shape.xml b/app/src/main/res/drawable/rounded_shape.xml index 66a45a2..255bc75 100644 --- a/app/src/main/res/drawable/rounded_shape.xml +++ b/app/src/main/res/drawable/rounded_shape.xml @@ -1,12 +1,7 @@ - - - - - + + + \ No newline at end of file diff --git a/app/src/main/res/layout/wlist_recyclerview_item.xml b/app/src/main/res/layout/wlist_recyclerview_item.xml index 2ed83d8..7b4a3ab 100644 --- a/app/src/main/res/layout/wlist_recyclerview_item.xml +++ b/app/src/main/res/layout/wlist_recyclerview_item.xml @@ -1,8 +1,8 @@ + android:layout_height="wrap_content" + android:orientation="vertical"> - + android:layout_height="match_parent" />