diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser index 3ad325b..2a85782 100644 --- a/.idea/caches/build_file_checksums.ser +++ b/.idea/caches/build_file_checksums.ser Binary files differ diff --git a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/MainActivity.java b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/MainActivity.java index d56721c..4b3e368 100644 --- a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/MainActivity.java +++ b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/MainActivity.java @@ -17,9 +17,8 @@ Fragment fragment; fragment = new LoginFragment(); - getSupportFragmentManager().beginTransaction() - .replace(R.id.fragment_place, fragment) - .commit(); + getSupportFragmentManager().beginTransaction().add(R.id.fragment_place, fragment).commit(); + } diff --git a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/SignUpFragment.java b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/SignUpFragment.java index cd6e99f..8396843 100644 --- a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/SignUpFragment.java +++ b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/SignUpFragment.java @@ -37,6 +37,7 @@ FragmentManager manager = getFragmentManager(); FragmentTransaction transaction = manager.beginTransaction(); + //transaction.replace(R.id.fragment_place, new LoginFragment()); transaction.replace(R.id.fragment_place, new LoginFragment()); transaction.commit(); diff --git a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/viewModels/test b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/viewModels/test index e69de29..d75fa73 100644 --- a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/viewModels/test +++ b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/viewModels/test @@ -0,0 +1,96 @@ + + + + + + + +