Dan Ballard pushed to branch tor-browser-148.0a1-16.0-2 at The Tor Project / Applications / Tor Browser

Commits:

21 changed files:

Changes:

  • mobile/android/fenix/app/src/main/java/org/mozilla/fenix/browser/tabstrip/TabStrip.kt
    ... ... @@ -450,7 +450,7 @@ private fun TabStripIcon(
    450 450 
                 )
    451 451 
             } else if (url == ABOUT_HOME_URL) {
    452 452 
                 Favicon(
    453 
    -                imageResource = R.drawable.ic_firefox,
    453 
    +                imageResource = R.drawable.tor_browser_app_icon,
    454 454 
                     size = tabStripIconSize,
    455 455 
                 )
    456 456 
             } else {

  • mobile/android/fenix/app/src/main/java/org/mozilla/fenix/compose/ThumbnailImage.kt
    ... ... @@ -182,7 +182,7 @@ private fun FallbackContent(
    182 182 
                 )
    183 183 
             } else if (tab.content.url == ABOUT_HOME_URL) {
    184 184 
                 Image(
    185 
    -                painter = painterResource(id = R.drawable.ic_firefox),
    185 
    +                painter = painterResource(id = R.drawable.tor_browser_app_icon),
    186 186 
                     contentDescription = null,
    187 187 
                     modifier = Modifier
    188 188 
                         .size(FallbackIconSize)

  • mobile/android/fenix/app/src/main/java/org/mozilla/fenix/iconpicker/AppIconRepository.kt
    ... ... @@ -41,16 +41,6 @@ class DefaultAppIconRepository(
    41 41
    42 42 
         override val groupedAppIcons: Map<IconGroupTitle, List<AppIcon>>
    43 43 
             get() = mapOf(
    44 
    -            IconGroupTitle(R.string.alternative_app_icon_group_featured) to listOf(
    45 
    -                AppIcon.AppRetro2004,
    46 
    -                AppIcon.AppPixelated,
    47 
    -                AppIcon.AppCuddling,
    48 
    -                AppIcon.AppPride,
    49 
    -                AppIcon.AppFlaming,
    50 
    -                AppIcon.AppMinimal,
    51 
    -                AppIcon.AppMomo,
    52 
    -                AppIcon.AppCool,
    53 
    -            ),
    54 44 
                 IconGroupTitle(R.string.alternative_app_icon_group_solid_colors) to listOf(
    55 45 
                     AppIcon.AppDefault,
    56 46 
                     AppIcon.AppSolidLight,

  • mobile/android/fenix/app/src/main/java/org/mozilla/fenix/tabstray/ui/tabitems/TabGridItem.kt
    ... ... @@ -214,7 +214,7 @@ private fun TabContent(
    214 214 
                             )
    215 215 
                         } else if (tab.content.url == ABOUT_HOME_URL) {
    216 216 
                             Image(
    217 
    -                            painter = painterResource(id = R.drawable.ic_firefox),
    217 
    +                            painter = painterResource(id = R.drawable.tor_browser_app_icon),
    218 218 
                                 contentDescription = null,
    219 219 
                                 modifier = Modifier.size(TabHeaderFaviconSize),
    220 220 
                             )

  • mobile/android/fenix/app/src/main/res/mipmap-anydpi/ic_launcher_alternative.xml
    ... ... @@ -4,6 +4,6 @@
    4 4 
        - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
    5 5 
     <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
    6 6 
         <background android:drawable="@color/photonWhite"/>
    7 
    -    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
    7 
    +    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
    8 8 
         <monochrome android:drawable="@mipmap/ic_launcher_monochrome"/>
    9 9 
     </adaptive-icon>

  • mobile/android/fenix/app/src/main/res/mipmap-anydpi/ic_launcher_gradient_blue_hour.xml
    ... ... @@ -6,6 +6,6 @@
    6 6 
         xmlns:tools="http://schemas.android.com/tools"
    7 7 
         tools:ignore="UnusedResources">
    8 8 
         <background android:drawable="@drawable/ic_launcher_gradient_blue_hour_background"/>
    9 
    -    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
    9 
    +    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
    10 10 
         <monochrome android:drawable="@drawable/ic_launcher_monochrome"/>
    11 11 
     </adaptive-icon>

  • mobile/android/fenix/app/src/main/res/mipmap-anydpi/ic_launcher_gradient_golden_hour.xml
    ... ... @@ -6,6 +6,6 @@
    6 6 
         xmlns:tools="http://schemas.android.com/tools"
    7 7 
         tools:ignore="UnusedResources">
    8 8 
         <background android:drawable="@drawable/ic_launcher_gradient_golden_hour_background"/>
    9 
    -    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
    9 
    +    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
    10 10 
         <monochrome android:drawable="@drawable/ic_launcher_monochrome"/>
    11 11 
     </adaptive-icon>

  • mobile/android/fenix/app/src/main/res/mipmap-anydpi/ic_launcher_gradient_midnight.xml
    ... ... @@ -6,6 +6,6 @@
    6 6 
         xmlns:tools="http://schemas.android.com/tools"
    7 7 
         tools:ignore="UnusedResources">
    8 8 
         <background android:drawable="@drawable/ic_launcher_gradient_midnight_background"/>
    9 
    -    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
    9 
    +    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
    10 10 
         <monochrome android:drawable="@drawable/ic_launcher_monochrome"/>
    11 11 
     </adaptive-icon>

  • mobile/android/fenix/app/src/main/res/mipmap-anydpi/ic_launcher_gradient_northern_lights.xml
    ... ... @@ -6,6 +6,6 @@
    6 6 
         xmlns:tools="http://schemas.android.com/tools"
    7 7 
         tools:ignore="UnusedResources">
    8 8 
         <background android:drawable="@drawable/ic_launcher_gradient_northern_lights_background"/>
    9 
    -    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
    9 
    +    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
    10 10 
         <monochrome android:drawable="@drawable/ic_launcher_monochrome"/>
    11 11 
     </adaptive-icon>

  • mobile/android/fenix/app/src/main/res/mipmap-anydpi/ic_launcher_gradient_sunrise.xml
    ... ... @@ -6,6 +6,6 @@
    6 6 
         xmlns:tools="http://schemas.android.com/tools"
    7 7 
         tools:ignore="UnusedResources">
    8 8 
         <background android:drawable="@drawable/ic_launcher_gradient_sunrise_background"/>
    9 
    -    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
    9 
    +    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
    10 10 
         <monochrome android:drawable="@drawable/ic_launcher_monochrome"/>
    11 11 
     </adaptive-icon>

  • mobile/android/fenix/app/src/main/res/mipmap-anydpi/ic_launcher_gradient_sunset.xml
    ... ... @@ -6,6 +6,6 @@
    6 6 
         xmlns:tools="http://schemas.android.com/tools"
    7 7 
         tools:ignore="UnusedResources">
    8 8 
         <background android:drawable="@drawable/ic_launcher_gradient_sunset_background"/>
    9 
    -    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
    9 
    +    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
    10 10 
         <monochrome android:drawable="@drawable/ic_launcher_monochrome"/>
    11 11 
     </adaptive-icon>

  • mobile/android/fenix/app/src/main/res/mipmap-anydpi/ic_launcher_gradient_twilight.xml
    ... ... @@ -6,6 +6,6 @@
    6 6 
         xmlns:tools="http://schemas.android.com/tools"
    7 7 
         tools:ignore="UnusedResources">
    8 8 
         <background android:drawable="@drawable/ic_launcher_gradient_twilight_background"/>
    9 
    -    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
    9 
    +    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
    10 10 
         <monochrome android:drawable="@drawable/ic_launcher_monochrome"/>
    11 11 
     </adaptive-icon>

  • mobile/android/fenix/app/src/main/res/mipmap-anydpi/ic_launcher_round_alternative.xml
    ... ... @@ -4,6 +4,6 @@
    4 4 
        - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
    5 5 
     <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
    6 6 
         <background android:drawable="@color/photonWhite"/>
    7 
    -    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
    7 
    +    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
    8 8 
         <monochrome android:drawable="@mipmap/ic_launcher_monochrome"/>
    9 9 
     </adaptive-icon>

  • mobile/android/fenix/app/src/main/res/mipmap-anydpi/ic_launcher_solid_blue.xml
    ... ... @@ -6,6 +6,6 @@
    6 6 
         xmlns:tools="http://schemas.android.com/tools"
    7 7 
         tools:ignore="UnusedResources">
    8 8 
         <background android:drawable="@drawable/ic_launcher_solid_blue_background"/>
    9 
    -    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
    9 
    +    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
    10 10 
         <monochrome android:drawable="@drawable/ic_launcher_monochrome"/>
    11 11 
     </adaptive-icon>

  • mobile/android/fenix/app/src/main/res/mipmap-anydpi/ic_launcher_solid_dark.xml
    ... ... @@ -6,6 +6,6 @@
    6 6 
         xmlns:tools="http://schemas.android.com/tools"
    7 7 
         tools:ignore="UnusedResources">
    8 8 
         <background android:drawable="@color/photonBlack"/>
    9 
    -    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
    9 
    +    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
    10 10 
         <monochrome android:drawable="@drawable/ic_launcher_monochrome"/>
    11 11 
     </adaptive-icon>

  • mobile/android/fenix/app/src/main/res/mipmap-anydpi/ic_launcher_solid_green.xml
    ... ... @@ -6,6 +6,6 @@
    6 6 
         xmlns:tools="http://schemas.android.com/tools"
    7 7 
         tools:ignore="UnusedResources">
    8 8 
         <background android:drawable="@drawable/ic_launcher_solid_green_background"/>
    9 
    -    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
    9 
    +    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
    10 10 
         <monochrome android:drawable="@drawable/ic_launcher_monochrome"/>
    11 11 
     </adaptive-icon>

  • mobile/android/fenix/app/src/main/res/mipmap-anydpi/ic_launcher_solid_light.xml
    ... ... @@ -6,6 +6,6 @@
    6 6 
         xmlns:tools="http://schemas.android.com/tools"
    7 7 
         tools:ignore="UnusedResources">
    8 8 
         <background android:drawable="@color/photonWhite"/>
    9 
    -    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
    9 
    +    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
    10 10 
         <monochrome android:drawable="@drawable/ic_launcher_monochrome"/>
    11 11 
     </adaptive-icon>

  • mobile/android/fenix/app/src/main/res/mipmap-anydpi/ic_launcher_solid_purple.xml
    ... ... @@ -6,6 +6,6 @@
    6 6 
         xmlns:tools="http://schemas.android.com/tools"
    7 7 
         tools:ignore="UnusedResources">
    8 8 
         <background android:drawable="@drawable/ic_launcher_solid_purple_background"/>
    9 
    -    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
    9 
    +    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
    10 10 
         <monochrome android:drawable="@drawable/ic_launcher_monochrome"/>
    11 11 
     </adaptive-icon>

  • mobile/android/fenix/app/src/main/res/mipmap-anydpi/ic_launcher_solid_purple_dark.xml
    ... ... @@ -6,6 +6,6 @@
    6 6 
         xmlns:tools="http://schemas.android.com/tools"
    7 7 
         tools:ignore="UnusedResources">
    8 8 
         <background android:drawable="@drawable/ic_launcher_solid_purple_dark_background"/>
    9 
    -    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
    9 
    +    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
    10 10 
         <monochrome android:drawable="@drawable/ic_launcher_monochrome"/>
    11 11 
     </adaptive-icon>

  • mobile/android/fenix/app/src/main/res/mipmap-anydpi/ic_launcher_solid_red.xml
    ... ... @@ -6,6 +6,6 @@
    6 6 
         xmlns:tools="http://schemas.android.com/tools"
    7 7 
         tools:ignore="UnusedResources">
    8 8 
         <background android:drawable="@drawable/ic_launcher_solid_red_background"/>
    9 
    -    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
    9 
    +    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
    10 10 
         <monochrome android:drawable="@drawable/ic_launcher_monochrome"/>
    11 11 
     </adaptive-icon>

  • mobile/android/fenix/app/src/main/res/values/styles.xml
    ... ... @@ -4,8 +4,8 @@
    4 4 
        - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
    5 5 
     <resources xmlns:tools="http://schemas.android.com/tools">
    6 6 
         <style name="SplashScreenThemeBase" parent="Theme.SplashScreen">
    7 
    -        <item name="windowSplashScreenAnimatedIcon">@drawable/ic_launcher_foreground</item>
    8 
    -        <item name="windowSplashScreenBackground">@color/fx_mobile_splashscreen_background</item>
    7 
    +        <item name="windowSplashScreenAnimatedIcon">@mipmap/ic_launcher_foreground</item>
    8 
    +        <item name="windowSplashScreenBackground">@color/tor_homepage_gradient_end</item>
    9 9 
             <item name="postSplashScreenTheme">@style/NormalTheme</item>
    10 10 
             <item name="windowSplashScreenAnimationDuration">12000</item>
    11 11 
             <item name="android:windowLayoutInDisplayCutoutMode" tools:targetApi="27">default</item>

    • —
    View it on GitLab.
    You're receiving this email because of your account on gitlab.torproject.org. Manage all notifications · Help Notification message regarding https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/7f1abaee35e8398a9811d59982a4db2873565cea at 1773103295