From ec71f54cd1c88e031a9bcbeb528ce2d5cc2f3477 Mon Sep 17 00:00:00 2001 From: harvey186 Date: Fri, 11 Oct 2024 15:32:38 +0200 Subject: [PATCH] 0001-build_gradle --- app/build.gradle | 18 +++++++++--------- .../fenix/addons/AddonsManagementFragment.kt | 8 ++++---- .../org/mozilla/fenix/home/HomeFragment.kt | 2 +- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 86f4526518..56279236db 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -57,7 +57,7 @@ android { } defaultConfig { - applicationId "io.github.forkmaintainers" + applicationId "com.leos" minSdkVersion config.minSdkVersion compileSdk config.compileSdkVersion targetSdkVersion config.targetSdkVersion @@ -210,11 +210,11 @@ android { } forkRelease releaseTemplate >> { buildConfigField "boolean", "USE_RELEASE_VERSIONING", "true" - applicationIdSuffix ".iceraven" - def deepLinkSchemeValue = "iceraven" + applicationIdSuffix ".leosium" + def deepLinkSchemeValue = "leosium" buildConfigField "String", "DEEP_LINK_SCHEME", "\"$deepLinkSchemeValue\"" manifestPlaceholders.putAll([ - "sharedUserId": "io.github.forkmaintainers.iceraven.sharedID", + "sharedUserId": "io.github.forkmaintainers.leosium.sharedID", "deepLinkScheme": deepLinkSchemeValue, ]) // Use custom default allowed addon list @@ -365,10 +365,10 @@ android.applicationVariants.configureEach { variant -> // same version code. Therefore we need to have different version codes for our ARM and x86 // builds. - def versionName = variant.buildType.name == 'nightly' ? - "${Config.nightlyVersionName(project)}" : - "${Config.releaseVersionName(project)}" - println("versionName override: $versionName") +// def versionName = variant.buildType.name == 'nightly' ? +// "${Config.nightlyVersionName(project)}" : +// "${Config.releaseVersionName(project)}" +// println("versionName override: $versionName") variant.outputs.each { output -> def isMozillaOnline = project.hasProperty("mozillaOnline") || gradle.hasProperty("localProperties.mozillaOnline") @@ -976,4 +976,4 @@ def getSupportedLocales() { } // Enable expiration by major version. -ext.gleanExpireByVersion = Config.majorVersion(project) +ext.gleanExpireByVersion = 29 diff --git a/app/src/main/java/org/mozilla/fenix/addons/AddonsManagementFragment.kt b/app/src/main/java/org/mozilla/fenix/addons/AddonsManagementFragment.kt index 9c8bf3f0a2..3ea336b6e7 100644 --- a/app/src/main/java/org/mozilla/fenix/addons/AddonsManagementFragment.kt +++ b/app/src/main/java/org/mozilla/fenix/addons/AddonsManagementFragment.kt @@ -144,10 +144,10 @@ class AddonsManagementFragment : Fragment(R.layout.fragment_add_ons_management) showAlertDialog() true } - R.id.addons_sideload -> { - installFromFile() - true - } + // R.id.addons_sideload -> { + // installFromFile() + // true + // } R.id.search -> { true } diff --git a/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt b/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt index 8a955649a1..15dbd7174c 100644 --- a/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt +++ b/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt @@ -953,7 +953,7 @@ class HomeFragment : Fragment() { } }, ), - showTopRecentSites = settings.showTopRecentSites, +// showTopRecentSites = settings.showTopRecentSites, ) } -- 2.34.1