mirror of
https://github.com/KokaKiwi/BarInsta
synced 2026-03-14 08:21:35 +00:00
Add update favorite logic in ProfileFragmentViewModel and corresponding test
This commit is contained in:
parent
edb03ba3d8
commit
63df44624e
4 changed files with 117 additions and 49 deletions
|
|
@ -3,7 +3,6 @@ package awais.instagrabber.fragments.main;
|
|||
import android.content.Context;
|
||||
import android.content.DialogInterface;
|
||||
import android.content.Intent;
|
||||
import android.content.pm.PackageManager;
|
||||
import android.graphics.Typeface;
|
||||
import android.os.Bundle;
|
||||
import android.os.Handler;
|
||||
|
|
@ -54,7 +53,6 @@ import java.util.Objects;
|
|||
import java.util.Set;
|
||||
|
||||
import awais.instagrabber.R;
|
||||
import awais.instagrabber.UserSearchNavGraphDirections;
|
||||
import awais.instagrabber.activities.MainActivity;
|
||||
import awais.instagrabber.adapters.FeedAdapterV2;
|
||||
import awais.instagrabber.adapters.HighlightsAdapter;
|
||||
|
|
@ -69,8 +67,6 @@ import awais.instagrabber.db.repositories.FavoriteRepository;
|
|||
import awais.instagrabber.dialogs.PostsLayoutPreferencesDialogFragment;
|
||||
import awais.instagrabber.dialogs.ProfilePicDialogFragment;
|
||||
import awais.instagrabber.fragments.PostViewV2Fragment;
|
||||
import awais.instagrabber.fragments.UserSearchFragment;
|
||||
import awais.instagrabber.fragments.UserSearchFragmentDirections;
|
||||
import awais.instagrabber.managers.DirectMessagesManager;
|
||||
import awais.instagrabber.managers.InboxManager;
|
||||
import awais.instagrabber.models.HighlightModel;
|
||||
|
|
@ -131,7 +127,7 @@ public class ProfileFragment extends Fragment implements SwipeRefreshLayout.OnRe
|
|||
private MenuItem blockMenuItem, restrictMenuItem, chainingMenuItem;
|
||||
private MenuItem muteStoriesMenuItem, mutePostsMenuItem, removeFollowerMenuItem;
|
||||
private MenuItem shareLinkMenuItem;
|
||||
// private MenuItem shareDmMenuItem;
|
||||
// private MenuItem shareDmMenuItem;
|
||||
private boolean accountIsUpdated = false;
|
||||
private boolean postsSetupDone = false;
|
||||
private Set<Media> selectedFeedModels;
|
||||
|
|
@ -470,10 +466,10 @@ public class ProfileFragment extends Fragment implements SwipeRefreshLayout.OnRe
|
|||
if (shareLinkMenuItem != null) {
|
||||
shareLinkMenuItem.setVisible(profileModel != null && !TextUtils.isEmpty(profileModel.getUsername()));
|
||||
}
|
||||
// shareDmMenuItem = menu.findItem(R.id.share_dm);
|
||||
// if (shareDmMenuItem != null) {
|
||||
// shareDmMenuItem.setVisible(profileModel != null && profileModel.getPk() != 0L);
|
||||
// }
|
||||
// shareDmMenuItem = menu.findItem(R.id.share_dm);
|
||||
// if (shareDmMenuItem != null) {
|
||||
// shareDmMenuItem.setVisible(profileModel != null && profileModel.getPk() != 0L);
|
||||
// }
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
@ -586,20 +582,20 @@ public class ProfileFragment extends Fragment implements SwipeRefreshLayout.OnRe
|
|||
startActivity(Intent.createChooser(sharingIntent, null));
|
||||
return true;
|
||||
} else if (itemId == R.id.share_dm) {
|
||||
// final UserSearchNavGraphDirections.ActionGlobalUserSearch actionGlobalUserSearch = UserSearchFragmentDirections
|
||||
// .actionGlobalUserSearch()
|
||||
// .setTitle(getString(R.string.share))
|
||||
// .setActionLabel(getString(R.string.send))
|
||||
// .setShowGroups(true)
|
||||
// .setMultiple(true)
|
||||
// .setSearchMode(UserSearchFragment.SearchMode.RAVEN);
|
||||
// final NavController navController = NavHostFragment.findNavController(ProfileFragment.this);
|
||||
// try {
|
||||
// navController.navigate(actionGlobalUserSearch);
|
||||
// } catch (Exception e) {
|
||||
// Log.e(TAG, "setupShare: ", e);
|
||||
// }
|
||||
// return true;
|
||||
// final UserSearchNavGraphDirections.ActionGlobalUserSearch actionGlobalUserSearch = UserSearchFragmentDirections
|
||||
// .actionGlobalUserSearch()
|
||||
// .setTitle(getString(R.string.share))
|
||||
// .setActionLabel(getString(R.string.send))
|
||||
// .setShowGroups(true)
|
||||
// .setMultiple(true)
|
||||
// .setSearchMode(UserSearchFragment.SearchMode.RAVEN);
|
||||
// final NavController navController = NavHostFragment.findNavController(ProfileFragment.this);
|
||||
// try {
|
||||
// navController.navigate(actionGlobalUserSearch);
|
||||
// } catch (Exception e) {
|
||||
// Log.e(TAG, "setupShare: ", e);
|
||||
// }
|
||||
// return true;
|
||||
return false;
|
||||
}
|
||||
return super.onOptionsItemSelected(item);
|
||||
|
|
@ -750,7 +746,9 @@ public class ProfileFragment extends Fragment implements SwipeRefreshLayout.OnRe
|
|||
if (throwable != null || favorite == null) {
|
||||
profileDetailsBinding.favChip.setChipIconResource(R.drawable.ic_outline_star_plus_24);
|
||||
profileDetailsBinding.favChip.setText(R.string.add_to_favorites);
|
||||
Log.e(TAG, "setProfileDetails: ", throwable);
|
||||
if (throwable != null) {
|
||||
Log.e(TAG, "setProfileDetails: ", throwable);
|
||||
}
|
||||
return;
|
||||
}
|
||||
profileDetailsBinding.favChip.setChipIconResource(R.drawable.ic_star_check_24);
|
||||
|
|
@ -1063,9 +1061,9 @@ public class ProfileFragment extends Fragment implements SwipeRefreshLayout.OnRe
|
|||
if (shareLinkMenuItem != null) {
|
||||
shareLinkMenuItem.setVisible(!TextUtils.isEmpty(profileModel.getUsername()));
|
||||
}
|
||||
// if (shareDmMenuItem != null) {
|
||||
// shareDmMenuItem.setVisible(profileModel.getPk() != 0L);
|
||||
// }
|
||||
// if (shareDmMenuItem != null) {
|
||||
// shareDmMenuItem.setVisible(profileModel.getPk() != 0L);
|
||||
// }
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,15 +1,19 @@
|
|||
package awais.instagrabber.viewmodels
|
||||
|
||||
import android.os.Bundle
|
||||
import android.util.Log
|
||||
import androidx.lifecycle.*
|
||||
import androidx.savedstate.SavedStateRegistryOwner
|
||||
import awais.instagrabber.db.entities.Favorite
|
||||
import awais.instagrabber.db.repositories.AccountRepository
|
||||
import awais.instagrabber.db.repositories.FavoriteRepository
|
||||
import awais.instagrabber.managers.DirectMessagesManager
|
||||
import awais.instagrabber.models.Resource
|
||||
import awais.instagrabber.models.enums.FavoriteType
|
||||
import awais.instagrabber.repositories.responses.User
|
||||
import awais.instagrabber.repositories.responses.directmessages.RankedRecipient
|
||||
import awais.instagrabber.utils.ControlledRunner
|
||||
import awais.instagrabber.utils.extensions.TAG
|
||||
import awais.instagrabber.webservices.*
|
||||
import kotlinx.coroutines.CoroutineDispatcher
|
||||
import kotlinx.coroutines.Dispatchers
|
||||
|
|
@ -22,14 +26,16 @@ class ProfileFragmentViewModel(
|
|||
mediaRepository: MediaRepository,
|
||||
graphQLRepository: GraphQLRepository,
|
||||
accountRepository: AccountRepository,
|
||||
favoriteRepository: FavoriteRepository,
|
||||
private val favoriteRepository: FavoriteRepository,
|
||||
ioDispatcher: CoroutineDispatcher,
|
||||
) : ViewModel() {
|
||||
private val _currentUser = MutableLiveData<Resource<User?>>(Resource.loading(null))
|
||||
private val _isFavorite = MutableLiveData(false)
|
||||
private var messageManager: DirectMessagesManager? = null
|
||||
|
||||
val currentUser: LiveData<Resource<User?>> = _currentUser
|
||||
val isLoggedIn: LiveData<Boolean> = currentUser.map { it.data != null }
|
||||
val isFavorite: LiveData<Boolean> = _isFavorite
|
||||
|
||||
private val currentUserAndStateUsernameLiveData: LiveData<Pair<Resource<User?>, Resource<String?>>> =
|
||||
object : MediatorLiveData<Pair<Resource<User?>, Resource<String?>>>() {
|
||||
|
|
@ -78,12 +84,40 @@ class ProfileFragmentViewModel(
|
|||
}
|
||||
}
|
||||
emit(Resource.success(fetchedUser))
|
||||
if (fetchedUser != null) {
|
||||
checkAndInsertFavorite(fetchedUser)
|
||||
}
|
||||
} catch (e: Exception) {
|
||||
emit(Resource.error(e.message, null))
|
||||
Log.e(TAG, "fetching user: ", e)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private suspend fun checkAndInsertFavorite(fetchedUser: User) {
|
||||
try {
|
||||
val favorite = favoriteRepository.getFavorite(fetchedUser.username, FavoriteType.USER)
|
||||
if (favorite == null) {
|
||||
_isFavorite.postValue(false)
|
||||
return
|
||||
}
|
||||
_isFavorite.postValue(true)
|
||||
favoriteRepository.insertOrUpdateFavorite(
|
||||
Favorite(
|
||||
favorite.id,
|
||||
fetchedUser.username,
|
||||
FavoriteType.USER,
|
||||
fetchedUser.fullName,
|
||||
fetchedUser.profilePicUrl,
|
||||
favorite.dateAdded
|
||||
)
|
||||
)
|
||||
} catch (e: Exception) {
|
||||
_isFavorite.postValue(false)
|
||||
Log.e(TAG, "checkAndInsertFavorite: ", e)
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Username of profile without '`@`'
|
||||
*/
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue