Modified PavGameViewModel to PavGameViewModelI

Author: ReksioCroft

app/src/main/java/ro/tav/pavgame/presentation/PavGameViewModel.java renamed to app/src/main/java/ro/tav/pavgame/presentation/PavGameViewModelI.java

@@ -4,13 +4,9 @@
 import ro.tav.pavgame.data.GameEntity;
 import ro.tav.pavgame.domain.GameUseCase;
 
-public interface PavGameViewModel {
+public interface PavGameViewModelI {
     GameUseCase gameUseCase = new GameUseCase( PavGameApplication.getApplication() );///gameUseCase face legatura cu repo-ul din domain
 
-    static GameUseCase getGameUseCase() {  ///pentru a putea accesa repoul din domain
-        return gameUseCase;
-    }
-
     static void addResult( String userName, String result, String gametype ) {
         //construim jocul si apoi il trimitem in bindingAdapter pt a fi adaugat
         GameEntity mGame = new GameEntity();

app/src/main/java/ro/tav/pavgame/presentation/fragments/GameFragment.java

@@ -25,7 +25,7 @@
 import ro.tav.pavgame.PavGameApplication;
 import ro.tav.pavgame.R;
 import ro.tav.pavgame.presentation.PavGameService;
-import ro.tav.pavgame.presentation.PavGameViewModel;
+import ro.tav.pavgame.presentation.PavGameViewModelI;
 import ro.tav.pavgame.presentation.notification.PavGameNotificationFactory;
 import ro.tav.pavgame.presentation.view.MainActivity;
 import timber.log.Timber;
@@ -288,7 +288,7 @@ else if ( tipDala == 1 ) {//mutarile
                 }
 
                 //adaugam jocul folosindu-ne de viewModel
-                PavGameViewModel.addResult( MainActivity.getUserName(), result, "Game Type: " + lat + "x" + lat );
+                PavGameViewModelI.addResult( MainActivity.getUserName(), result, "Game Type: " + lat + "x" + lat );
                 PavGameApplication.getNotificationManager().notify( PavGameNotificationFactory.getHelloNotificationId(),
                         PavGameNotificationFactory.createCustomHelloNotification( getContext(),
                                 s1, s2 ) );

app/src/main/java/ro/tav/pavgame/presentation/view/LoginActivity.java

@@ -91,8 +91,8 @@ public void onComplete( @NonNull Task < AuthResult > task ) {
                             Toast.makeText( LoginActivity.this, "Login Error. Please try again", Toast.LENGTH_SHORT ).show();
                         } else {
                             MainActivity.setUserName( Objects.requireNonNull( mFirebaseAuth.getCurrentUser() ).getEmail() );
-                            Intent intToMain = new Intent( LoginActivity.this, MainActivity.class );
-                            startActivity( intToMain );
+                            Intent intent = new Intent( LoginActivity.this, MainActivity.class );
+                            startActivity( intent );
                         }
                     }
                 } );

app/src/main/java/ro/tav/pavgame/presentation/view/recycleViewAux/PavGameBindingAdapter.java

@@ -9,7 +9,7 @@
 import java.util.List;
 
 import ro.tav.pavgame.data.GameEntity;
-import ro.tav.pavgame.presentation.PavGameViewModel;
+import ro.tav.pavgame.presentation.PavGameViewModelI;
 
 public class PavGameBindingAdapter {
     @BindingAdapter( { "game_adapter", "user" } )
@@ -23,14 +23,14 @@ public static void recycleViewGamesBinding( RecyclerView mRecyclerViewGames, Gam
         }
         //pornim binduirea permanenta intre recyleview si baza de date
         if ( user == null ) {
-            PavGameViewModel.getGameUseCase().getAllGames().observeForever( new Observer < List < GameEntity > >() {
+            PavGameViewModelI.gameUseCase.getAllGames().observeForever( new Observer < List < GameEntity > >() {
                 @Override
                 public void onChanged( @Nullable final List < GameEntity > games ) {
                     gamesAdapter.setGames( games );
                 }
             } );
         } else {
-            PavGameViewModel.getGameUseCase().getSpecificGamesbyUserName( user ).observeForever( new Observer < List < GameEntity > >() {
+            PavGameViewModelI.gameUseCase.getSpecificGamesbyUserName( user ).observeForever( new Observer < List < GameEntity > >() {
                 @Override
                 public void onChanged( @Nullable final List < GameEntity > games ) {
                     gamesAdapter.setGames( games );