Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-08 11:17:34 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Android - People - Code review

Browse source
This commit is contained in:
Cristian Luis Duarte 2018-08-17 14:24:04 -03:00
parent 4851b44de1
commit ccb5bae4b6
3 changed files with 16 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
android/app/src/main/java/io/highfidelity/hifiinterface/fragment/FriendsFragment.java
View file

@ -90,7 +90,7 @@ public class FriendsFragment extends Fragment {
// .. // ..
// 2. adapt options // 2. adapt options
// .. // ..
rootView.findViewById(R.id.userActionVisit).setVisibility(user.online?View.VISIBLE:View.GONE); rootView.findViewById(R.id.userActionVisit).setVisibility(user.online ? View.VISIBLE : View.GONE);
// 3. show // 3. show
mSlidingUpPanelLayout.setPanelState(SlidingUpPanelLayout.PanelState.EXPANDED); mSlidingUpPanelLayout.setPanelState(SlidingUpPanelLayout.PanelState.EXPANDED);
} }
@ -129,7 +129,9 @@ public class FriendsFragment extends Fragment {
} }
private void onRemoveConnectionClick() { private void onRemoveConnectionClick() {
if (mSelectedUsername == null) return; if (mSelectedUsername == null) {
return;
}
AlertDialog.Builder builder = new AlertDialog.Builder(getActivity()); AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
builder.setMessage("Remove '" + mSelectedUsername + "' from People?"); builder.setMessage("Remove '" + mSelectedUsername + "' from People?");

16
android/app/src/main/java/io/highfidelity/hifiinterface/view/UserListAdapter.java
View file

@ -66,7 +66,9 @@ public class UserListAdapter extends RecyclerView.Adapter<UserListAdapter.ViewHo
@Override @Override
public void retrieveError(Exception e, String message) { public void retrieveError(Exception e, String message) {
Log.e("[USERS]", message, e); Log.e("[USERS]", message, e);
if (mAdapterListener != null) mAdapterListener.onError(e, message); if (mAdapterListener != null) {
mAdapterListener.onError(e, message);
}
} }
}); });
} }
@ -145,14 +147,18 @@ public class UserListAdapter extends RecyclerView.Adapter<UserListAdapter.ViewHo
@Override @Override
public void requestOk() { public void requestOk() {
if (!waitingChangeConfirm) return; if (!waitingChangeConfirm) {
return;
}
mFrame.setClickable(true); mFrame.setClickable(true);
// nothing to do, new status was set // nothing to do, new status was set
} }
@Override @Override
public void requestError(Exception e, String message) { public void requestError(Exception e, String message) {
if (!waitingChangeConfirm) return; if (!waitingChangeConfirm) {
return;
}
// new status was not set, rolling back // new status was not set, rolling back
mChecked = previousStatus; mChecked = previousStatus;
mFrame.setClickable(true); mFrame.setClickable(true);
@ -207,7 +213,9 @@ public class UserListAdapter extends RecyclerView.Adapter<UserListAdapter.ViewHo
@Override @Override
public void onClick(View view) { public void onClick(View view) {
int position = getAdapterPosition(); int position = getAdapterPosition();
if (mClickListener != null) mClickListener.onItemClick(view, position, mUsers.get(position)); if (mClickListener != null) {
mClickListener.onItemClick(view, position, mUsers.get(position));
}
} }
} }

1
android/app/src/main/res/values/strings.xml
View file

@ -1,7 +1,6 @@
<resources> <resources>
<string name="app_name" translatable="false">Interface</string> <string name="app_name" translatable="false">Interface</string>
<string name="home">Home</string> <string name="home">Home</string>
<string name="friends">Friends</string>
<string name="people">People</string> <string name="people">People</string>
<string name="web_view_action_open_in_browser" translatable="false">Open in browser</string> <string name="web_view_action_open_in_browser" translatable="false">Open in browser</string>
<string name="web_view_action_share" translatable="false">Share link</string> <string name="web_view_action_share" translatable="false">Share link</string>