Skip to content

Commit

Permalink
first time normal works
Browse files Browse the repository at this point in the history
  • Loading branch information
@Mirxomitov
Mirxomitov committed Feb 13, 2024
1 parent fa9e6b5 commit 94ce0a1
Show file tree
Hide file tree
Showing 15 changed files with 277 additions and 186 deletions.
13 changes: 13 additions & 0 deletions app/build.gradle.kts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@ plugins {
id("com.android.application")
id("org.jetbrains.kotlin.android")
id("androidx.navigation.safeargs")
id("kotlin-parcelize")
kotlin("kapt")
id("com.google.dagger.hilt.android")
}

android {
Expand Down Expand Up @@ -55,4 +58,14 @@ dependencies {
// Navigation
implementation("androidx.navigation:navigation-fragment-ktx:2.7.6")
implementation("androidx.navigation:navigation-ui-ktx:2.7.6")

/**
* DI Dagger Hilt
*/
implementation("com.google.dagger:hilt-android:2.50")
kapt("com.google.dagger:hilt-android-compiler:2.50")
}

kapt {
correctErrorTypes = true
}
1 change: 1 addition & 0 deletions app/src/main/AndroidManifest.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
android:roundIcon="@mipmap/ic_launcher_round"
android:supportsRtl="true"
android:theme="@style/Theme.MemoryGame"
android:name=".app.App"
tools:targetApi="31">
<activity
android:name=".MainActivity"
Expand Down
2 changes: 2 additions & 0 deletions app/src/main/java/uz/gita/memorygame/MainActivity.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@ package uz.gita.memorygame

import androidx.appcompat.app.AppCompatActivity
import android.os.Bundle
import dagger.hilt.android.AndroidEntryPoint

@AndroidEntryPoint
class MainActivity : AppCompatActivity() {
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
Expand Down
124 changes: 62 additions & 62 deletions app/src/main/java/uz/gita/memorygame/data/ImagesMapper.kt
View file
Original file line number Diff line number Diff line change
@@ -1,62 +1,62 @@
package uz.gita.memorygame.data

import uz.gita.memorygame.R

object ImagesMapper {
val map = mapOf(
0 to R.drawable.image_1,
1 to R.drawable.image_2,
2 to R.drawable.image_3,
3 to R.drawable.image_4,
4 to R.drawable.image_5,
5 to R.drawable.image_6,
6 to R.drawable.image_7,
7 to R.drawable.image_8,
8 to R.drawable.image_9,
9 to R.drawable.image_10,
10 to R.drawable.image_11,
11 to R.drawable.image_12,
12 to R.drawable.image_13,
13 to R.drawable.image_14,
14 to R.drawable.image_15,
15 to R.drawable.image_16,
16 to R.drawable.image_17,
17 to R.drawable.image_18,
18 to R.drawable.image_19,
19 to R.drawable.image_20,
20 to R.drawable.image_21,
21 to R.drawable.image_22,
22 to R.drawable.image_23,
23 to R.drawable.image_24,
24 to R.drawable.image_25,
25 to R.drawable.image_26,
26 to R.drawable.image_27,
27 to R.drawable.image_28,
28 to R.drawable.image_29,
29 to R.drawable.image_30,
30 to R.drawable.image_31,
31 to R.drawable.image_32,
32 to R.drawable.image_33,
33 to R.drawable.image_34,
34 to R.drawable.image_35,
35 to R.drawable.image_36,
36 to R.drawable.image_37,
37 to R.drawable.image_38,
38 to R.drawable.image_39,
39 to R.drawable.image_40,
40 to R.drawable.image_41,
41 to R.drawable.image_42,
42 to R.drawable.image_43,
43 to R.drawable.image_44,
44 to R.drawable.image_45,
45 to R.drawable.image_46,
46 to R.drawable.image_47,
47 to R.drawable.image_48,
48 to R.drawable.image_49,
49 to R.drawable.image_50,
50 to R.drawable.image_51,
51 to R.drawable.image_52,
52 to R.drawable.image_53,
53 to R.drawable.image_54
)
}
//package uz.gita.memorygame.data
//
//import uz.gita.memorygame.R
//
//object ImagesMapper {
// val map = mapOf(
// 0 to R.drawable.image_1,
// 1 to R.drawable.image_2,
// 2 to R.drawable.image_3,
// 3 to R.drawable.image_4,
// 4 to R.drawable.image_5,
// 5 to R.drawable.image_6,
// 6 to R.drawable.image_7,
// 7 to R.drawable.image_8,
// 8 to R.drawable.image_9,
// 9 to R.drawable.image_10,
// 10 to R.drawable.image_11,
// 11 to R.drawable.image_12,
// 12 to R.drawable.image_13,
// 13 to R.drawable.image_14,
// 14 to R.drawable.image_15,
// 15 to R.drawable.image_16,
// 16 to R.drawable.image_17,
// 17 to R.drawable.image_18,
// 18 to R.drawable.image_19,
// 19 to R.drawable.image_20,
// 20 to R.drawable.image_21,
// 21 to R.drawable.image_22,
// 22 to R.drawable.image_23,
// 23 to R.drawable.image_24,
// 24 to R.drawable.image_25,
// 25 to R.drawable.image_26,
// 26 to R.drawable.image_27,
// 27 to R.drawable.image_28,
// 28 to R.drawable.image_29,
// 29 to R.drawable.image_30,
// 30 to R.drawable.image_31,
// 31 to R.drawable.image_32,
// 32 to R.drawable.image_33,
// 33 to R.drawable.image_34,
// 34 to R.drawable.image_35,
// 35 to R.drawable.image_36,
// 36 to R.drawable.image_37,
// 37 to R.drawable.image_38,
// 38 to R.drawable.image_39,
// 39 to R.drawable.image_40,
// 40 to R.drawable.image_41,
// 41 to R.drawable.image_42,
// 42 to R.drawable.image_43,
// 43 to R.drawable.image_44,
// 44 to R.drawable.image_45,
// 45 to R.drawable.image_46,
// 46 to R.drawable.image_47,
// 47 to R.drawable.image_48,
// 48 to R.drawable.image_49,
// 49 to R.drawable.image_50,
// 50 to R.drawable.image_51,
// 51 to R.drawable.image_52,
// 52 to R.drawable.image_53,
// 53 to R.drawable.image_54
// )
//}
3 changes: 3 additions & 0 deletions app/src/main/java/uz/gita/memorygame/domain/AppRepository.kt
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
package uz.gita.memorygame.domain

import uz.gita.memorygame.data.CardData

interface AppRepository {
fun getCardsByLevel(countX: Int, countY: Int) : List<Int>
}
73 changes: 72 additions & 1 deletion app/src/main/java/uz/gita/memorygame/domain/impl/AppRepositoryImpl.kt
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,78 @@
package uz.gita.memorygame.domain.impl

import uz.gita.memorygame.R
import uz.gita.memorygame.data.CardData
import uz.gita.memorygame.domain.AppRepository
import javax.inject.Inject
import javax.inject.Singleton

class AppRepositoryImpl : AppRepository {
@Singleton
class AppRepositoryImpl @Inject constructor(

) : AppRepository {
private val imageIDList = listOf<Int>(
R.drawable.image_1,
R.drawable.image_2,
R.drawable.image_3,
R.drawable.image_4,
R.drawable.image_5,
R.drawable.image_6,
R.drawable.image_7,
R.drawable.image_8,
R.drawable.image_9,
R.drawable.image_10,
R.drawable.image_11,
R.drawable.image_12,
R.drawable.image_13,
R.drawable.image_14,
R.drawable.image_15,
R.drawable.image_16,
R.drawable.image_17,
R.drawable.image_18,
R.drawable.image_19,
R.drawable.image_20,
R.drawable.image_21,
R.drawable.image_22,
R.drawable.image_23,
R.drawable.image_24,
R.drawable.image_25,
R.drawable.image_26,
R.drawable.image_27,
R.drawable.image_28,
R.drawable.image_29,
R.drawable.image_30,
R.drawable.image_31,
R.drawable.image_32,
R.drawable.image_33,
R.drawable.image_34,
R.drawable.image_35,
R.drawable.image_36,
R.drawable.image_37,
R.drawable.image_38,
R.drawable.image_39,
R.drawable.image_40,
R.drawable.image_41,
R.drawable.image_42,
R.drawable.image_43,
R.drawable.image_44,
R.drawable.image_45,
R.drawable.image_46,
R.drawable.image_47,
R.drawable.image_48,
R.drawable.image_49,
R.drawable.image_50,
R.drawable.image_51,
R.drawable.image_52,
R.drawable.image_53,
R.drawable.image_54
)

override fun getCardsByLevel(countX: Int, countY: Int): List<Int> {
val result = ArrayList<Int>()

val images = imageIDList.shuffled().subList(0, countX * countY / 2)
repeat(2) {result.addAll(images)}

return result.shuffled()
}
}
Loading

0 comments on commit 94ce0a1

Please sign in to comment.