penguin86/nextcloud-maps-client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Conversion to MVVM completed

Browse Source
This commit is contained in:
Daniele
2021-09-22 08:20:33 +02:00
parent 8b7e89f43b
commit a694246a56
6 changed files with 93 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/src/main/java/it/danieleverducci/nextcloudmaps/activity/detail/GeofavoriteDetailActivity.java
View File

@@ -125,14 +125,14 @@ public class GeofavoriteDetailActivity extends AppCompatActivity implements Loca
mViewHolder.setUpdating(updating);
}
});
mViewModel.getIsFailed().observe(this, new Observer<Boolean>() {
mViewModel.getOnFinished().observe(this, new Observer<Boolean>() {
@Override
public void onChanged(@Nullable Boolean failed) {
if(failed){
Toast.makeText(GeofavoriteDetailActivity.this, R.string.error_saving_geofavorite, Toast.LENGTH_SHORT).show();
} else {
public void onChanged(@Nullable Boolean success) {
if(success){
Toast.makeText(GeofavoriteDetailActivity.this, R.string.geofavorite_saved, Toast.LENGTH_SHORT).show();
finish();
} else {
Toast.makeText(GeofavoriteDetailActivity.this, R.string.error_saving_geofavorite, Toast.LENGTH_SHORT).show();
}
}
});

26
app/src/main/java/it/danieleverducci/nextcloudmaps/activity/detail/GeofavoriteDetailActivityViewModel.java
View File

@@ -7,14 +7,11 @@ import androidx.lifecycle.ViewModel;
import it.danieleverducci.nextcloudmaps.model.Geofavorite;
import it.danieleverducci.nextcloudmaps.repository.GeofavoriteRepository;
public class GeofavoriteDetailActivityViewModel extends ViewModel implements GeofavoriteRepository.OnFinished {
public class GeofavoriteDetailActivityViewModel extends ViewModel {
private GeofavoriteRepository mRepo;
private MutableLiveData<Boolean> mIsUpdating = new MutableLiveData<>();
private MutableLiveData<Boolean> mIsFailed = new MutableLiveData<>();
public void init() {
mRepo = GeofavoriteRepository.getInstance();
mRepo.setOnFinishedListener(this);
}
public Geofavorite getGeofavorite(int id) {
@@ -27,26 +24,11 @@ public class GeofavoriteDetailActivityViewModel extends ViewModel implements Geo
public LiveData<Boolean> getIsUpdating(){
return mIsUpdating;
return mRepo.isUpdating();
}
public LiveData<Boolean> getIsFailed(){
return mIsFailed;
public LiveData<Boolean> getOnFinished(){
return mRepo.onFinished();
}
@Override
public void onLoading() {
mIsUpdating.postValue(true);
}
@Override
public void onSuccess() {
mIsUpdating.postValue(false);
mIsFailed.postValue(false);
}
@Override
public void onFailure() {
mIsUpdating.postValue(false);
mIsFailed.postValue(true);
}
}

6
app/src/main/java/it/danieleverducci/nextcloudmaps/activity/main/MainActivity.java
View File

@@ -144,10 +144,10 @@ public class MainActivity extends AppCompatActivity implements OnSortingOrderLis
}
}
});
mMainActivityViewModel.getIsFailed().observe(this, new Observer<Boolean>() {
mMainActivityViewModel.getOnFinished().observe(this, new Observer<Boolean>() {
@Override
public void onChanged(@Nullable Boolean aBoolean) {
if(aBoolean){
public void onChanged(@Nullable Boolean success) {
if(!success){
Toast.makeText(MainActivity.this, R.string.list_geofavorite_connection_error, Toast.LENGTH_LONG).show();
}
}

26
app/src/main/java/it/danieleverducci/nextcloudmaps/activity/main/MainActivityViewModel.java
View File

@@ -9,14 +9,11 @@ import java.util.List;
import it.danieleverducci.nextcloudmaps.model.Geofavorite;
import it.danieleverducci.nextcloudmaps.repository.GeofavoriteRepository;
public class MainActivityViewModel extends ViewModel implements GeofavoriteRepository.OnFinished {
public class MainActivityViewModel extends ViewModel {
private GeofavoriteRepository mRepo;
private MutableLiveData<Boolean> mIsUpdating = new MutableLiveData<>();
private MutableLiveData<Boolean> mIsFailed = new MutableLiveData<>();
public void init() {
mRepo = GeofavoriteRepository.getInstance();
mRepo.setOnFinishedListener(this);
}
public LiveData<List<Geofavorite>> getGeofavorites(){
@@ -33,26 +30,11 @@ public class MainActivityViewModel extends ViewModel implements GeofavoriteRepos
}
public LiveData<Boolean> getIsUpdating(){
return mIsUpdating;
return mRepo.isUpdating();
}
public LiveData<Boolean> getIsFailed(){
return mIsFailed;
public LiveData<Boolean> getOnFinished(){
return mRepo.onFinished();
}
@Override
public void onLoading() {
mIsUpdating.postValue(true);
}
@Override
public void onSuccess() {
mIsUpdating.postValue(false);
mIsFailed.postValue(false);
}
@Override
public void onFailure() {
mIsUpdating.postValue(false);
mIsFailed.postValue(true);
}
}

56
app/src/main/java/it/danieleverducci/nextcloudmaps/repository/GeofavoriteRepository.java
View File

@@ -11,6 +11,7 @@ import java.util.List;
import it.danieleverducci.nextcloudmaps.api.ApiProvider;
import it.danieleverducci.nextcloudmaps.model.Geofavorite;
import it.danieleverducci.nextcloudmaps.utils.SingleLiveEvent;
import retrofit2.Call;
import retrofit2.Callback;
import retrofit2.Response;
@@ -20,9 +21,11 @@ import retrofit2.Response;
*/
public class GeofavoriteRepository {
private static final String TAG = "GeofavoriteRepository";
private static GeofavoriteRepository instance;
private MutableLiveData<List<Geofavorite>> mGeofavorites;
private OnFinished listener;
private MutableLiveData<Boolean> mIsUpdating = new MutableLiveData<>(false);
private SingleLiveEvent<Boolean> mOnFinished = new SingleLiveEvent<>();
public static GeofavoriteRepository getInstance() {
if(instance == null){
@@ -39,8 +42,16 @@ public class GeofavoriteRepository {
return mGeofavorites;
}
public MutableLiveData<Boolean> isUpdating() {
return mIsUpdating;
}
public SingleLiveEvent<Boolean> onFinished() {
return mOnFinished;
}
public void updateGeofavorites() {
if (listener != null) listener.onLoading();
mIsUpdating.postValue(true);
// Obtain geofavorites
Call<List<Geofavorite>> call = ApiProvider.getAPI().getGeofavorites();
call.enqueue(new Callback<List<Geofavorite>>() {
@@ -48,7 +59,8 @@ public class GeofavoriteRepository {
public void onResponse(@NonNull Call<List<Geofavorite>> call, @NonNull Response<List<Geofavorite>> response) {
if (response.isSuccessful() && response.body() != null) {
mGeofavorites.postValue(response.body());
if (listener != null) listener.onSuccess();
mIsUpdating.postValue(false);
mOnFinished.postValue(true);
} else {
onFailure(call, new Throwable("Dataset is empty"));
}
@@ -56,7 +68,8 @@ public class GeofavoriteRepository {
@Override
public void onFailure(@NonNull Call<List<Geofavorite>> call, @NonNull Throwable t) {
if (listener != null) listener.onFailure();
mIsUpdating.postValue(false);
mOnFinished.postValue(false);
}
});
}
@@ -70,6 +83,7 @@ public class GeofavoriteRepository {
}
public void saveGeofavorite(Geofavorite geofav) {
mIsUpdating.postValue(true);
Call<Geofavorite> call;
if (geofav.getId() == 0) {
// New geofavorite
@@ -88,21 +102,25 @@ public class GeofavoriteRepository {
}
geofavs.add(geofav);
mGeofavorites.postValue(geofavs);
if (listener != null) listener.onSuccess();
} else if (listener != null) {
listener.onFailure();
mIsUpdating.postValue(false);
mOnFinished.postValue(true);
} else {
mIsUpdating.postValue(false);
mOnFinished.postValue(false);
}
}
@Override
public void onFailure(Call<Geofavorite> call, Throwable t) {
if (listener != null) listener.onFailure();
Log.e(TAG, t.getMessage());
mIsUpdating.postValue(false);
mOnFinished.postValue(false);
}
});
}
public void deleteGeofavorite(Geofavorite geofav) {
if (listener != null) listener.onLoading();
mIsUpdating.postValue(true);
// Delete Geofavorite
Call<Geofavorite> call = ApiProvider.getAPI().deleteGeofavorite(geofav.getId());
call.enqueue(new Callback<Geofavorite>() {
@@ -111,29 +129,21 @@ public class GeofavoriteRepository {
List<Geofavorite> geofavs = mGeofavorites.getValue();
if (geofavs.remove(geofav)) {
mGeofavorites.postValue(geofavs);
if (listener != null) listener.onSuccess();
mIsUpdating.postValue(false);
mOnFinished.postValue(true);
} else {
// Should never happen
if (listener != null) listener.onFailure();
mIsUpdating.postValue(false);
mOnFinished.postValue(false);
}
}
@Override
public void onFailure(Call<Geofavorite> call, Throwable t) {
if (listener != null) listener.onFailure();
mIsUpdating.postValue(false);
mOnFinished.postValue(false);
}
});
}
public void setOnFinishedListener(OnFinished listener) {
this.listener = listener;
}
public interface OnFinished {
void onLoading();
void onSuccess();
void onFailure();
}
}

44
app/src/main/java/it/danieleverducci/nextcloudmaps/utils/SingleLiveEvent.java Normal file
View File

@@ -0,0 +1,44 @@
package it.danieleverducci.nextcloudmaps.utils;
import androidx.annotation.MainThread;
import androidx.annotation.NonNull;
import androidx.lifecycle.LifecycleOwner;
import androidx.lifecycle.MutableLiveData;
import androidx.lifecycle.Observer;
import java.util.concurrent.atomic.AtomicBoolean;
/**
* Events implementation in LiveData
* From: https://gist.github.com/teegarcs/319a3e7e4736a0cce8eba2216c52b0ca#file-singleliveevent
* @param <T>
*/
public class SingleLiveEvent<T> extends MutableLiveData<T> {
AtomicBoolean mPending = new AtomicBoolean(false);
@MainThread
@Override
public void setValue(T value) {
mPending.set(true);
super.setValue(value);
}
@MainThread
@Override
public void observe(@NonNull LifecycleOwner owner, @NonNull Observer<? super T> observer) {
super.observe(owner, new Observer<T>() {
@Override
public void onChanged(T t) {
if (mPending.compareAndSet(true, false)) {
observer.onChanged(t);
}
}
});
}
/**
* Util function for Void implementations.
*/
public void call() {
setValue(null);
}
}