Skip to content

一回目のマージ終了！ #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
whitemonster46 wants to merge 5 commits into
base: main
Choose a base branch
from
+81 −6
Open

一回目のマージ終了！ #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
36e6e23
一回目のマージ終了！
whitemonster46 Dec 16, 2021
0002871
Update SubActivity.kt
whitemonster46 Dec 17, 2021
9615e12
Add files via upload
Hiroto-Oyanagi Dec 17, 2021
cc670e6
Delete christmas_santa_present.png
whitemonster46 Dec 17, 2021
44683cf
Update activity_sub.xml
whitemonster46 Dec 17, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .idea/misc.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

25 changes: 23 additions & 2 deletions app/src/main/java/jp/ac/fun/hackathon/santaclaushasfallen/SubActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,29 @@ package jp.ac.`fun`.hackathon.santaclaushasfallen
import androidx.appcompat.app.AppCompatActivity
import android.os.Bundle
import android.view.View//画面遷移に必要なインポート
//全てのViewクラスを表す(ImageView, TextView, buttonなど)
import android.content.Intent//画面遷移に必要なインポート
import android.media.MediaPlayer//MediaPlayerをつかえるようにする
import android.animation.ObjectAnimator//アニメーションのライブラリ
import android.widget.ImageView
import android.widget.TextView

class SubActivity : AppCompatActivity() {
private var santa: ImageView? = null //サンタの画像
private var distance: TextView? = null //距離の表示
lateinit var mp1:MediaPlayer//MediaPlayerの使用を定義する
private var M=100
private var u=0
private var sleep=0
private var count=0
private var text: String? = null //変換のための変数。
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
setContentView(R.layout.activity_sub)

santa = findViewById(R.id.santa) //サンタ画像の代入
distance = findViewById(R.id.Distance) //距離のテキストの代入

mp1= MediaPlayer.create(this,R.raw.gameing)//gameingというBGMを読み込む
mp1.isLooping=true//BGMをループする
mp1.start()//BGMをスタートする
Expand All @@ -29,10 +39,21 @@ class SubActivity : AppCompatActivity() {

//ボタンを押したとき
fun onButtonTapped(view: View?) {


if (M >= 1) {
M -= 1//距離が
u+=1
val move: View = findViewById(R.id.santa)
ObjectAnimator.ofFloat(move, "translationX", u*5f, u*5+5f).apply{//サンタの画像のx座標を変える
//引数はそれぞれサンタの画像のImageView、プロパティ名、
duration = 1//移動にかかる時間
start()
}
ObjectAnimator.ofFloat(move, "translationY", u*8f, u*8+8f).apply {//サンタの画像のy座標を変える
duration = 1
start()
}
text = M.toString()//文字列データに変換し
distance?.text = text //テキストに反映
if(sleep==1){
count+=1
}
Expand Down
Binary file added app/src/main/res/drawable-v24/santa.jpg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
61 changes: 57 additions & 4 deletions app/src/main/res/layout/activity_sub.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,23 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:onClick="onButtonTapped"
android:text="クリア画面へ"
android:text="押せ！"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.05"
app:layout_constraintHorizontal_bias="0.498"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.084" />
app:layout_constraintVertical_bias="0.751" />

<TextView
android:id="@+id/message"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="24dp"
android:layout_marginTop="24dp"
android:text="こどもまで"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toTopOf="parent" />

<ImageView
android:id="@+id/imageView2"
Expand All @@ -42,4 +52,47 @@
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.0"
app:srcCompat="@drawable/play_game" />
</androidx.constraintlayout.widget.ConstraintLayout>

<ImageView
android:layout_height="117dp"
android:layout_width="101dp"
android:id="@+id/santa"
app:srcCompat="@drawable/santa"
app:layout_constraintVertical_bias="0.69"
app:layout_constraintTop_toBottomOf="@+id/message"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintHorizontal_bias="0.125"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
android:contentDescription="TODO"
android:layout_marginBottom="460dp"/>

<TextView
android:id="@+id/Distance"
android:layout_width="24dp"
android:layout_height="23dp"
android:layout_marginStart="26dp"
android:layout_marginTop="16dp"
android:layout_marginEnd="327dp"
android:layout_marginBottom="36dp"
android:text="100"
app:layout_constraintBottom_toTopOf="@+id/santa"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.382"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/message"
app:layout_constraintVertical_bias="0.0" />

<TextView
android:id="@+id/unit"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:layout_marginEnd="327dp"
android:layout_marginBottom="37dp"
android:text="歩"
app:layout_constraintBottom_toTopOf="@+id/santa"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@+id/Distance"
app:layout_constraintTop_toBottomOf="@+id/message" />
</androidx.constraintlayout.widget.ConstraintLayout>