diff --git a/.idea/misc.xml b/.idea/misc.xml index 860da66..d5d35ec 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,6 +1,6 @@ - + diff --git a/app/src/main/java/org/ntlab/acanthus_client/views/title/TitleActivity.java b/app/src/main/java/org/ntlab/acanthus_client/views/title/TitleActivity.java index 1c15f20..fac1d56 100644 --- a/app/src/main/java/org/ntlab/acanthus_client/views/title/TitleActivity.java +++ b/app/src/main/java/org/ntlab/acanthus_client/views/title/TitleActivity.java @@ -1,35 +1,19 @@ package org.ntlab.acanthus_client.views.title; -import androidx.annotation.RequiresApi; +import android.content.Intent; +import android.os.Bundle; +import android.os.Handler; + import androidx.appcompat.app.AppCompatActivity; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; -import android.animation.ObjectAnimator; -import android.content.Intent; -import android.graphics.ImageDecoder; -import android.graphics.drawable.AnimatedImageDrawable; -import android.os.Build; -import android.os.Bundle; -import android.os.Handler; -import android.view.View; -import android.view.animation.AlphaAnimation; -import android.view.animation.Animation; -import android.view.animation.AnimationUtils; -import android.widget.ImageView; - -import com.bumptech.glide.Glide; -import com.bumptech.glide.request.target.GlideDrawableImageViewTarget; - import org.ntlab.acanthus_client.Acanthus; import org.ntlab.acanthus_client.R; import org.ntlab.acanthus_client.databinding.ActivityTitleBinding; import org.ntlab.acanthus_client.views.MainActivity; -import org.ntlab.acanthus_client.views.login.LoginScreenViewModel; import org.ntlab.acanthus_client.views.sign_up.SignUpActivity; -import static java.lang.Thread.sleep; - public class TitleActivity extends AppCompatActivity { private TitleViewModel titleViewModel; private ActivityTitleBinding binding; @@ -66,7 +50,7 @@ private void init() { binding = ActivityTitleBinding.inflate(getLayoutInflater()); startObserve(); - falseLoginOvserve(); + falseLoginObserve(); } // VMの監視開始 //3秒間の画面表示 @@ -79,7 +63,7 @@ } }); } - private void falseLoginOvserve(){ + private void falseLoginObserve(){ titleViewModel = new ViewModelProvider(this).get(TitleViewModel.class); titleViewModel.getLoginstatus().observe(this, new Observer() { @Override diff --git a/app/src/main/java/org/ntlab/acanthus_client/views/title/TitleViewModel.java b/app/src/main/java/org/ntlab/acanthus_client/views/title/TitleViewModel.java index c6942fd..b769bce 100644 --- a/app/src/main/java/org/ntlab/acanthus_client/views/title/TitleViewModel.java +++ b/app/src/main/java/org/ntlab/acanthus_client/views/title/TitleViewModel.java @@ -22,10 +22,10 @@ public class TitleViewModel extends ViewModel { private MutableLiveData acanthusMutableLiveData; - private MutableLiveData loginstatus; + private MutableLiveData loginStatus; public TitleViewModel() { this.acanthusMutableLiveData = new MutableLiveData<>(); - this.loginstatus = new MutableLiveData<>(); + this.loginStatus = new MutableLiveData<>(); } //----------------------------------------------------------------- @@ -33,7 +33,7 @@ public LiveData getAcanthus() { return this.acanthusMutableLiveData; } - public LiveData getLoginstatus(){return this.loginstatus;} + public LiveData getLoginStatus(){return this.loginStatus;} public void LoginToken(Acanthus acanthus, String emailForm, String passwordForm) { @@ -55,16 +55,16 @@ if(response.body()!=null){ setVariableFromResponse(acanthus, response.body().getToken(), emailAddress, password); }else{ - loginstatus.setValue(false); + loginStatus.setValue(false); } }else{ - loginstatus.setValue(false); + loginStatus.setValue(false); } } @Override public void onFailure(Call call, Throwable t) { - loginstatus.setValue(false); + loginStatus.setValue(false); } }); }