Merge branch '1067-update_versions' into 'main' (d8136380) · Commits · e / os / App Lounge

app/build.gradle

+18 −17

Original line number	Diff line number	Diff line
		@@ -5,7 +5,7 @@ plugins {
		id 'kotlin-kapt'
		id 'org.jlleitschuh.gradle.ktlint' version '10.2.0'
		id 'androidx.navigation.safeargs.kotlin'
		id 'dagger.hilt.android.plugin'
		id 'com.google.dagger.hilt.android'
		id 'kotlin-allopen'
		}

		@@ -42,7 +42,7 @@ def getSentryDsn = { ->
		}

		android {
		compileSdk 31
		compileSdk 33

		defaultConfig {
		applicationId "foundation.e.apps"
		@@ -152,8 +152,9 @@ dependencies {
		implementation 'foundation.e.lib:telemetry:0.0.4-alpha'

		implementation 'foundation.e:gplayapi:3.0.1'
		implementation 'androidx.core:core-ktx:1.7.0'
		implementation 'androidx.appcompat:appcompat:1.4.1'
		implementation 'androidx.core:core-ktx:1.9.0'
		implementation 'androidx.appcompat:appcompat:1.6.1'
		implementation 'androidx.fragment:fragment-ktx:1.5.6'
		implementation 'com.google.android.material:material:1.5.0'
		implementation 'androidx.constraintlayout:constraintlayout:2.1.3'
		implementation 'androidx.legacy:legacy-support-v4:1.0.0'
		@@ -164,16 +165,16 @@ dependencies {
		debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.7'
		testImplementation "com.google.truth:truth:1.1.3"
		testImplementation 'junit:junit:4.13.2'
		androidTestImplementation 'androidx.test.ext:junit:1.1.3'
		androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
		androidTestImplementation 'androidx.test.ext:junit:1.1.5'
		androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
		// Optional -- Robolectric environment
		testImplementation "androidx.test:core:1.4.0"
		testImplementation "androidx.test:core:1.5.0"
		// Optional -- Mockito framework
		testImplementation "org.mockito:mockito-core:4.6.1"
		testImplementation "org.mockito:mockito-core:5.0.0"
		// Optional -- mockito-kotlin
		testImplementation "org.mockito.kotlin:mockito-kotlin:3.2.0"
		testImplementation 'org.mockito:mockito-inline:2.13.0'
		testImplementation "androidx.arch.core:core-testing:2.1.0"
		testImplementation "org.mockito.kotlin:mockito-kotlin:4.1.0"
		testImplementation 'org.mockito:mockito-inline:5.0.0'
		testImplementation "androidx.arch.core:core-testing:2.2.0"

		testImplementation "io.mockk:mockk:1.12.3"

		@@ -182,8 +183,8 @@ dependencies {
		implementation 'com.github.Baseflow:PhotoView:2.3.0'

		//Protobuf and Gson
		implementation 'com.google.code.gson:gson:2.8.9'
		implementation "com.google.protobuf:protobuf-java:3.14.0"
		implementation 'com.google.code.gson:gson:2.9.0'
		implementation "com.google.protobuf:protobuf-java:3.17.2"

		// ViewPager2 and RecyclerView
		implementation "androidx.viewpager2:viewpager2:1.0.0"
		@@ -211,19 +212,19 @@ dependencies {
		implementation "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.11.2"

		// Navigation Components
		def navigation_version = "2.3.5"
		def navigation_version = "2.5.3"
		implementation "androidx.navigation:navigation-fragment-ktx:$navigation_version"
		implementation "androidx.navigation:navigation-ui-ktx:$navigation_version"

		// Hilt
		def hilt_version = '2.40.5'
		kapt "com.google.dagger:hilt-compiler:$hilt_version"
		implementation "com.google.dagger:hilt-android:$hilt_version"
		kapt "com.google.dagger:hilt-compiler:2.44.2"
		implementation "com.google.dagger:hilt-android:2.44.2"
		implementation 'androidx.hilt:hilt-work:1.0.0'
		kapt 'androidx.hilt:hilt-compiler:1.0.0'

		// Lifecycle Components
		def lifecycle_version = "2.4.0"
		def lifecycle_version = "2.6.1"
		implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version"
		implementation "androidx.lifecycle:lifecycle-livedata-ktx:$lifecycle_version"
		implementation "android.arch.lifecycle:extensions:1.1.1"

app/src/main/java/foundation/e/apps/api/DownloadManager.kt

+1 −1

Original line number	Diff line number	Diff line
		@@ -111,7 +111,7 @@ class DownloadManager @Inject constructor(
		return downloadId
		}

		private fun checkDownloadProgress(
		fun checkDownloadProgress(
		downloadId: Long,
		filePath: String = "",
		downloadCompleted: ((Boolean, String) -> Unit)?

app/src/main/java/foundation/e/apps/application/ApplicationFragment.kt

+1 −1

Original line number	Diff line number	Diff line
		@@ -386,7 +386,7 @@ class ApplicationFragment : TimeoutFragment(R.layout.fragment_application) {
		}

		private fun setupToolbar(view: View) {
		val startDestination = findNavController().graph.startDestination
		val startDestination = findNavController().graph.startDestinationId
		if (startDestination == R.id.applicationFragment) {
		binding.toolbar.setNavigationOnClickListener {
		val action = ApplicationFragmentDirections.actionApplicationFragmentToHomeFragment()

app/src/main/java/foundation/e/apps/applicationlist/ApplicationListRVAdapter.kt

+7 −4

Original line number	Diff line number	Diff line
		@@ -219,16 +219,17 @@ class ApplicationListRVAdapter(
		val action = when (currentDestinationId) {
		R.id.applicationListFragment -> {
		ApplicationListFragmentDirections.actionApplicationListFragmentToApplicationFragment(
		searchApp._id,
		searchApp.package_name,
		searchApp._id,
		searchApp.origin,
		catText,
		searchApp.isGplayReplaced
		)
		}
		R.id.searchFragment -> {
		SearchFragmentDirections.actionSearchFragmentToApplicationFragment(
		searchApp._id,
		searchApp.package_name,
		searchApp._id,
		searchApp.origin,
		catText,
		searchApp.isGplayReplaced
		@@ -236,10 +237,11 @@ class ApplicationListRVAdapter(
		}
		R.id.updatesFragment -> {
		UpdatesFragmentDirections.actionUpdatesFragmentToApplicationFragment(
		searchApp._id,
		searchApp.package_name,
		searchApp._id,
		searchApp.origin,
		catText,
		searchApp.isGplayReplaced
		)
		}
		else -> null
		@@ -479,7 +481,8 @@ class ApplicationListRVAdapter(
		searchApp.isFree -> {
		materialButton.enableInstallButton()
		materialButton.text = materialButton.context.getString(R.string.install)
		materialButton.strokeColor = ContextCompat.getColorStateList(holder.itemView.context, R.color.light_grey)
		materialButton.strokeColor =
		ContextCompat.getColorStateList(holder.itemView.context, R.color.light_grey)
		applicationListItemBinding.progressBarInstall.visibility = View.GONE
		}
		else -> {

app/src/main/java/foundation/e/apps/home/model/HomeChildRVAdapter.kt

+8 −3

Original line number	Diff line number	Diff line
		@@ -93,10 +93,11 @@ class HomeChildRVAdapter(
		appName.text = homeApp.name
		homeLayout.setOnClickListener {
		val action = HomeFragmentDirections.actionHomeFragmentToApplicationFragment(
		homeApp._id,
		homeApp.package_name,
		homeApp._id,
		homeApp.origin,
		homeApp.category
		homeApp.category,
		homeApp.isGplayReplaced
		)
		holder.itemView.findNavController().navigate(action)
		}
		@@ -236,7 +237,11 @@ class HomeChildRVAdapter(
		if (homeApp.is_pwa) {
		mainActivityViewModel.launchPwa(homeApp)
		} else {
		context.startActivity(mainActivityViewModel.getLaunchIntentForPackageName(homeApp.package_name))
		context.startActivity(
		mainActivityViewModel.getLaunchIntentForPackageName(
		homeApp.package_name
		)
		)
		}
		}
		}