chinwag/chinwag-android
chinwag/chinwag-android
2
0
Fork 0
Code Issues Pull requests Releases 5 Activity

remove unneeded CollectionUtil and Either.java (#1201)

Browse source
This commit is contained in:
Konrad Pozniak 2019-04-21 08:24:06 +02:00 • committed by GitHub
commit 1ae3e86378
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 7 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/src/main/java/com/keylesspalace/tusky/fragment/NotificationsFragment.java
View file

@ -51,7 +51,6 @@ import com.keylesspalace.tusky.entity.Status;
import com.keylesspalace.tusky.interfaces.ActionButtonActivity;
import com.keylesspalace.tusky.interfaces.ReselectableFragment;
import com.keylesspalace.tusky.interfaces.StatusActionListener;
import com.keylesspalace.tusky.util.CollectionUtil;
import com.keylesspalace.tusky.util.Either;
import com.keylesspalace.tusky.util.HttpHeaderLink;
import com.keylesspalace.tusky.util.ListStatusAccessibilityDelegate;
@ -96,6 +95,7 @@ import io.reactivex.Observable;
import io.reactivex.android.schedulers.AndroidSchedulers;
import kotlin.Unit;
import kotlin.collections.CollectionsKt;
import kotlin.jvm.functions.Function1;
import okhttp3.ResponseBody;
import retrofit2.Call;
import retrofit2.Callback;
@ -985,11 +985,11 @@ public class NotificationsFragment extends SFragment implements
updateAdapter();
}
private final Function<Notification, Either<Placeholder, Notification>> notificationLifter =
private final Function1<Notification, Either<Placeholder, Notification>> notificationLifter =
Either.Right::new;
private List<Either<Placeholder, Notification>> liftNotificationList(List<Notification> list) {
return CollectionUtil.map(list, notificationLifter);
return CollectionsKt.map(list, notificationLifter);
}
private void fullyRefreshWithProgressBar(boolean isShow) {

6
app/src/main/java/com/keylesspalace/tusky/fragment/TimelineFragment.java
View file

@ -53,7 +53,6 @@ import com.keylesspalace.tusky.network.MastodonApi;
import com.keylesspalace.tusky.repository.Placeholder;
import com.keylesspalace.tusky.repository.TimelineRepository;
import com.keylesspalace.tusky.repository.TimelineRequestMode;
import com.keylesspalace.tusky.util.CollectionUtil;
import com.keylesspalace.tusky.util.Either;
import com.keylesspalace.tusky.util.ListStatusAccessibilityDelegate;
import com.keylesspalace.tusky.util.ListUtils;
@ -97,6 +96,7 @@ import io.reactivex.Observable;
import io.reactivex.android.schedulers.AndroidSchedulers;
import kotlin.Unit;
import kotlin.collections.CollectionsKt;
import kotlin.jvm.functions.Function1;
import retrofit2.Call;
import retrofit2.Callback;
import retrofit2.Response;
@ -1159,7 +1159,7 @@ public class TimelineFragment extends SFragment implements
return -1;
}
private final Function<Status, Either<Placeholder, Status>> statusLifter =
private final Function1<Status, Either<Placeholder, Status>> statusLifter =
Either.Right::new;
private @Nullable
@ -1221,7 +1221,7 @@ public class TimelineFragment extends SFragment implements
}
private List<Either<Placeholder, Status>> liftStatusList(List<Status> list) {
return CollectionUtil.map(list, statusLifter);
return CollectionsKt.map(list, statusLifter);
}
private void updateAdapter() {