2
0
mirror of https://github.com/fork-maintainers/iceraven-browser synced 2024-11-09 19:10:42 +00:00

Merge pull request #127 from fork-maintainers/issues/111-change-appid

Change App ID for Iceraven rebranding
This commit is contained in:
interfect 2020-09-17 19:57:56 -07:00 committed by GitHub
commit 0fd2cb2667
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 15 additions and 13 deletions

View File

@ -21,7 +21,7 @@ import static org.gradle.api.tasks.testing.TestResult.ResultType
android { android {
compileSdkVersion Config.compileSdkVersion compileSdkVersion Config.compileSdkVersion
defaultConfig { defaultConfig {
applicationId "network.novak" applicationId "io.github.forkmaintainers"
minSdkVersion Config.minSdkVersion minSdkVersion Config.minSdkVersion
targetSdkVersion Config.targetSdkVersion targetSdkVersion Config.targetSdkVersion
versionCode 1 versionCode 1
@ -109,20 +109,22 @@ android {
forkDebug { forkDebug {
shrinkResources false shrinkResources false
minifyEnabled false minifyEnabled false
applicationIdSuffix ".fenix.debug" applicationIdSuffix ".iceraven.debug"
resValue "bool", "IS_DEBUG", "true" resValue "bool", "IS_DEBUG", "true"
pseudoLocalesEnabled true pseudoLocalesEnabled true
// Need to replicate default debug config features // Need to replicate default debug config features
signingConfig signingConfigs.debug signingConfig signingConfigs.debug
debuggable true debuggable true
def deepLinkSchemeValue = "iceraven-debug"
buildConfigField "String", "DEEP_LINK_SCHEME", "\"$deepLinkSchemeValue\""
// Use custom default allowed addon list // Use custom default allowed addon list
buildConfigField "String", "AMO_ACCOUNT", "\"16201230\"" buildConfigField "String", "AMO_ACCOUNT", "\"16201230\""
buildConfigField "String", "AMO_COLLECTION", "\"What-I-want-on-Fenix\"" buildConfigField "String", "AMO_COLLECTION", "\"What-I-want-on-Fenix\""
} }
forkRelease releaseTemplate >> { forkRelease releaseTemplate >> {
buildConfigField "boolean", "USE_RELEASE_VERSIONING", "true" buildConfigField "boolean", "USE_RELEASE_VERSIONING", "true"
applicationIdSuffix ".iceweasel" applicationIdSuffix ".iceraven"
def deepLinkSchemeValue = "fenix" def deepLinkSchemeValue = "iceraven"
buildConfigField "String", "DEEP_LINK_SCHEME", "\"$deepLinkSchemeValue\"" buildConfigField "String", "DEEP_LINK_SCHEME", "\"$deepLinkSchemeValue\""
manifestPlaceholders = [ manifestPlaceholders = [
"deepLinkScheme": deepLinkSchemeValue "deepLinkScheme": deepLinkSchemeValue

View File

@ -11,7 +11,7 @@
android:shortcutLongLabel="@string/home_screen_shortcut_open_new_tab_2"> android:shortcutLongLabel="@string/home_screen_shortcut_open_new_tab_2">
<intent <intent
android:action="org.mozilla.fenix.OPEN_TAB" android:action="org.mozilla.fenix.OPEN_TAB"
android:targetPackage="network.novak.iceweasel" android:targetPackage="io.github.forkmaintainers.iceraven"
android:targetClass="org.mozilla.fenix.IntentReceiverActivity" /> android:targetClass="org.mozilla.fenix.IntentReceiverActivity" />
</shortcut> </shortcut>
<shortcut <shortcut
@ -22,7 +22,7 @@
android:shortcutLongLabel="@string/home_screen_shortcut_open_new_private_tab_2"> android:shortcutLongLabel="@string/home_screen_shortcut_open_new_private_tab_2">
<intent <intent
android:action="org.mozilla.fenix.OPEN_PRIVATE_TAB" android:action="org.mozilla.fenix.OPEN_PRIVATE_TAB"
android:targetPackage="network.novak.iceweasel" android:targetPackage="io.github.forkmaintainers.iceraven"
android:targetClass="org.mozilla.fenix.IntentReceiverActivity" /> android:targetClass="org.mozilla.fenix.IntentReceiverActivity" />
</shortcut> </shortcut>
</shortcuts> </shortcuts>

View File

@ -4,7 +4,7 @@
@file:Suppress("TooManyFunctions") @file:Suppress("TooManyFunctions")
package network.novak.fenix.components package io.github.forkmaintainers.iceraven.components
import android.content.Context import android.content.Context
import android.util.AtomicFile import android.util.AtomicFile

View File

@ -2,7 +2,7 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this * License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
package network.novak.fenix.components package io.github.forkmaintainers.iceraven.components
import android.annotation.SuppressLint import android.annotation.SuppressLint
import android.app.Dialog import android.app.Dialog

View File

@ -2,7 +2,7 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this * License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
package network.novak.fenix.components package io.github.forkmaintainers.iceraven.components
import android.annotation.SuppressLint import android.annotation.SuppressLint
import android.graphics.Bitmap import android.graphics.Bitmap

View File

@ -34,8 +34,8 @@ import mozilla.components.feature.addons.Addon
import mozilla.components.feature.addons.AddonManagerException import mozilla.components.feature.addons.AddonManagerException
import mozilla.components.feature.addons.ui.PermissionsDialogFragment import mozilla.components.feature.addons.ui.PermissionsDialogFragment
import mozilla.components.feature.addons.ui.translatedName import mozilla.components.feature.addons.ui.translatedName
import network.novak.fenix.components.PagedAddonInstallationDialogFragment import io.github.forkmaintainers.iceraven.components.PagedAddonInstallationDialogFragment
import network.novak.fenix.components.PagedAddonsManagerAdapter import io.github.forkmaintainers.iceraven.components.PagedAddonsManagerAdapter
import org.mozilla.fenix.R import org.mozilla.fenix.R
import org.mozilla.fenix.components.metrics.Event import org.mozilla.fenix.components.metrics.Event
import org.mozilla.fenix.ext.components import org.mozilla.fenix.ext.components

View File

@ -15,7 +15,7 @@ import mozilla.components.feature.addons.update.AddonUpdater
import mozilla.components.feature.addons.update.DefaultAddonUpdater import mozilla.components.feature.addons.update.DefaultAddonUpdater
import mozilla.components.lib.publicsuffixlist.PublicSuffixList import mozilla.components.lib.publicsuffixlist.PublicSuffixList
import mozilla.components.support.migration.state.MigrationStore import mozilla.components.support.migration.state.MigrationStore
import network.novak.fenix.components.PagedAddonCollectionProvider import io.github.forkmaintainers.iceraven.components.PagedAddonCollectionProvider
import org.mozilla.fenix.HomeActivity import org.mozilla.fenix.HomeActivity
import org.mozilla.fenix.components.metrics.AppStartupTelemetry import org.mozilla.fenix.components.metrics.AppStartupTelemetry
import org.mozilla.fenix.ext.settings import org.mozilla.fenix.ext.settings

View File

@ -88,7 +88,7 @@ object SupportUtils {
fun getWhatsNewUrl(context: Context) = if (Config.channel.isFennec) { fun getWhatsNewUrl(context: Context) = if (Config.channel.isFennec) {
getGenericSumoURLForTopic(SumoTopic.UPGRADE_FAQ) getGenericSumoURLForTopic(SumoTopic.UPGRADE_FAQ)
} else if (Config.channel.isFork) { } else if (Config.channel.isFork) {
"https://github.com/fork-maintainers/iceweasel/releases" "https://github.com/fork-maintainers/iceraven-browser/releases"
} else { } else {
getSumoURLForTopic(context, SumoTopic.WHATS_NEW) getSumoURLForTopic(context, SumoTopic.WHATS_NEW)
} }