Skip to content

Commit

Permalink
Code edits and upgrade API level
Browse files Browse the repository at this point in the history
  • Loading branch information
nisaefendioglu committed Jul 10, 2024
1 parent 91af997 commit 344d291
Show file tree
Hide file tree
Showing 7 changed files with 42 additions and 23 deletions.
10 changes: 10 additions & 0 deletions .idea/deploymentTargetSelector.xml

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

5 changes: 2 additions & 3 deletions .idea/gradle.xml

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

10 changes: 10 additions & 0 deletions .idea/migrations.xml

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

26 changes: 13 additions & 13 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ android {
defaultConfig {
applicationId "com.nisaefendioglu.recentearthquakes"
minSdk 21
targetSdk 33
versionCode 5
versionName "1.4"
targetSdk 34
versionCode 6
versionName "1.5"

testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}
Expand All @@ -39,16 +39,16 @@ android {
}

dependencies {
implementation 'androidx.core:core-ktx:1.10.1'
implementation 'androidx.appcompat:appcompat:1.6.1'
implementation 'com.google.android.material:material:1.9.0'
implementation 'androidx.core:core-ktx:1.13.1'
implementation 'androidx.appcompat:appcompat:1.7.0'
implementation 'com.google.android.material:material:1.12.0'
implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
testImplementation 'junit:junit:4.13.2'
androidTestImplementation 'androidx.test.ext:junit:1.1.5'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
androidTestImplementation 'androidx.test.ext:junit:1.2.1'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.6.1'

implementation 'androidx.activity:activity-ktx:1.7.2'
implementation 'androidx.fragment:fragment-ktx:1.6.1'
implementation 'androidx.activity:activity-ktx:1.9.0'
implementation 'androidx.fragment:fragment-ktx:1.8.1'

//retrofit2
implementation "com.squareup.retrofit2:retrofit:2.9.0"
Expand All @@ -58,13 +58,13 @@ dependencies {

//navigation

def nav_version = "2.7.0"
def nav_version = "2.7.7"

implementation "androidx.navigation:navigation-fragment-ktx:$nav_version"
implementation "androidx.navigation:navigation-ui-ktx:$nav_version"

implementation 'com.google.android.gms:play-services-maps:18.1.0'
implementation 'com.google.android.gms:play-services-ads:22.2.0'
implementation 'com.google.android.gms:play-services-maps:19.0.0'
implementation 'com.google.android.gms:play-services-ads:23.2.0'


}
2 changes: 1 addition & 1 deletion app/src/main/res/layout/maps.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
android:layout_height="match_parent">

<com.nisaefendioglu.recentearthquakes.view.CustomeZoom
android:id="@+id/imageView5"
android:id="@+id/imgMaps"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:srcCompat="@drawable/deprembolgeleri"
Expand Down
10 changes: 5 additions & 5 deletions app/src/main/res/layout/rec_item.xml
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
tools:text="Saat : 20:30:22" />

<ImageView
android:id="@+id/imageView"
android:id="@+id/imgLocation"
android:layout_width="15dp"
android:layout_height="15dp"
android:layout_marginTop="15dp"
Expand All @@ -74,25 +74,25 @@
app:srcCompat="@drawable/placeholder" />

<ImageView
android:id="@+id/imageView2"
android:id="@+id/imgPool"
android:layout_width="15dp"
android:layout_height="15dp"
android:layout_marginTop="20dp"
app:layout_constraintEnd_toStartOf="@+id/tvDepth"
app:layout_constraintHorizontal_bias="0.529"
app:layout_constraintStart_toEndOf="@+id/tvMag"
app:layout_constraintTop_toTopOf="@+id/imageView"
app:layout_constraintTop_toTopOf="@+id/imgLocation"
app:srcCompat="@drawable/pool" />

<ImageView
android:id="@+id/imageView3"
android:id="@+id/imgSchedule"
android:layout_width="15dp"
android:layout_height="15dp"
android:layout_marginStart="9dp"
android:layout_marginTop="8dp"
app:layout_constraintEnd_toStartOf="@+id/tvHour"
app:layout_constraintHorizontal_bias="0.0"
app:layout_constraintStart_toEndOf="@+id/tvMag"
app:layout_constraintTop_toBottomOf="@+id/imageView2"
app:layout_constraintTop_toBottomOf="@+id/imgPool"
app:srcCompat="@drawable/schedule" />
</androidx.constraintlayout.widget.ConstraintLayout>
2 changes: 1 addition & 1 deletion app/src/main/res/layout/splash_screen.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
android:gravity="center">

<ImageView
android:id="@+id/imageView4"
android:id="@+id/imgAppLogo"
android:layout_width="200dp"
android:layout_height="200dp"
app:srcCompat="@drawable/iconimg"
Expand Down

0 comments on commit 344d291

Please sign in to comment.