diff --git a/app/src/main/java/org/ntlab/acanthus_client/views/animation_detail/AnimationDetailActivity.java b/app/src/main/java/org/ntlab/acanthus_client/views/animation_detail/AnimationDetailActivity.java
index 0c73651..4095dc7 100644
--- a/app/src/main/java/org/ntlab/acanthus_client/views/animation_detail/AnimationDetailActivity.java
+++ b/app/src/main/java/org/ntlab/acanthus_client/views/animation_detail/AnimationDetailActivity.java
@@ -3,15 +3,24 @@
import androidx.appcompat.app.AppCompatActivity;
import android.content.Intent;
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
import android.os.Bundle;
import android.view.View;
+import android.view.ViewGroup;
import android.widget.Button;
+import android.widget.EditText;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.TextView;
import org.ntlab.acanthus_client.R;
-import org.ntlab.acanthus_client.databinding.ActivityPaintBinding;
import org.ntlab.acanthus_client.views.animation.AnimationActivity;
import org.ntlab.acanthus_client.views.animation.AnimationCanvas;
-import org.ntlab.acanthus_client.views.main_menu_ui.mypage.MyPageFragment;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URL;
public class AnimationDetailActivity extends AppCompatActivity {
@@ -23,6 +32,23 @@
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_animation_detail);
+ //文字入力テスト
+ EditText editText = findViewById(R.id.edit_text);
+ TextView wordText = findViewById(R.id.word_text);
+ TextView wordText2 = findViewById(R.id.word_text2);
+ Button wordButton = findViewById(R.id.word_button);
+
+ wordButton.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ // エディットテキストのテキストを取得
+ String text = editText.getText().toString();
+ // 取得したテキストを TextView に張り付ける
+ wordText.setText(text);
+ wordText2.setText(text);
+ }
+ });
+
//画面を閉じる
Button returnButton = findViewById(R.id.return_button);
returnButton.setOnClickListener(v -> finish());
@@ -30,18 +56,56 @@
//作成者のページに移動（今は仮でアニメーション画面へ）
Button buttonEditor1 = findViewById(R.id.button_editor1);
buttonEditor1.setOnClickListener((View v) -> {
- Intent intent = new Intent(AnimationDetailActivity.this, AnimationActivity.class);
- startActivity(intent);
- }
+ Intent intent = new Intent(AnimationDetailActivity.this, AnimationActivity.class);
+ startActivity(intent);
+ }
);
- //作成者のページに移動（今は仮でアニメーション画面へ）
+ /* //作成者のページに移動（今は仮でアニメーション画面へ）
Button buttonEditor2 = findViewById(R.id.button_editor2);
buttonEditor2.setOnClickListener((View v) -> {
- Intent intent = new Intent(AnimationDetailActivity.this, AnimationActivity.class);
- startActivity(intent);
- }
+ Intent intent = new Intent(AnimationDetailActivity.this, AnimationActivity.class);
+ startActivity(intent);
+ }
);
+
+*//* //レイアウトパラム定数(縦横の長さの定数)の格納
+ final int WC = ViewGroup.LayoutParams.WRAP_CONTENT;
+ final int MP = ViewGroup.LayoutParams.MATCH_PARENT;*//*
+
+ //基礎画面の作成
+ LinearLayout oLayout = new LinearLayout(getApplicationContext());
+ oLayout.setOrientation(LinearLayout.VERTICAL);
+ setContentView(oLayout);
+
+*//* //普通のviewの生成
+ ImageView oImg = new ImageView(getApplicationContext());
+ //横MAXの縦幅は画像と同じ高さ
+ oImg.setLayoutParams(new LinearLayout.LayoutParams(MP, WC));*//*
+
+ ImageView oImg = findViewById(R.id.samune);
+
+ URL url;
+ InputStream stream;
+ try {
+ //画像のURLを直うち
+ url = new URL("http://nitta-lab-www.is.konan-u.ac.jp/gallery/test/0/test.jpg");
+ //インプットストリームで画像を読み込む
+ stream = url.openStream();
+ //読み込んだファイルをビットマップに変換
+ Bitmap oBmp = BitmapFactory.decodeStream(stream);
+ //ビットマップをImageViewに設定
+ oImg.setImageBitmap(oBmp);
+ //インプットストリームを閉じる
+ stream.close();
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ oLayout.addView(oImg);*/
}
+
}
+
+
+
diff --git a/app/src/main/res/layout/activity_animation_detail.xml b/app/src/main/res/layout/activity_animation_detail.xml
index 66148e1..06897a0 100644
--- a/app/src/main/res/layout/activity_animation_detail.xml
+++ b/app/src/main/res/layout/activity_animation_detail.xml
@@ -4,7 +4,8 @@
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/animationDetails"
android:layout_width="match_parent"
- android:layout_height="match_parent">
+ android:layout_height="match_parent"
+ android:background="#F7F7F7">
-
-
-
-
-
-
-
-
-
-
+ app:layout_constraintVertical_bias="0.043" />
+ app:layout_constraintVertical_bias="0.424" />
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ app:layout_constraintTop_toTopOf="parent"
+ app:layout_constraintVertical_bias="0.478" />
+
+
+
+
+ app:layout_constraintVertical_bias="0.527" />
+ app:layout_constraintVertical_bias="0.972" />
+
+
+
\ No newline at end of file