gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-06-20 03:59:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

Clean up

Browse Source 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
This commit is contained in:
Mario Danic 2017-11-28 04:09:48 +01:00
parent b3fe5baebd
commit 6ceb0c12da
2 changed files with 23 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
app/src/main/java/com/nextcloud/talk/controllers/CallsListController.java
View File

@ -84,7 +84,8 @@ import io.reactivex.schedulers.Schedulers;
import retrofit2.HttpException; import retrofit2.HttpException;
@AutoInjector(NextcloudTalkApplication.class) @AutoInjector(NextcloudTalkApplication.class)
public class CallsListController extends BaseController implements SearchView.OnQueryTextListener { public class CallsListController extends BaseController implements SearchView.OnQueryTextListener,
FlexibleAdapter.OnItemClickListener {
public static final String TAG = "CallsListController"; public static final String TAG = "CallsListController";
@ -146,7 +147,6 @@ public class CallsListController extends BaseController implements SearchView.On
} }
} }
adapter.addListener(new OnItemClickListener());
prepareViews(); prepareViews();
} }
@ -384,25 +384,20 @@ public class CallsListController extends BaseController implements SearchView.On
bottomSheet.show(); bottomSheet.show();
} }
@Override
private class OnItemClickListener implements FlexibleAdapter.OnItemClickListener { public boolean onItemClick(int position) {
if (callItems.size() > position) {
@Override overridePushHandler(new NoOpControllerChangeHandler());
public boolean onItemClick(int position) { overridePopHandler(new NoOpControllerChangeHandler());
if (callItems.size() > position) { CallItem callItem = callItems.get(position);
overridePushHandler(new NoOpControllerChangeHandler()); Intent callIntent = new Intent(getActivity(), CallActivity.class);
overridePopHandler(new NoOpControllerChangeHandler()); BundleBuilder bundleBuilder = new BundleBuilder(new Bundle());
CallItem callItem = callItems.get(position); bundleBuilder.putString("roomToken", callItem.getModel().getToken());
Intent callIntent = new Intent(getActivity(), CallActivity.class); bundleBuilder.putParcelable("userEntity", Parcels.wrap(userEntity));
BundleBuilder bundleBuilder = new BundleBuilder(new Bundle()); callIntent.putExtras(bundleBuilder.build());
bundleBuilder.putString("roomToken", callItem.getModel().getToken()); startActivity(callIntent);
bundleBuilder.putParcelable("userEntity", Parcels.wrap(userEntity));
callIntent.putExtras(bundleBuilder.build());
startActivity(callIntent);
}
return true;
} }
}
return true;
}
} }

18
app/src/main/java/com/nextcloud/talk/controllers/RoomMenuController.java
View File

@ -47,7 +47,7 @@ import eu.davidea.flexibleadapter.common.SmoothScrollLinearLayoutManager;
import eu.davidea.flexibleadapter.items.AbstractFlexibleItem; import eu.davidea.flexibleadapter.items.AbstractFlexibleItem;
@AutoInjector(NextcloudTalkApplication.class) @AutoInjector(NextcloudTalkApplication.class)
public class RoomMenuController extends BaseController { public class RoomMenuController extends BaseController implements FlexibleAdapter.OnItemClickListener{
@BindView(R.id.recycler_view) @BindView(R.id.recycler_view)
RecyclerView recyclerView; RecyclerView recyclerView;
private Room room; private Room room;
@ -82,7 +82,6 @@ public class RoomMenuController extends BaseController {
} }
recyclerView.setAdapter(adapter); recyclerView.setAdapter(adapter);
adapter.addListener(new OnItemClickListener());
recyclerView.addItemDecoration(new DividerItemDecoration( recyclerView.addItemDecoration(new DividerItemDecoration(
recyclerView.getContext(), recyclerView.getContext(),
@ -120,15 +119,12 @@ public class RoomMenuController extends BaseController {
} }
} }
private class OnItemClickListener implements FlexibleAdapter.OnItemClickListener { @Override
public boolean onItemClick(int position) {
@Override if (menuItems.size() > position) {
public boolean onItemClick(int position) { MenuItem menuItem = (MenuItem) menuItems.get(position);
if (menuItems.size() > position) {
MenuItem menuItem = (MenuItem) menuItems.get(position);
}
return true;
} }
return true;
} }
} }