diff --git a/app/build.gradle b/app/build.gradle index b5469e8..b361bc7 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -48,5 +48,6 @@ implementation "com.squareup.retrofit2:retrofit:2.5.0" implementation 'com.squareup.retrofit2:converter-jackson:2.5.0' implementation 'com.squareup.retrofit2:converter-scalars:2.1.0' - implementation 'com.github.bumptech.glide:glide:3.6.1' + implementation 'com.github.bumptech.glide:glide:4.10.0' + annotationProcessor 'com.github.bumptech.glide:compiler:4.10.0' } \ No newline at end of file diff --git a/app/src/main/java/org/ntlab/acanthus_client/Acanthus.java b/app/src/main/java/org/ntlab/acanthus_client/Acanthus.java index e79c3b3..b58060b 100644 --- a/app/src/main/java/org/ntlab/acanthus_client/Acanthus.java +++ b/app/src/main/java/org/ntlab/acanthus_client/Acanthus.java @@ -3,6 +3,11 @@ import android.app.Application; import android.content.SharedPreferences; +import org.ntlab.acanthus_client.entities.Animation; +import org.ntlab.acanthus_client.entities.AnimationJson; + +import java.util.ArrayList; + //----------------------------------------------------------------- // ユーザーアカウント public class Acanthus extends Application { @@ -14,6 +19,8 @@ private String preferenceToken; //----------------------------------------------------------------- private Integer aid; + private Animation currentAnimation; + private ArrayList animationJsonList; //----------------------------------------------------------------- // getter @@ -62,6 +69,10 @@ return aid; } + public Animation getCurrentAnimation() { + return currentAnimation; + } + //----------------------------------------------------------------- // setter public void setPreferenceUid(Integer preferenceUid) { @@ -102,5 +113,15 @@ public void setAid(Integer aid) { this.aid = aid; } + + public void setCurrentAnimation(Animation currentAnimation) { + this.currentAnimation = currentAnimation; + } + + //----------------------------------------------------------------- + // + public void addAnimationJsonList(AnimationJson animationJson) { + this.animationJsonList.add(animationJson); + } //----------------------------------------------------------------- } diff --git a/app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/edit/EditFragment.java b/app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/edit/EditFragment.java index 3b765dd..68bcb63 100644 --- a/app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/edit/EditFragment.java +++ b/app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/edit/EditFragment.java @@ -36,12 +36,17 @@ binding = FragmentEditBinding.inflate(inflater, container, false); View root = binding.getRoot(); + TextView textView = binding.textMake; - final TextView textView = binding.textMake; + Acanthus acanthus = (Acanthus) getActivity().getApplication(); + Integer uid = acanthus.getPreferenceUid(); + String token = acanthus.getPreferenceToken(); + editViewModel.getWorkList(uid, token); + editViewModel.getWorkJson().observe(getViewLifecycleOwner(), new Observer() { @Override public void onChanged(@Nullable WorkJson workJson) { - + textView.setText(workJson.getAid().toString()); } }); return root; 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 c7506a6..02a8149 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 @@ -3,6 +3,11 @@ import android.content.Intent; import android.os.Bundle; import android.os.Handler; +import android.view.View; +import android.widget.ImageView; +import android.widget.TextView; + +import com.bumptech.glide.Glide; import androidx.appcompat.app.AppCompatActivity; import androidx.lifecycle.Observer; @@ -10,9 +15,11 @@ 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.sign_up.SignUpActivity; +import org.w3c.dom.Text; public class TitleActivity extends AppCompatActivity { private TitleViewModel titleViewModel; @@ -24,18 +31,35 @@ setTheme(R.style.AppTheme_NoTitleBar);//タイトルバーを消す setContentView(R.layout.activity_title); //ここに画像処理を記載する - /* ImageView imageView = (ImageView) findViewById(R.id.gifImage); - GlideDrawableImageViewTarget target = new GlideDrawableImageViewTarget(imageView); - Glide.with(this).load(R.drawable.load).into(target); + Glide.with(this).load(R.drawable.load).into(imageView); + TextView textView = (TextView)findViewById(R.id.textView3); + loadimg(imageView,textView); - */ + init(); HandlerTest(); } //////////////////////////////////////////////////////////////////// + public void loadimg(ImageView imageView,TextView textView) { + Handler handler = new Handler(); + Runnable runnable = new Runnable() { + @Override + public void run() { + imageView.setVisibility(View.VISIBLE); + textView.setText("アカウント情報取得中"); + } + }; + handler.postDelayed(runnable, 2000); + } + + + + ////////////////////////////////////////////////////////////////////// + + //////////////////////////////////////////////////////////////////// public void HandlerTest() { Handler handler = new Handler(); Runnable runnable = new Runnable() { @@ -45,7 +69,7 @@ titleViewModel.LoginToken(acanthus, acanthus.getPreferenceEmail(), acanthus.getPreferencePassword()); } }; - handler.postDelayed(runnable, 5000); + handler.postDelayed(runnable, 10000); } ///////////////////////////////////////////////////////////// diff --git a/app/src/main/res/img/title.jpg b/app/src/main/res/img/title.jpg deleted file mode 100644 index e77fa87..0000000 --- a/app/src/main/res/img/title.jpg +++ /dev/null Binary files differ diff --git a/app/src/main/res/layout/activity_title.xml b/app/src/main/res/layout/activity_title.xml index 4780b3d..3633779 100644 --- a/app/src/main/res/layout/activity_title.xml +++ b/app/src/main/res/layout/activity_title.xml @@ -34,8 +34,29 @@ android:id="@+id/gifImage" android:layout_width="150dp" android:layout_height="148dp" - app:layout_constraintEnd_toEndOf="parent" + android:visibility="invisible" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" app:srcCompat="@drawable/load" /> + + + + + \ No newline at end of file