Skip to content

Commit

Permalink
chore: changed package name and added launcher icon
Browse files Browse the repository at this point in the history
  • Loading branch information
aryanA101a committed Oct 8, 2023
1 parent 33e926b commit 60eb954
Show file tree
Hide file tree
Showing 36 changed files with 93 additions and 101 deletions.
4 changes: 2 additions & 2 deletions app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@ plugins {
}

android {
namespace = "com.example.a2048"
namespace = "com.aryan.a2048"
compileSdk = 34

defaultConfig {
applicationId = "com.example.a2048"
applicationId = "com.aryan.a2048"
minSdk = 24
targetSdk = 33
versionCode = 1
Expand Down
Binary file added app/src/main/ic_launcher-playstore.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.example.a2048
package com.aryan.a2048

import android.annotation.SuppressLint
import android.content.Context
Expand All @@ -9,9 +9,11 @@ import androidx.appcompat.app.AppCompatActivity
import androidx.databinding.DataBindingUtil.setContentView
import androidx.datastore.core.DataStore
import androidx.datastore.dataStore
import com.example.a2048.databinding.ActivityMainBinding
import com.example.a2048.data.model.SavedGameSerializer
import com.example.a2048.viewmodel.GameViewModel
import com.aryan.a2048.R
import com.aryan.a2048.databinding.ActivityMainBinding
import com.example.a2048.SavedGameProto
import com.aryan.a2048.data.model.SavedGameSerializer
import com.aryan.a2048.viewmodel.GameViewModel
import dagger.hilt.android.AndroidEntryPoint

val Context.dataStore: DataStore<SavedGameProto> by dataStore(
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.example.a2048
package com.aryan.a2048

import android.app.Application
import dagger.hilt.android.HiltAndroidApp
Expand Down
Original file line number Diff line number Diff line change
@@ -1,23 +1,19 @@
package com.example.a2048.adapter
package com.aryan.a2048.adapter

import android.content.res.ColorStateList
import android.graphics.Color
import android.graphics.Color.parseColor
import android.graphics.drawable.ColorDrawable
import android.text.Html
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import androidx.core.content.ContextCompat
import androidx.databinding.DataBindingUtil
import androidx.recyclerview.widget.DefaultItemAnimator
import androidx.recyclerview.widget.DiffUtil
import androidx.recyclerview.widget.ListAdapter
import androidx.recyclerview.widget.RecyclerView
import com.example.a2048.R
import com.example.a2048.data.model.Cell
import com.example.a2048.databinding.CellBinding
import com.example.a2048.util.Utils
import com.aryan.a2048.R
import com.aryan.a2048.data.model.Cell
import com.aryan.a2048.databinding.CellBinding
import com.aryan.a2048.util.Utils
import kotlin.math.log2

class GridAdapter() : ListAdapter<Cell, MyViewHolder>(MyDiffCallback()) {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.example.a2048.data.model
package com.aryan.a2048.data.model

import android.util.Log
import com.example.a2048.util.Utils
import com.aryan.a2048.util.Utils
import kotlin.random.Random

typealias Score = Int
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.example.a2048.data.model
package com.aryan.a2048.data.model

data class Cell(val value: Int, val id: Int) {
override fun toString(): String {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package com.example.a2048.data.model
package com.aryan.a2048.data.model

import android.util.Log
import com.example.a2048.util.MoveOutcome
import com.example.a2048.util.Direction
import com.aryan.a2048.util.MoveOutcome
import com.aryan.a2048.util.Direction
import javax.inject.Inject

class Game @Inject constructor(val board: Board) {
Expand Down Expand Up @@ -96,7 +96,7 @@ class Game @Inject constructor(val board: Board) {
boardState = newBoardState,
score = state.score + score,
highScore = maxOf(state.score + score, state.highScore),
result = if (outcome==MoveOutcome.NOTHING) state.result else outcome
result = if (outcome== MoveOutcome.NOTHING) state.result else outcome
)

_state = newState
Expand All @@ -109,7 +109,7 @@ class Game @Inject constructor(val board: Board) {


fun undoState() {
if (state.result!=MoveOutcome.LOST) {
if (state.result!= MoveOutcome.LOST) {
_state = prevState
}
}
Expand Down
5 changes: 5 additions & 0 deletions app/src/main/java/com/aryan/a2048/data/model/Move.kt
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
package com.aryan.a2048.data.model

import com.aryan.a2048.util.MoveOutcome

data class Move(val successful: Boolean, val outcome: MoveOutcome)
3 changes: 3 additions & 0 deletions app/src/main/java/com/aryan/a2048/data/model/SavedGame.kt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
package com.aryan.a2048.data.model

data class SavedGame(val state: Game.State, val prevState: Game.State)
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.example.a2048.data.model
package com.aryan.a2048.data.model

import androidx.datastore.core.Serializer
import com.example.a2048.SavedGameProto
Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
package com.example.a2048.data.repository
package com.aryan.a2048.data.repository

import android.app.Application
import android.util.Log
import com.example.a2048.SavedGameProto
import com.example.a2048.data.model.Board
import com.example.a2048.data.model.Cell
import com.example.a2048.dataStore
import com.example.a2048.data.model.Game
import com.example.a2048.data.model.SavedGame
import com.example.a2048.util.MoveOutcome
import com.aryan.a2048.data.model.Board
import com.aryan.a2048.data.model.Cell
import com.aryan.a2048.dataStore
import com.aryan.a2048.data.model.Game
import com.aryan.a2048.data.model.SavedGame
import com.aryan.a2048.util.MoveOutcome
import kotlinx.coroutines.flow.first

class GameRepository(private val context: Application) {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package com.example.a2048.di
package com.aryan.a2048.di

import android.app.Application
import com.example.a2048.data.model.Board
import com.example.a2048.data.model.Game
import com.example.a2048.data.repository.GameRepository
import com.aryan.a2048.data.model.Board
import com.aryan.a2048.data.model.Game
import com.aryan.a2048.data.repository.GameRepository
import dagger.Module
import dagger.Provides
import dagger.hilt.InstallIn
Expand All @@ -22,7 +22,7 @@ object AppModule {

@Provides
@Singleton
fun providesBoard():Board{
fun providesBoard(): Board {
return Board()
}

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.example.a2048.util
package com.aryan.a2048.util

object Utils {
fun idxToCoordinates(idx: Int) = Pair(first = idx / 4, second = idx % 4)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.example.a2048.view.fragment
package com.aryan.a2048.view.fragment

import android.annotation.SuppressLint
import android.os.Bundle
Expand All @@ -15,14 +15,14 @@ import androidx.lifecycle.lifecycleScope
import androidx.lifecycle.repeatOnLifecycle
import androidx.navigation.fragment.findNavController
import androidx.recyclerview.widget.GridLayoutManager
import com.example.a2048.R
import com.example.a2048.adapter.GridAdapter
import com.example.a2048.adapter.GridItemAnimator
import com.example.a2048.databinding.FragmentGameBinding
import com.example.a2048.util.Direction
import com.example.a2048.util.MoveOutcome
import com.example.a2048.view.listener.OnSwipeTouchListener
import com.example.a2048.viewmodel.GameViewModel
import com.aryan.a2048.R
import com.aryan.a2048.adapter.GridAdapter
import com.aryan.a2048.adapter.GridItemAnimator
import com.aryan.a2048.databinding.FragmentGameBinding
import com.aryan.a2048.util.Direction
import com.aryan.a2048.util.MoveOutcome
import com.aryan.a2048.view.listener.OnSwipeTouchListener
import com.aryan.a2048.viewmodel.GameViewModel
import dagger.hilt.android.AndroidEntryPoint
import kotlinx.coroutines.launch

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.example.a2048.view.fragment
package com.aryan.a2048.view.fragment

import android.os.Bundle
import android.view.LayoutInflater
Expand All @@ -7,13 +7,13 @@ import android.view.ViewGroup
import androidx.fragment.app.Fragment
import androidx.fragment.app.activityViewModels
import androidx.navigation.fragment.findNavController
import com.example.a2048.databinding.FragmentWinningBinding
import com.example.a2048.viewmodel.GameViewModel
import com.aryan.a2048.databinding.FragmentWinningBinding
import com.aryan.a2048.viewmodel.GameViewModel
import dagger.hilt.android.AndroidEntryPoint

@AndroidEntryPoint
class WinningFragment : Fragment() {
private val gameViewModel:GameViewModel by activityViewModels()
private val gameViewModel: GameViewModel by activityViewModels()


override fun onCreateView(
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.example.a2048.view.listener
package com.aryan.a2048.view.listener

import android.content.Context
import android.view.GestureDetector
Expand Down
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
package com.example.a2048.viewmodel
package com.aryan.a2048.viewmodel

import android.util.Log
import androidx.lifecycle.LiveData
import androidx.lifecycle.MutableLiveData
import androidx.lifecycle.ViewModel
import androidx.lifecycle.viewModelScope
import com.example.a2048.data.repository.GameRepository
import com.example.a2048.data.model.Game
import com.example.a2048.data.model.SavedGame
import com.example.a2048.util.Direction
import com.example.a2048.util.MoveOutcome
import com.aryan.a2048.data.repository.GameRepository
import com.aryan.a2048.data.model.Game
import com.aryan.a2048.data.model.SavedGame
import com.aryan.a2048.util.Direction
import com.aryan.a2048.util.MoveOutcome
import dagger.hilt.android.lifecycle.HiltViewModel
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.flow.MutableSharedFlow
Expand Down
5 changes: 0 additions & 5 deletions app/src/main/java/com/example/a2048/data/model/Move.kt

This file was deleted.

3 changes: 0 additions & 3 deletions app/src/main/java/com/example/a2048/data/model/SavedGame.kt

This file was deleted.

44 changes: 18 additions & 26 deletions app/src/main/res/drawable/ic_launcher_foreground.xml
Original file line number Diff line number Diff line change
@@ -1,30 +1,22 @@
<?xml version="1.0" encoding="utf-8"?>
<vector xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:aapt="http://schemas.android.com/aapt"
android:width="108dp"
android:height="108dp"
android:viewportWidth="108"
android:viewportHeight="108">
<path android:pathData="M31,63.928c0,0 6.4,-11 12.1,-13.1c7.2,-2.6 26,-1.4 26,-1.4l38.1,38.1L107,108.928l-32,-1L31,63.928z">
<aapt:attr name="android:fillColor">
<gradient
android:endX="85.84757"
android:endY="92.4963"
android:startX="42.9492"
android:startY="49.59793"
android:type="linear">
<item
android:color="#44000000"
android:offset="0.0" />
<item
android:color="#00000000"
android:offset="1.0" />
</gradient>
</aapt:attr>
</path>
<path
android:fillColor="#FFFFFF"
android:fillType="nonZero"
android:pathData="M65.3,45.828l3.8,-6.6c0.2,-0.4 0.1,-0.9 -0.3,-1.1c-0.4,-0.2 -0.9,-0.1 -1.1,0.3l-3.9,6.7c-6.3,-2.8 -13.4,-2.8 -19.7,0l-3.9,-6.7c-0.2,-0.4 -0.7,-0.5 -1.1,-0.3C38.8,38.328 38.7,38.828 38.9,39.228l3.8,6.6C36.2,49.428 31.7,56.028 31,63.928h46C76.3,56.028 71.8,49.428 65.3,45.828zM43.4,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2c-0.3,-0.7 -0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C45.3,56.528 44.5,57.328 43.4,57.328L43.4,57.328zM64.6,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2s-0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C66.5,56.528 65.6,57.328 64.6,57.328L64.6,57.328z"
android:strokeWidth="1"
android:strokeColor="#00000000" />
android:viewportWidth="358"
android:viewportHeight="172.80006">
<group android:scaleX="0.46"
android:scaleY="0.22203359"
android:translateX="96.66"
android:translateY="67.216324">
<group android:translateY="141.55205">
<path android:pathData="M6.625,-0L77.1875,-0L77.1875,-21.59375L42.90625,-21.59375C64.078125,-38.453125,74.59375,-54.578125,74.59375,-70.421875C74.59375,-89.140625,59.90625,-101.375,37.296875,-101.375C24.34375,-101.375,12.53125,-97.34375,2.875,-89.421875L9.21875,-71.140625C17.28125,-76.75,25.203125,-79.625,32.40625,-79.625C42.34375,-79.625,48.671875,-74.296875,48.671875,-66.53125C48.671875,-54.140625,32.6875,-39.171875,6.625,-17.5625L6.625,-0Z"
android:fillColor="#8DC7E8"/>
<path android:pathData="M129.21875,1.4375C154.5625,1.4375,171.70312,-19.296875,171.70312,-50.546875C171.70312,-81.078125,154.85938,-101.375,129.9375,-101.375C104.453125,-101.375,87.3125,-80.640625,87.3125,-49.53125C87.3125,-19.015625,104.171875,1.4375,129.21875,1.4375ZM129.79688,-19.875C119.578125,-19.875,112.953125,-32.109375,112.953125,-50.40625C112.953125,-68.25,119.578125,-80.0625,129.375,-80.0625C139.29688,-80.0625,146.07812,-67.828125,146.07812,-49.390625C146.07812,-31.6875,139.45312,-19.875,129.79688,-19.875Z"
android:fillColor="#8DC7E8"/>
<path android:pathData="M224.23438,0.71875L248.57812,0.71875L248.57812,-17.859375L266.14062,-17.859375L266.14062,-38.875L248.57812,-38.875L248.57812,-99.9375L224.95312,-99.9375L178.45312,-30.953125L178.45312,-17.859375L224.23438,-17.859375L224.23438,0.71875ZM224.23438,-39.03125L203.35938,-39.171875L224.23438,-72.140625L224.23438,-39.03125Z"
android:fillColor="#8DC7E8"/>
<path android:pathData="M313.0625,1.4375C337.54688,1.4375,353.67188,-10.9375,353.67188,-29.234375C353.67188,-42.765625,344.59375,-49.25,333.9375,-53.5625C344.45312,-58.75,350.35938,-66.8125,350.35938,-76.171875C350.35938,-91.296875,335.67188,-101.375,314.64062,-101.375C291.60938,-101.375,276.48438,-89.140625,276.48438,-70.984375C276.48438,-59.765625,282.53125,-53.28125,290.45312,-48.8125C279.79688,-44.640625,273.75,-36.578125,273.75,-26.359375C273.75,-9.796875,289.73438,1.4375,313.0625,1.4375ZM308.59375,-41.765625C319.6875,-38.296875,329.48438,-35.421875,329.48438,-27.796875C329.48438,-22.3125,323.85938,-18.4375,314.64062,-18.4375C304.5625,-18.4375,297.9375,-23.328125,297.9375,-30.953125C297.9375,-36.71875,301.6875,-40.46875,308.59375,-41.765625ZM313.64062,-60.484375C306.15625,-63.21875,300.6875,-66.390625,300.6875,-72.28125C300.6875,-77.609375,305.57812,-81.5,313.35938,-81.5C321.125,-81.5,326.17188,-77.609375,326.17188,-71.5625C326.17188,-65.65625,321.125,-61.484375,313.64062,-60.484375Z"
android:fillColor="#8DC7E8"/>
</group>
</group>
</vector>
2 changes: 1 addition & 1 deletion app/src/main/res/layout/fragment_game.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

<variable
name="viewModel"
type="com.example.a2048.viewmodel.GameViewModel" />
type="com.aryan.a2048.viewmodel.GameViewModel" />
</data>

<androidx.constraintlayout.widget.ConstraintLayout
Expand Down
5 changes: 2 additions & 3 deletions app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
<background android:drawable="@drawable/ic_launcher_background" />
<foreground android:drawable="@drawable/ic_launcher_foreground" />
<monochrome android:drawable="@drawable/ic_launcher_foreground" />
<background android:drawable="@color/ic_launcher_background"/>
<foreground android:drawable="@drawable/ic_launcher_foreground"/>
</adaptive-icon>
5 changes: 2 additions & 3 deletions app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
<background android:drawable="@drawable/ic_launcher_background" />
<foreground android:drawable="@drawable/ic_launcher_foreground" />
<monochrome android:drawable="@drawable/ic_launcher_foreground" />
<background android:drawable="@color/ic_launcher_background"/>
<foreground android:drawable="@drawable/ic_launcher_foreground"/>
</adaptive-icon>
Binary file modified app/src/main/res/mipmap-hdpi/ic_launcher.webp
Binary file not shown.
Binary file modified app/src/main/res/mipmap-hdpi/ic_launcher_round.webp
Binary file not shown.
Binary file modified app/src/main/res/mipmap-mdpi/ic_launcher.webp
Binary file not shown.
Binary file modified app/src/main/res/mipmap-mdpi/ic_launcher_round.webp
Binary file not shown.
Binary file modified app/src/main/res/mipmap-xhdpi/ic_launcher.webp
Binary file not shown.
Binary file modified app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp
Binary file not shown.
Binary file modified app/src/main/res/mipmap-xxhdpi/ic_launcher.webp
Binary file not shown.
Binary file modified app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp
Binary file not shown.
Binary file modified app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp
Binary file not shown.
Binary file modified app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp
Binary file not shown.
4 changes: 2 additions & 2 deletions app/src/main/res/navigation/nav_graph.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

<fragment
android:id="@+id/gameFragment"
android:name="com.example.a2048.view.fragment.GameFragment"
android:name="com.aryan.a2048.view.fragment.GameFragment"
android:label="fragment_game"
tools:layout="@layout/fragment_game" >
<action
Expand All @@ -16,6 +16,6 @@
</fragment>
<fragment
android:id="@+id/winningFragment"
android:name="com.example.a2048.view.fragment.WinningFragment"
android:name="com.aryan.a2048.view.fragment.WinningFragment"
android:label="WinningFragment" />
</navigation>
4 changes: 4 additions & 0 deletions app/src/main/res/values/ic_launcher_background.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<color name="ic_launcher_background">#1E89C5</color>
</resources>

0 comments on commit 60eb954

Please sign in to comment.