Skip to content

Commit

Permalink
Merge pull request #7 from AlinaStepanova/dev
Browse files Browse the repository at this point in the history
Update master with latest fixes
  • Loading branch information
AlinaStepanova authored Jun 27, 2024
2 parents 13b9f62 + 6b46405 commit 3d5fccf
Show file tree
Hide file tree
Showing 21 changed files with 330 additions and 403 deletions.
18 changes: 18 additions & 0 deletions .idea/deploymentTargetSelector.xml

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

2 changes: 1 addition & 1 deletion .idea/kotlinc.xml

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

263 changes: 263 additions & 0 deletions .idea/other.xml

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

27 changes: 13 additions & 14 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,11 @@ keystoreProperties.load(new FileInputStream(keystorePropertiesFile))

android {
compileSdk 34
buildToolsVersion = '30.0.3'
defaultConfig {
applicationId "com.avs.sea.battle"
minSdkVersion 19
minSdkVersion 21
targetSdkVersion 34
versionCode 11
versionCode 13
versionName "1.0.$versionCode"
vectorDrawables.useSupportLibrary = true
resourceConfigurations += ['en', 'uk', 'ru']
Expand Down Expand Up @@ -55,23 +54,23 @@ android {
dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
implementation 'androidx.appcompat:appcompat:1.6.1'
implementation 'androidx.core:core-ktx:1.12.0'
implementation 'androidx.appcompat:appcompat:1.7.0'
implementation 'androidx.core:core-ktx:1.13.1'
implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
implementation 'com.google.android.material:material:1.11.0'
implementation 'com.google.android.material:material:1.12.0'

testImplementation 'junit:junit:4.13.2'
androidTestImplementation 'androidx.test.ext:junit:1.1.5'
androidTestImplementation 'androidx.test.ext:junit:1.2.1'
testImplementation "org.mockito:mockito-core:3.3.0"
androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.6.1'

implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4'
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4"
implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.2"
implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3'
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3"
implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.2"

kapt "com.android.databinding:compiler:3.1.4"
implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'
androidTestImplementation 'androidx.test:rules:1.5.0'
implementation 'com.google.android.play:core:1.10.3'
implementation 'com.google.android.play:core-ktx:1.8.1'
androidTestImplementation 'androidx.test:rules:1.6.1'
implementation 'com.google.android.play:review:2.0.1'
implementation 'com.google.android.play:review-ktx:2.0.1'
}
Binary file modified app/release/app-release.aab
Binary file not shown.
8 changes: 4 additions & 4 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,14 @@

<application
android:allowBackup="true"
android:icon="@mipmap/ic_launcher"
android:appCategory="game"
android:icon="@mipmap/ic_launcher"
android:label="@string/app_name"
android:roundIcon="@mipmap/ic_launcher_round"
android:supportsRtl="true"
android:theme="@style/AppTheme">
<activity android:name="com.avs.sea.battle.main.MainActivity"
<activity
android:name="com.avs.sea.battle.main.MainActivity"
android:exported="true">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
Expand All @@ -21,8 +22,7 @@
</activity>
<activity
android:name="com.avs.sea.battle.privacy_policy.PrivacyPolicyActivity"
android:parentActivityName="com.avs.sea.battle.main.MainActivity"
android:screenOrientation="fullSensor" />
android:parentActivityName="com.avs.sea.battle.main.MainActivity" />
</application>

</manifest>
2 changes: 1 addition & 1 deletion app/src/main/java/com/avs/sea/battle/Constants.kt
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@ const val SHARE_INTENT_TYPE = "text/plain"
const val DEV_NAME = "Alina Stepanova"
const val PRIVACY_POLICY_URL = "https://alinastepanova.github.io/SeaBattle/"
const val PLAY_MARKET_URL = "https://play.google.com/store/apps/details?id=$NAMESPACE"
val RECIPIENTS = arrayOf("[email protected]")
const val RECIPIENTS = "[email protected]"
Loading

0 comments on commit 3d5fccf

Please sign in to comment.