From 1ecb6443c249de77fba932ffb098b89fdff9c41b Mon Sep 17 00:00:00 2001 From: "adi.bk" Date: Thu, 1 Jun 2017 09:29:34 -0700 Subject: [PATCH] Clean up --- .../data/dao/model/FilterOptionsModel.java | 5 +- .../profile/repos/ProfileRepoFilterMvp.java | 31 --------- .../repos/ProfileRepoFilterPresenter.java | 64 ------------------- .../ProfileReposFilterBottomSheetDialog.java | 5 -- .../profile/repos/ProfileReposFragment.java | 1 - .../ui/modules/user/UserPagerActivity.java | 2 - debug_gradle.properties | 4 +- 7 files changed, 5 insertions(+), 107 deletions(-) delete mode 100644 app/src/main/java/com/fastaccess/ui/modules/profile/repos/ProfileRepoFilterMvp.java delete mode 100644 app/src/main/java/com/fastaccess/ui/modules/profile/repos/ProfileRepoFilterPresenter.java diff --git a/app/src/main/java/com/fastaccess/data/dao/model/FilterOptionsModel.java b/app/src/main/java/com/fastaccess/data/dao/model/FilterOptionsModel.java index aa8eb145..e90fd694 100644 --- a/app/src/main/java/com/fastaccess/data/dao/model/FilterOptionsModel.java +++ b/app/src/main/java/com/fastaccess/data/dao/model/FilterOptionsModel.java @@ -10,9 +10,8 @@ import java.util.List; import java.util.Map; /** - * Created by adibk on 5/19/17. + * Serves a model for the filter in Repositories fragment */ - public class FilterOptionsModel implements Parcelable { private static final String TYPE = "type"; @@ -80,8 +79,10 @@ public class FilterOptionsModel implements Parcelable { queryMap.put(SORT, sort.toLowerCase()); } if (sortDirection.equals(sortDirectionList.get(0))) { + //Descending should be desc queryMap.put(DIRECTION, sortDirection.toLowerCase().substring(0, 4)); } else { + //Ascending should be asc queryMap.put(DIRECTION, sortDirection.toLowerCase().substring(0, 3)); } diff --git a/app/src/main/java/com/fastaccess/ui/modules/profile/repos/ProfileRepoFilterMvp.java b/app/src/main/java/com/fastaccess/ui/modules/profile/repos/ProfileRepoFilterMvp.java deleted file mode 100644 index 315364b3..00000000 --- a/app/src/main/java/com/fastaccess/ui/modules/profile/repos/ProfileRepoFilterMvp.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.fastaccess.ui.modules.profile.repos; - -import com.fastaccess.ui.base.mvp.BaseMvp; - -import java.util.List; - -/** - * Created by adibk on 5/29/17. - */ - -public interface ProfileRepoFilterMvp { - - interface View extends BaseMvp.FAView { - - } - - interface Presenter { - - void onTypeSelected(String selectedType); - void onSortOptionSelected(String selectedSortOption); - void onSortDirectionSelected(String selectedSortDirection); - - int getTypePosition(); - int getSortOptionPosition(); - int getSortDirectionPosition(); - - List getTypesList(); - List getSortOptionList(); - List getSortDirectionList(); - } -} diff --git a/app/src/main/java/com/fastaccess/ui/modules/profile/repos/ProfileRepoFilterPresenter.java b/app/src/main/java/com/fastaccess/ui/modules/profile/repos/ProfileRepoFilterPresenter.java deleted file mode 100644 index 8ed0e18d..00000000 --- a/app/src/main/java/com/fastaccess/ui/modules/profile/repos/ProfileRepoFilterPresenter.java +++ /dev/null @@ -1,64 +0,0 @@ -package com.fastaccess.ui.modules.profile.repos; - -import com.fastaccess.data.dao.model.FilterOptionsModel; -import com.fastaccess.ui.base.mvp.presenter.BasePresenter; - -import java.util.List; - -/** - * Created by adibk on 5/29/17. - */ - -public class ProfileRepoFilterPresenter extends BasePresenter implements ProfileRepoFilterMvp.Presenter { - - private FilterOptionsModel filterOptions = new FilterOptionsModel(); - - @Override - public void onTypeSelected(String selectedType) { - filterOptions.setType(selectedType); - } - - @Override - public void onSortOptionSelected(String selectedSortOption) { - filterOptions.setSort(selectedSortOption); - } - - @Override - public void onSortDirectionSelected(String selectedSortDirection) { - filterOptions.setsortDirection(selectedSortDirection); - } - - public FilterOptionsModel getFilterOptions() { - return filterOptions; - } - - @Override - public int getTypePosition() { - return filterOptions.getSelectedTypeIndex(); - } - - @Override - public int getSortOptionPosition() { - return filterOptions.getSelectedSortOptionIndex(); - } - - @Override - public int getSortDirectionPosition() { - return filterOptions.getSelectedSortDirectionIndex(); - } - - @Override - public List getTypesList() { - return filterOptions.getTypesList(); - } - - @Override - public List getSortOptionList() { - return filterOptions.getSortOptionList(); - } - - @Override - public List getSortDirectionList() { - return filterOptions.getSortDirectionList(); - } -} diff --git a/app/src/main/java/com/fastaccess/ui/modules/profile/repos/ProfileReposFilterBottomSheetDialog.java b/app/src/main/java/com/fastaccess/ui/modules/profile/repos/ProfileReposFilterBottomSheetDialog.java index 6f3d0d3d..1b752e35 100644 --- a/app/src/main/java/com/fastaccess/ui/modules/profile/repos/ProfileReposFilterBottomSheetDialog.java +++ b/app/src/main/java/com/fastaccess/ui/modules/profile/repos/ProfileReposFilterBottomSheetDialog.java @@ -77,11 +77,6 @@ public class ProfileReposFilterBottomSheetDialog extends BaseBottomSheetDialog { outState.putParcelable(FILTER, currentFilterOptions); } - @Override - public void onCreate(@Nullable Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - } - @OnClick(R.id.filter_sheet_apply_btn) public void onApply() { if (listener != null) { listener.onTypeSelected((String) typeSelectionSpinner.getSelectedItem()); diff --git a/app/src/main/java/com/fastaccess/ui/modules/profile/repos/ProfileReposFragment.java b/app/src/main/java/com/fastaccess/ui/modules/profile/repos/ProfileReposFragment.java index b6a981d1..c2847da5 100644 --- a/app/src/main/java/com/fastaccess/ui/modules/profile/repos/ProfileReposFragment.java +++ b/app/src/main/java/com/fastaccess/ui/modules/profile/repos/ProfileReposFragment.java @@ -72,7 +72,6 @@ public class ProfileReposFragment extends BaseFragment