diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 4ffbc276c4cb42387cc61f6b5a7ddb3f21f73086..ada5d9888ea58b041a208c2502d7619174cc3782 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -21,6 +21,12 @@ </intent-filter> </activity> <activity android:name=".RegisterActivity" android:exported="true"/> + <activity android:name=".MapActivity" android:exported="true"/> + <activity android:name=".Minijuego1" android:exported="true"/> + <activity android:name=".Minijuego2" android:exported="true"/> + <activity android:name=".Minijuego3" android:exported="true"/> + <activity android:name=".Minijuego4" android:exported="true"/> + </application> </manifest> \ No newline at end of file diff --git a/app/src/main/java/com/example/ellegadodepintia/MainActivity.kt b/app/src/main/java/com/example/ellegadodepintia/MainActivity.kt index 4c8675a0bd5e15dac9adafda2a726f7f3a3cbb57..67c4ce2366d165970eb3443b593531e00ae3de03 100644 --- a/app/src/main/java/com/example/ellegadodepintia/MainActivity.kt +++ b/app/src/main/java/com/example/ellegadodepintia/MainActivity.kt @@ -15,5 +15,11 @@ class MainActivity : AppCompatActivity() { val intent = Intent(this, RegisterActivity::class.java) startActivity(intent) } + + val logInButton = findViewById<Button>(R.id.loginButton) + logInButton.setOnClickListener { + val intent = Intent(this, MapActivity::class.java) + startActivity(intent) + } } } \ No newline at end of file diff --git a/app/src/main/java/com/example/ellegadodepintia/MapActivity.kt b/app/src/main/java/com/example/ellegadodepintia/MapActivity.kt new file mode 100644 index 0000000000000000000000000000000000000000..83e6a76d220445b3087d7385107aeb6c219e80db --- /dev/null +++ b/app/src/main/java/com/example/ellegadodepintia/MapActivity.kt @@ -0,0 +1,48 @@ +package com.example.ellegadodepintia + +import android.content.Intent +import android.graphics.Color +import android.os.Bundle +import android.widget.Button +import android.widget.ImageButton +import androidx.appcompat.app.AppCompatActivity + +class MapActivity : AppCompatActivity() { + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setContentView(R.layout.activity_map) + + val mapButton: ImageButton= findViewById(R.id.mapButton) + val leaderboardButton: ImageButton = findViewById(R.id.leaderboardButton) + val shopButton: ImageButton = findViewById(R.id.shopButton) + + + mapButton.setBackgroundResource(R.drawable.edittext_border) + leaderboardButton.setBackgroundColor(Color.TRANSPARENT) + shopButton.setBackgroundColor(Color.TRANSPARENT) + + val minijuego1Button = findViewById<Button>(R.id.minijuego1) + minijuego1Button.setOnClickListener { + val intent = Intent(this, Minijuego1::class.java) + startActivity(intent) + } + + val minijuego2Button = findViewById<Button>(R.id.minijuego2) + minijuego2Button.setOnClickListener { + val intent = Intent(this, Minijuego2::class.java) + startActivity(intent) + } + + val minijuego3Button = findViewById<Button>(R.id.minijuego3) + minijuego3Button.setOnClickListener { + val intent = Intent(this, Minijuego3::class.java) + startActivity(intent) + } + + val minijuego4Button = findViewById<Button>(R.id.minijuego4) + minijuego4Button.setOnClickListener { + val intent = Intent(this, Minijuego4::class.java) + startActivity(intent) + } + } +} diff --git a/app/src/main/java/com/example/ellegadodepintia/Minijuego1.kt b/app/src/main/java/com/example/ellegadodepintia/Minijuego1.kt new file mode 100644 index 0000000000000000000000000000000000000000..f46cf02b5058946acfed926cccdd4a9023dae1e9 --- /dev/null +++ b/app/src/main/java/com/example/ellegadodepintia/Minijuego1.kt @@ -0,0 +1,11 @@ +package com.example.ellegadodepintia + +import android.os.Bundle +import androidx.appcompat.app.AppCompatActivity + +class Minijuego1 : AppCompatActivity() { + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setContentView(R.layout.activity_minijuego1) + } +} \ No newline at end of file diff --git a/app/src/main/java/com/example/ellegadodepintia/Minijuego2.kt b/app/src/main/java/com/example/ellegadodepintia/Minijuego2.kt new file mode 100644 index 0000000000000000000000000000000000000000..57a7ba14ba5ba75377f144bc88bb0af796d50e2f --- /dev/null +++ b/app/src/main/java/com/example/ellegadodepintia/Minijuego2.kt @@ -0,0 +1,11 @@ +package com.example.ellegadodepintia + +import android.os.Bundle +import androidx.appcompat.app.AppCompatActivity + +class Minijuego2 : AppCompatActivity() { + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setContentView(R.layout.activity_minijuego2) + } +} \ No newline at end of file diff --git a/app/src/main/java/com/example/ellegadodepintia/Minijuego3.kt b/app/src/main/java/com/example/ellegadodepintia/Minijuego3.kt new file mode 100644 index 0000000000000000000000000000000000000000..1b64d17224b5759ce8b8e60a880fa7f9dbd247ca --- /dev/null +++ b/app/src/main/java/com/example/ellegadodepintia/Minijuego3.kt @@ -0,0 +1,11 @@ +package com.example.ellegadodepintia + +import android.os.Bundle +import androidx.appcompat.app.AppCompatActivity + +class Minijuego3 : AppCompatActivity() { + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setContentView(R.layout.activity_minijuego3) + } +} \ No newline at end of file diff --git a/app/src/main/java/com/example/ellegadodepintia/Minijuego4.kt b/app/src/main/java/com/example/ellegadodepintia/Minijuego4.kt new file mode 100644 index 0000000000000000000000000000000000000000..dc168ddc433315cc940853a2306d934a06f3070f --- /dev/null +++ b/app/src/main/java/com/example/ellegadodepintia/Minijuego4.kt @@ -0,0 +1,11 @@ +package com.example.ellegadodepintia + +import android.os.Bundle +import androidx.appcompat.app.AppCompatActivity + +class Minijuego4 : AppCompatActivity() { + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setContentView(R.layout.activity_minijuego4) + } +} \ No newline at end of file diff --git a/app/src/main/res/drawable/edittext_border.xml b/app/src/main/res/drawable/edittext_border.xml index 2b5e545734d176521519cde241c7e19594bd564f..6efa1291a48cf0a0b9753d31c861acc4003d0776 100644 --- a/app/src/main/res/drawable/edittext_border.xml +++ b/app/src/main/res/drawable/edittext_border.xml @@ -1,7 +1,4 @@ <shape xmlns:android="http://schemas.android.com/apk/res/android"> - <solid android:color="#FFFFFF"/> - <stroke - android:width="2dp" - android:color="#401201"/> - <corners android:radius="8dp"/> + <solid android:color="@color/pintiaInput"/> + <corners android:radius="20dp"/> </shape> diff --git a/app/src/main/res/drawable/leaderboard.png b/app/src/main/res/drawable/leaderboard.png new file mode 100644 index 0000000000000000000000000000000000000000..8c9b2c27e46079d1920dea95d2127265b1656d56 Binary files /dev/null and b/app/src/main/res/drawable/leaderboard.png differ diff --git a/app/src/main/res/drawable/map.png b/app/src/main/res/drawable/map.png new file mode 100644 index 0000000000000000000000000000000000000000..ecab2dd716ec237996942610e0890c6e36ae7615 Binary files /dev/null and b/app/src/main/res/drawable/map.png differ diff --git a/app/src/main/res/drawable/settings.png b/app/src/main/res/drawable/settings.png new file mode 100644 index 0000000000000000000000000000000000000000..9b516c29fb9bac22d94fb45415a2586ebbd6b513 Binary files /dev/null and b/app/src/main/res/drawable/settings.png differ diff --git a/app/src/main/res/drawable/shop.png b/app/src/main/res/drawable/shop.png new file mode 100644 index 0000000000000000000000000000000000000000..bf6d444d77d5e52f13f895dc471ded53ad37001c Binary files /dev/null and b/app/src/main/res/drawable/shop.png differ diff --git a/app/src/main/res/layout/activity_map.xml b/app/src/main/res/layout/activity_map.xml new file mode 100644 index 0000000000000000000000000000000000000000..84b2ea2100390fbeb7f23386fa758904310ad6bc --- /dev/null +++ b/app/src/main/res/layout/activity_map.xml @@ -0,0 +1,159 @@ +<RelativeLayout + xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:tools="http://schemas.android.com/tools" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:background="@color/pintiaBackground" + android:padding="16dp" + tools:ignore="HardcodedText"> + + <LinearLayout + android:id="@+id/top_navigation" + style="?android:attr/buttonBarStyle" + android:layout_width="match_parent" + android:layout_height="36dp" + android:layout_marginTop="10dp" + android:orientation="horizontal"> + + <LinearLayout + android:id="@+id/moneyLayout" + android:layout_width="153dp" + android:layout_height="match_parent" + android:background="@drawable/edittext_border" + android:orientation="horizontal"> + + <ImageView + android:id="@+id/moneyImage" + android:layout_width="30dp" + android:layout_height="match_parent" + android:layout_marginStart="10dp" + android:contentDescription="Logo del juego" + android:src="@drawable/logo_pintia" + tools:ignore="HardcodedText" /> + + <TextView + android:id="@+id/moneyText" + android:layout_width="wrap_content" + android:layout_height="match_parent" + android:layout_marginStart="30dp" + android:text="1200" + android:textColor="@color/pintiaTitleText" + android:textSize="24sp" + android:textStyle="bold" + tools:ignore="HardcodedText" /> + + </LinearLayout> + + <ImageButton + android:id="@+id/settings" + android:layout_width="0dp" + android:layout_height="match_parent" + style="?android:attr/buttonBarStyle" + android:layout_weight="1" + android:contentDescription="Abre las opciones" + android:scaleType="fitCenter" + android:layout_marginStart="180dp" + android:padding="5dp" + android:src="@drawable/settings" /> + + </LinearLayout> + + <LinearLayout + style="?android:attr/buttonBarStyle" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_centerInParent="true" + android:orientation="horizontal"> + + <Button + android:id="@+id/minijuego1" + style="?android:attr/buttonBarButtonStyle" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:background="@android:color/transparent" + android:text="1" + android:textSize="24sp" + android:layout_margin="4dp" + android:textColor="@color/pintiaTitleText"/> + + <Button + android:id="@+id/minijuego2" + style="?android:attr/buttonBarButtonStyle" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:background="@android:color/transparent" + android:text="2" + android:textSize="24sp" + android:layout_margin="4dp" + android:textColor="@color/pintiaTitleText"/> + + <Button + android:id="@+id/minijuego3" + style="?android:attr/buttonBarButtonStyle" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:background="@android:color/transparent" + android:text="3" + android:textSize="24sp" + android:layout_margin="4dp" + android:textColor="@color/pintiaTitleText"/> + + <Button + android:id="@+id/minijuego4" + style="?android:attr/buttonBarButtonStyle" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:background="@android:color/transparent" + android:text="4" + android:textSize="24sp" + android:layout_margin="4dp" + android:textColor="@color/pintiaTitleText"/> + </LinearLayout> + + <LinearLayout + android:id="@+id/bottom_navigation" + style="?android:attr/buttonBarStyle" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_alignParentBottom="true" + android:orientation="horizontal"> + + <ImageButton + android:id="@+id/leaderboardButton" + android:layout_width="0dp" + android:layout_height="60dp" + android:layout_weight="1" + android:background="?attr/selectableItemBackground" + android:src="@drawable/leaderboard" + android:contentDescription="Abre el mapa" + android:padding="5dp" + android:scaleType="fitCenter"/> + + <ImageButton + android:id="@+id/mapButton" + android:layout_width="0dp" + android:layout_height="60dp" + android:layout_weight="1" + android:background="?attr/selectableItemBackground" + android:src="@drawable/map" + android:contentDescription="Abre el ranking" + android:layout_marginEnd="40dp" + android:layout_marginStart="40dp" + android:scaleType="fitCenter"/> + + <ImageButton + android:id="@+id/shopButton" + android:layout_width="0dp" + android:layout_height="60dp" + android:layout_weight="1" + android:background="?attr/selectableItemBackground" + android:src="@drawable/shop" + android:contentDescription="Abre la tienda" + android:padding="5dp" + android:scaleType="fitCenter"/> + + </LinearLayout> + + + +</RelativeLayout> diff --git a/app/src/main/res/layout/activity_minijuego1.xml b/app/src/main/res/layout/activity_minijuego1.xml new file mode 100644 index 0000000000000000000000000000000000000000..73c07423cb48699d5e8a4e8c1055deb08b1ca747 --- /dev/null +++ b/app/src/main/res/layout/activity_minijuego1.xml @@ -0,0 +1,23 @@ +<LinearLayout + xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:tools="http://schemas.android.com/tools" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:orientation="vertical" + android:gravity="center" + + android:background="@color/pintiaBackground" + android:padding="16dp"> + + <TextView + android:id="@+id/titleTextView" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginTop="20dp" + android:text="Minijuego 1" + android:textColor="@color/pintiaTitleText" + android:textSize="24sp" + android:textStyle="bold" + tools:ignore="HardcodedText" /> + +</LinearLayout> diff --git a/app/src/main/res/layout/activity_minijuego2.xml b/app/src/main/res/layout/activity_minijuego2.xml new file mode 100644 index 0000000000000000000000000000000000000000..42abbe502cb2481659547d839364a4edd4d3423f --- /dev/null +++ b/app/src/main/res/layout/activity_minijuego2.xml @@ -0,0 +1,23 @@ +<LinearLayout + xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:tools="http://schemas.android.com/tools" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:orientation="vertical" + android:gravity="center" + + android:background="@color/pintiaBackground" + android:padding="16dp"> + + <TextView + android:id="@+id/titleTextView" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginTop="20dp" + android:text="Minijuego 2" + android:textColor="@color/pintiaTitleText" + android:textSize="24sp" + android:textStyle="bold" + tools:ignore="HardcodedText" /> + +</LinearLayout> diff --git a/app/src/main/res/layout/activity_minijuego3.xml b/app/src/main/res/layout/activity_minijuego3.xml new file mode 100644 index 0000000000000000000000000000000000000000..c459ae254ae38c50e333fed1421c0068bc4e6c29 --- /dev/null +++ b/app/src/main/res/layout/activity_minijuego3.xml @@ -0,0 +1,23 @@ +<LinearLayout + xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:tools="http://schemas.android.com/tools" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:orientation="vertical" + android:gravity="center" + + android:background="@color/pintiaBackground" + android:padding="16dp"> + + <TextView + android:id="@+id/titleTextView" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginTop="20dp" + android:text="Minijuego 3" + android:textColor="@color/pintiaTitleText" + android:textSize="24sp" + android:textStyle="bold" + tools:ignore="HardcodedText" /> + +</LinearLayout> diff --git a/app/src/main/res/layout/activity_minijuego4.xml b/app/src/main/res/layout/activity_minijuego4.xml new file mode 100644 index 0000000000000000000000000000000000000000..b983c48b12514e92aae92ade4ff78671159d02f5 --- /dev/null +++ b/app/src/main/res/layout/activity_minijuego4.xml @@ -0,0 +1,23 @@ +<LinearLayout + xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:tools="http://schemas.android.com/tools" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:orientation="vertical" + android:gravity="center" + + android:background="@color/pintiaBackground" + android:padding="16dp"> + + <TextView + android:id="@+id/titleTextView" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginTop="20dp" + android:text="Minijuego 4" + android:textColor="@color/pintiaTitleText" + android:textSize="24sp" + android:textStyle="bold" + tools:ignore="HardcodedText" /> + +</LinearLayout>