# Conflicts: # Tetris/app/src/main/AndroidManifest.xmlpull/8/head
Jolys Enzo
2 years ago
commit
d27408b1f6
@ -1,6 +1,7 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="VcsDirectoryMappings">
|
||||
<mapping directory="$PROJECT_DIR$/../../.." vcs="Git" />
|
||||
<mapping directory="$PROJECT_DIR$/.." vcs="Git" />
|
||||
</component>
|
||||
</project>
|
||||
@ -0,0 +1,31 @@
|
||||
package but.androidstudio.tetris
|
||||
|
||||
import android.os.Bundle
|
||||
import androidx.fragment.app.Fragment
|
||||
import android.view.LayoutInflater
|
||||
import android.view.View
|
||||
import android.view.ViewGroup
|
||||
import views.ViewsGame
|
||||
|
||||
class GameFragment : Fragment() {
|
||||
override fun onCreate(savedInstanceState: Bundle?) {
|
||||
super.onCreate(savedInstanceState)
|
||||
}
|
||||
|
||||
override fun onCreateView(
|
||||
inflater: LayoutInflater, container: ViewGroup?,
|
||||
savedInstanceState: Bundle?
|
||||
): View? {
|
||||
// Inflate the layout for this fragment
|
||||
return inflater.inflate(R.layout.fragment_game, container, false)
|
||||
}
|
||||
|
||||
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
|
||||
super.onViewCreated(view, savedInstanceState)
|
||||
|
||||
val view = view.findViewById<ViewsGame>(R.id.tabGame)
|
||||
|
||||
//To clean the window
|
||||
view.invalidate()
|
||||
}
|
||||
}
|
||||
@ -1,34 +0,0 @@
|
||||
package tetrisGame.activity
|
||||
|
||||
import android.graphics.Canvas
|
||||
import androidx.appcompat.app.AppCompatActivity
|
||||
import android.os.Bundle
|
||||
import android.view.View
|
||||
import android.widget.ImageView
|
||||
import androidx.core.content.ContextCompat
|
||||
import but.androidstudio.tetris.R
|
||||
import tetrisGame.views.ViewsGame
|
||||
import modele.Game
|
||||
|
||||
class Game : AppCompatActivity() {
|
||||
|
||||
override fun onCreate(savedInstanceState: Bundle?) {
|
||||
super.onCreate(savedInstanceState)
|
||||
|
||||
setContentView(R.layout.activity_game)
|
||||
|
||||
val view = findViewById<ViewsGame>(R.id.tabGame)
|
||||
|
||||
//Pour nettoyer la vue
|
||||
view.invalidate()
|
||||
|
||||
}
|
||||
|
||||
override fun onResume() {
|
||||
super.onResume()
|
||||
val myGame: modele.Game = Game(10,20)
|
||||
myGame.startGame()
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
@ -1,34 +0,0 @@
|
||||
package tetrisGame.activity
|
||||
|
||||
import android.content.Intent
|
||||
import androidx.appcompat.app.AppCompatActivity
|
||||
import android.os.Bundle
|
||||
import android.widget.Button
|
||||
import android.widget.TextView
|
||||
import but.androidstudio.tetris.R
|
||||
|
||||
class Menu : AppCompatActivity() {
|
||||
override fun onCreate(savedInstanceState: Bundle?) {
|
||||
super.onCreate(savedInstanceState)
|
||||
setContentView(R.layout.activity_menu)
|
||||
|
||||
val appName:TextView = findViewById(R.id.appName)
|
||||
appName.setText(R.string.app_name)
|
||||
}
|
||||
|
||||
override fun onResume() {
|
||||
super.onResume()
|
||||
|
||||
val buttonStart:Button = findViewById(R.id.buttonStart)
|
||||
buttonStart.setOnClickListener {
|
||||
val intentStart = Intent(this,Game::class.java)
|
||||
startActivity(intentStart)
|
||||
}
|
||||
|
||||
val buttonOption:Button = findViewById(R.id.buttonOption)
|
||||
buttonOption.setOnClickListener {
|
||||
val intentOption = Intent(this,Option::class.java)
|
||||
startActivity(intentOption)
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -1,39 +0,0 @@
|
||||
package activity
|
||||
|
||||
import android.os.Bundle
|
||||
import android.view.View
|
||||
import android.widget.AdapterView
|
||||
import android.widget.ArrayAdapter
|
||||
import android.widget.Spinner
|
||||
import androidx.appcompat.app.AppCompatActivity
|
||||
import but.androidstudio.tetris.R
|
||||
|
||||
class Option : AppCompatActivity() {
|
||||
override fun onCreate(savedInstanceState: Bundle?) {
|
||||
super.onCreate(savedInstanceState)
|
||||
setContentView(R.layout.activity_option)
|
||||
}
|
||||
|
||||
override fun onResume() {
|
||||
super.onResume()
|
||||
|
||||
val spinnerDifficulty:Spinner = findViewById(R.id.spinnerDifficulty)
|
||||
val difficulty = arrayOf("Easy","Medium","Hard")
|
||||
|
||||
val adaptateurSpinnerDifficulty = ArrayAdapter(this,android.R.layout.simple_spinner_dropdown_item,difficulty)
|
||||
spinnerDifficulty.adapter = adaptateurSpinnerDifficulty
|
||||
|
||||
spinnerDifficulty.setOnItemSelectedListener(object : AdapterView.OnItemSelectedListener {
|
||||
override fun onItemSelected(parent: AdapterView<*>, view: View?, position: Int, id: Long) {
|
||||
val selectedItem = parent.getItemAtPosition(position).toString()
|
||||
// Faites quelque chose avec l'élément sélectionné
|
||||
}
|
||||
|
||||
override fun onNothingSelected(parent: AdapterView<*>) {
|
||||
// Ne rien faire si aucun élément n'est sélectionné
|
||||
}
|
||||
})
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
@ -1,11 +1,9 @@
|
||||
package tetrisGame.views
|
||||
package views
|
||||
|
||||
import android.annotation.SuppressLint
|
||||
import android.content.Context
|
||||
import android.graphics.Canvas
|
||||
import android.graphics.Color
|
||||
import android.graphics.Paint
|
||||
import android.graphics.Rect
|
||||
import android.util.AttributeSet
|
||||
import android.view.View
|
||||
|
||||
@ -1,33 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<androidx.constraintlayout.widget.ConstraintLayout
|
||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||
xmlns:tools="http://schemas.android.com/tools"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
tools:context="activity.Menu">
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="vertical"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintHorizontal_bias="0.5"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent"
|
||||
app:layout_constraintVertical_bias="0.5">
|
||||
|
||||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="Difficulty"/>
|
||||
|
||||
<Spinner
|
||||
android:id="@+id/spinnerDifficulty"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:padding="1mm"
|
||||
/>
|
||||
</LinearLayout>
|
||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||
Loading…
Reference in new issue