Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@ plugins {

android {
namespace = "app.opass.ccip"
compileSdk = 35
compileSdk = 36

defaultConfig {
applicationId = "app.opass.ccip"
minSdk = 24
targetSdk = 35
targetSdk = 36
versionCode = 57
versionName = "3.7.0"

Expand Down Expand Up @@ -68,6 +68,7 @@ dependencies {
implementation(libs.androidx.livedata)
implementation(libs.androidx.recyclerview)
implementation(libs.androidx.viewpager2)
implementation(libs.androidx.swiperefreshlayout)

// Google
implementation(libs.google.material)
Expand All @@ -76,7 +77,8 @@ dependencies {
implementation(libs.google.firebase.analytics)

// Coil
implementation(libs.coil)
implementation(libs.coil.core)
implementation(libs.coil.network)

// Coroutines
implementation(libs.kotlinx.coroutines.core)
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/app/opass/ccip/ui/DrawerMenuAdapter.kt
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import app.opass.ccip.model.FeatureType
import app.opass.ccip.ui.DrawerMenuViewHolder.DividerViewHolder
import app.opass.ccip.ui.DrawerMenuViewHolder.MenuItemViewHolder
import app.opass.ccip.ui.DrawerMenuViewHolder.PlaceholderItemViewHolder
import coil.load
import coil3.load

class DrawerMenuAdapter(
private val context: Context,
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/app/opass/ccip/ui/MainActivity.kt
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ import app.opass.ccip.ui.schedule.ScheduleTabFragment
import app.opass.ccip.ui.wifi.WiFiNetworkFragment
import app.opass.ccip.util.CryptoUtil
import app.opass.ccip.util.PreferenceUtil
import coil.load
import coil3.load
import com.google.android.material.navigation.NavigationView
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.Dispatchers
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import app.opass.ccip.databinding.IncludeAuthHeaderBinding
import app.opass.ccip.extension.isInverted
import app.opass.ccip.ui.event.EventActivity
import app.opass.ccip.util.PreferenceUtil
import coil.load
import coil3.load

class MethodSelectionFragment : AuthActivity.PageFragment() {
private val mActivity: AuthActivity by lazy { requireActivity() as AuthActivity }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import app.opass.ccip.extension.getFastPassUrl
import app.opass.ccip.extension.isInverted
import app.opass.ccip.network.CCIPClient
import app.opass.ccip.util.PreferenceUtil
import coil.load
import coil3.load
import com.google.android.material.dialog.MaterialAlertDialogBuilder
import com.onesignal.OneSignal
import kotlinx.coroutines.GlobalScope
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import app.opass.ccip.extension.focusAndShowKeyboard
import app.opass.ccip.extension.isInverted
import app.opass.ccip.ui.event.EventActivity
import app.opass.ccip.util.PreferenceUtil
import coil.load
import coil3.load

class TokenEntryFragment : AuthActivity.PageFragment() {
private val mActivity: AuthActivity by lazy { requireActivity() as AuthActivity }
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/app/opass/ccip/ui/event/EventAdapter.kt
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import app.opass.ccip.model.Event
import app.opass.ccip.network.PortalClient
import app.opass.ccip.ui.MainActivity
import app.opass.ccip.util.PreferenceUtil
import coil.load
import coil3.load
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.launch
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import android.widget.ImageView
import androidx.fragment.app.Fragment
import app.opass.ccip.R
import app.opass.ccip.model.Speaker
import coil.load
import coil3.load

class SpeakerFragment : Fragment() {
companion object {
Expand Down
33 changes: 18 additions & 15 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,25 +1,26 @@
[versions]
androidGradlePlugin = "8.8.2"
appcompat = "1.7.0"
androidGradlePlugin = "8.11.0"
appcompat = "1.7.1"
cardview = "1.0.0"
coil = "2.6.0"
coil = "3.2.0"
constraintlayout = "2.2.1"
converterGson = "2.9.0"
core = "1.15.0"
coroutinesVersion = "1.8.1"
firebaseAnalytics = "22.3.0"
converterGson = "3.0.0"
core = "1.16.0"
coroutinesVersion = "1.10.2"
firebaseAnalytics = "22.5.0"
flexbox = "3.0.0"
fragment = "1.8.6"
gson = "2.10.1"
kotlin = "2.0.0"
lifecycleVersion = "2.8.7"
fragment = "1.8.8"
gson = "2.13.1"
kotlin = "2.2.0"
lifecycleVersion = "2.9.1"
markwonVersion = "4.6.2"
material = "1.12.0"
okhttp = "4.12.0"
onesignal = "5.1.17"
playServices = "4.4.2"
onesignal = "5.1.34"
playServices = "4.4.3"
recyclerview = "1.4.0"
retrofit = "2.11.0"
retrofit = "3.0.0"
swiperefreshlayout = "1.1.0"
viewpager2 = "1.1.0"
zxingAndroidEmbedded = "4.3.0"

Expand All @@ -33,7 +34,9 @@ androidx-livedata = { module = "androidx.lifecycle:lifecycle-livedata-ktx", vers
androidx-viewmodel = { module = "androidx.lifecycle:lifecycle-viewmodel-ktx", version.ref = "lifecycleVersion" }
androidx-recyclerview = { module = "androidx.recyclerview:recyclerview", version.ref = "recyclerview" }
androidx-viewpager2 = { module = "androidx.viewpager2:viewpager2", version.ref = "viewpager2" }
coil = { module = "io.coil-kt:coil", version.ref = "coil" }
androidx-swiperefreshlayout = { module = "androidx.swiperefreshlayout:swiperefreshlayout", version.ref = "swiperefreshlayout" }
coil-core = { module = "io.coil-kt.coil3:coil", version.ref = "coil" }
coil-network = { module = "io.coil-kt.coil3:coil-network-okhttp", version.ref = "coil" }
google-flexbox = { module = "com.google.android.flexbox:flexbox", version.ref = "flexbox" }
google-firebase-analytics = { module = "com.google.firebase:firebase-analytics-ktx", version.ref = "firebaseAnalytics" }
google-gson = { module = "com.google.code.gson:gson", version.ref = "gson" }
Expand Down
6 changes: 3 additions & 3 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
#Wed Jan 24 16:49:30 IST 2024
#Mon Jun 30 16:20:54 CST 2025
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionSha256Sum=31c55713e40233a8303827ceb42ca48a47267a0ad4bab9177123121e71524c26
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
distributionSha256Sum=7197a12f450794931532469d4ff21a59ea2c1cd59a3ec3f89c035c3c420a6999
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.2-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down