Matthew Finkel pushed to branch tor-browser-87.0.0b2-10.5-1 at The Tor Project / Applications / fenix

Commits:

11 changed files:

Changes:

  • app/src/main/java/org/mozilla/fenix/home/sessioncontrol/SessionControlAdapter.kt
    ... ... @@ -23,7 +23,6 @@ import org.mozilla.fenix.home.sessioncontrol.viewholders.CollectionViewHolder
    23 23 
     import org.mozilla.fenix.home.sessioncontrol.viewholders.NoCollectionsMessageViewHolder
    24 24 
     import org.mozilla.fenix.home.sessioncontrol.viewholders.PrivateBrowsingDescriptionViewHolder
    25 25 
     import org.mozilla.fenix.home.sessioncontrol.viewholders.TorBootstrapPagerViewHolder
    26 
    -import org.mozilla.fenix.home.sessioncontrol.viewholders.TorFeedbackSurveyViewHolder
    27 26 
     import org.mozilla.fenix.home.sessioncontrol.viewholders.TabInCollectionViewHolder
    28 27 
     import org.mozilla.fenix.home.sessioncontrol.viewholders.TopSitePagerViewHolder
    29 28 
     import org.mozilla.fenix.home.sessioncontrol.viewholders.onboarding.OnboardingAutomaticSignInViewHolder
    ... ... @@ -81,7 +80,6 @@ sealed class AdapterItem(@LayoutRes val viewType: Int) {
    81 80 
         }
    82 81
    83 82 
         object PrivateBrowsingDescription : AdapterItem(PrivateBrowsingDescriptionViewHolder.LAYOUT_ID)
    84 
    -    object TorFeedbackSurvey : AdapterItem(TorFeedbackSurveyViewHolder.LAYOUT_ID)
    85 83 
         object NoCollectionsMessage : AdapterItem(NoCollectionsMessageViewHolder.LAYOUT_ID)
    86 84
    87 85 
         object TorBootstrap : AdapterItem(TorBootstrapPagerViewHolder.LAYOUT_ID)
    ... ... @@ -181,10 +179,6 @@ class SessionControlAdapter(
    181 179 
                     view,
    182 180 
                     interactor
    183 181 
                 )
    184 
    -            TorFeedbackSurveyViewHolder.LAYOUT_ID -> TorFeedbackSurveyViewHolder(
    185 
    -                view,
    186 
    -                interactor
    187 
    -            )
    188 182 
                 TorBootstrapPagerViewHolder.LAYOUT_ID -> TorBootstrapPagerViewHolder(
    189 183 
                     view,
    190 184 
                     components,

  • app/src/main/java/org/mozilla/fenix/home/sessioncontrol/SessionControlController.kt
    ... ... @@ -92,11 +92,6 @@ interface SessionControlController {
    92 92 
          */
    93 93 
         fun handlePrivateBrowsingLearnMoreClicked()
    94 94
    95 
    -    /**
    96 
    -     * @see [TabSessionInteractor.onTorFeedbackSurveyLaunchClicked]
    97 
    -     */
    98 
    -    fun handleTorFeedbackSurveyLaunchClicked()
    99 
    -
    100 95 
         /**
    101 96 
          * @see [TopSiteInteractor.onRenameTopSiteClicked]
    102 97 
          */
    ... ... @@ -625,12 +620,4 @@ class DefaultSessionControlController(
    625 620 
         override fun handleTorNetworkSettingsClicked() {
    626 621 
             openTorNetworkSettings()
    627 622 
         }
    628 
    -
    629 
    -    override fun handleTorFeedbackSurveyLaunchClicked() {
    630 
    -        activity.openToBrowserAndLoad(
    631 
    -            searchTermOrURL = SupportUtils.TOR_FEEDBACK_SURVEY_URL,
    632 
    -            newTab = true,
    633 
    -            from = BrowserDirection.FromHome
    634 
    -        )
    635 
    -    }
    636 623 
     }

  • app/src/main/java/org/mozilla/fenix/home/sessioncontrol/SessionControlInteractor.kt
    ... ... @@ -18,12 +18,6 @@ interface TabSessionInteractor {
    18 18 
          * "Common myths about private browsing" link in private mode.
    19 19 
          */
    20 20 
         fun onPrivateBrowsingLearnMoreClicked()
    21 
    -
    22 
    -    /**
    23 
    -     * Shows the Feedback Survey web page in a new tab. Called when a user clicks on the
    24 
    -     * "Launch the Survey" button.
    25 
    -     */
    26 
    -    fun onTorFeedbackSurveyLaunchClicked()
    27 21 
     }
    28 22
    29 23 
     /**
    ... ... @@ -367,8 +361,4 @@ class SessionControlInteractor(
    367 361 
         override fun onTorBootstrapNetworkSettingsClicked() {
    368 362 
             controller.handleTorNetworkSettingsClicked()
    369 363 
         }
    370 
    -
    371 
    -    override fun onTorFeedbackSurveyLaunchClicked() {
    372 
    -        controller.handleTorFeedbackSurveyLaunchClicked()
    373 
    -    }
    374 364 
     }

  • app/src/main/java/org/mozilla/fenix/home/sessioncontrol/SessionControlView.kt
    ... ... @@ -66,7 +66,7 @@ private fun showCollections(
    66 66 
         }
    67 67 
     }
    68 68
    69 
    -private fun privateModeAdapterItems() = listOf(AdapterItem.TorFeedbackSurvey)
    69 
    +private fun privateModeAdapterItems() = listOf(AdapterItem.PrivateBrowsingDescription)
    70 70
    71 71 
     private fun bootstrapAdapterItems() = listOf(AdapterItem.TorBootstrap)
    72 72

  • app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/TorFeedbackSurveyViewHolder.kt deleted
    1 
    -/* This Source Code Form is subject to the terms of the Mozilla Public
    2 
    - * License, v. 2.0. If a copy of the MPL was not distributed with this
    3 
    - * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
    4 
    -
    5 
    -package org.mozilla.fenix.home.sessioncontrol.viewholders
    6 
    -
    7 
    -import android.view.View
    8 
    -import androidx.recyclerview.widget.RecyclerView
    9 
    -import kotlinx.android.synthetic.main.tor_feedback_survey.view.*
    10 
    -import org.mozilla.fenix.R
    11 
    -import org.mozilla.fenix.home.sessioncontrol.TabSessionInteractor
    12 
    -
    13 
    -class TorFeedbackSurveyViewHolder(
    14 
    -    view: View,
    15 
    -    private val interactor: TabSessionInteractor
    16 
    -) : RecyclerView.ViewHolder(view) {
    17 
    -
    18 
    -    init {
    19 
    -        // val resources = view.resources
    20 
    -        // val appName = resources.getString(R.string.app_name)
    21 
    -        // view.private_session_description.text = resources.getString(
    22 
    -        //     R.string.private_browsing_placeholder_description_2, appName
    23 
    -        // )
    24 
    -        with(view.feedback_survey_launch_button) {
    25 
    -            setOnClickListener {
    26 
    -                interactor.onTorFeedbackSurveyLaunchClicked()
    27 
    -            }
    28 
    -        }
    29 
    -    }
    30 
    -
    31 
    -    companion object {
    32 
    -        const val LAYOUT_ID = R.layout.tor_feedback_survey
    33 
    -    }
    34 
    -}

  • app/src/main/java/org/mozilla/fenix/settings/SupportUtils.kt
    ... ... @@ -37,7 +37,6 @@ object SupportUtils {
    37 37 
         const val DONATE_URL = "https://donate.torproject.org/"
    38 38 
         const val TB_MANUAL_URL = "https://tb-manual.torproject.org/mobile-tor"
    39 39 
         const val TOR_RELEASES = "https://www.torproject.org/releases/"
    40 
    -    const val TOR_FEEDBACK_SURVEY_URL = "http://bogdyardcfurxcle.onion/index.php/491436"
    41 40
    42 41 
         enum class SumoTopic(internal val topicStr: String) {
    43 42 
             FENIX_MOVING("sync-delist"),

  • app/src/main/res/drawable/feedback_survey_padded_background.xml deleted
    1 
    -<?xml version="1.0" encoding="utf-8"?><!-- This Source Code Form is subject to the terms of the Mozilla Public
    2 
    -   - License, v. 2.0. If a copy of the MPL was not distributed with this
    3 
    -   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
    4 
    -<ripple xmlns:android="http://schemas.android.com/apk/res/android"
    5 
    -    android:color="@color/feedback_survey_padded_background_color">
    6 
    -    <item
    7 
    -        android:bottom="6dp"
    8 
    -        android:top="6dp">
    9 
    -        <shape android:shape="rectangle">
    10 
    -            <corners android:radius="4dp" />
    11 
    -        </shape>
    12 
    -    </item>
    13 
    -</ripple>

  • app/src/main/res/drawable/tor_survey_icon_3x.png deleted
    No preview for this file type
  • app/src/main/res/layout/fragment_home.xml
    ... ... @@ -94,8 +94,7 @@
    94 94 
                 android:textColor="#DEFFFFFF"
    95 95 
                 android:textSize="40sp"
    96 96 
                 android:lineSpacingMultiplier="1.1"
    97 
    -            app:layout_scrollFlags="scroll"
    98 
    -            android:visibility="gone" />
    97 
    +            app:layout_scrollFlags="scroll" />
    99 98
    100 99 
         </com.google.android.material.appbar.AppBarLayout>
    101 100

  • app/src/main/res/layout/tor_feedback_survey.xml deleted
    1 
    -<?xml version="1.0" encoding="utf-8"?>
    2 
    -<!-- This Source Code Form is subject to the terms of the Mozilla Public
    3 
    -   - License, v. 2.0. If a copy of the MPL was not distributed with this
    4 
    -   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
    5 
    -<androidx.constraintlayout.widget.ConstraintLayout
    6 
    -    xmlns:android="http://schemas.android.com/apk/res/android"
    7 
    -    xmlns:app="http://schemas.android.com/apk/res-auto"
    8 
    -    android:id="@+id/feedback_survey_wrapper"
    9 
    -    style="@style/OnboardingCardLightWithPadding"
    10 
    -    android:layout_width="match_parent"
    11 
    -    android:layout_height="wrap_content"
    12 
    -    android:clipChildren="false"
    13 
    -    android:clipToPadding="false">
    14 
    -
    15 
    -    <LinearLayout
    16 
    -        android:id="@+id/feedback_survey_header_wrapper"
    17 
    -        android:layout_width="match_parent"
    18 
    -        android:layout_height="wrap_content"
    19 
    -        app:layout_constraintStart_toStartOf="parent"
    20 
    -        app:layout_constraintTop_toTopOf="parent"
    21 
    -        android:importantForAccessibility="no">
    22 
    -
    23 
    -        <ImageView
    24 
    -            android:id="@+id/tor_feedback_icon"
    25 
    -            android:layout_width="wrap_content"
    26 
    -            android:layout_height="32dp"
    27 
    -            android:layout_marginEnd="10dp"
    28 
    -            android:adjustViewBounds="true"
    29 
    -            android:clickable="false"
    30 
    -            android:focusable="false"
    31 
    -            android:importantForAccessibility="no"
    32 
    -            app:srcCompat="@drawable/tor_survey_icon_3x"/>
    33 
    -
    34 
    -        <TextView
    35 
    -            android:id="@+id/feedback_survey_header"
    36 
    -            android:layout_width="match_parent"
    37 
    -            android:layout_height="wrap_content"
    38 
    -            android:ellipsize="none"
    39 
    -            android:lineSpacingExtra="6dp"
    40 
    -            android:paddingHorizontal="4dp"
    41 
    -            android:paddingTop="4dp"
    42 
    -            android:scrollHorizontally="false"
    43 
    -            android:textAlignment="viewStart"
    44 
    -            android:textColor="?primaryText"
    45 
    -            android:textSize="20sp"
    46 
    -            android:text="Do you use Snowflake?" />
    47 
    -    </LinearLayout>
    48 
    -
    49 
    -    <TextView
    50 
    -        android:id="@+id/feedback_survey_description"
    51 
    -        android:layout_width="match_parent"
    52 
    -        android:layout_height="wrap_content"
    53 
    -        android:ellipsize="none"
    54 
    -        android:lineSpacingExtra="6dp"
    55 
    -        android:paddingHorizontal="4dp"
    56 
    -        android:paddingTop="4dp"
    57 
    -        app:layout_constraintEnd_toEndOf="parent"
    58 
    -        app:layout_constraintStart_toStartOf="parent"
    59 
    -        app:layout_constraintTop_toBottomOf="@id/feedback_survey_header_wrapper"
    60 
    -        android:scrollHorizontally="false"
    61 
    -        android:textAlignment="viewStart"
    62 
    -        android:textColor="?primaryText"
    63 
    -        android:textSize="16sp"
    64 
    -        android:text="Snowflake is a pluggable transport available in Tor Browser. Help us improve it by completing this short survey about your browsing experience:" />
    65 
    -
    66 
    -    <Button
    67 
    -        style="@style/PositiveButton"
    68 
    -        android:id="@+id/feedback_survey_launch_button"
    69 
    -        android:text="Launch the Survey"
    70 
    -        android:layout_marginTop="16dp"
    71 
    -        android:textSize="18dp"
    72 
    -        android:textColor="@android:color/black"
    73 
    -        android:background="@drawable/feedback_survey_padded_background"
    74 
    -        android:fontFamily="Roboto-Medium"
    75 
    -        app:layout_constraintEnd_toEndOf="parent"
    76 
    -        app:layout_constraintStart_toStartOf="parent"
    77 
    -        app:layout_constraintTop_toBottomOf="@id/feedback_survey_description" />
    78 
    -
    79 
    -</androidx.constraintlayout.widget.ConstraintLayout>

  • app/src/main/res/values/colors.xml
    ... ... @@ -425,7 +425,4 @@
    425 425
    426 426 
         <!-- Toolbar menu icon colors -->
    427 427 
         <color name="toolbar_menu_transparent">@android:color/transparent</color>
    428 
    -
    429 
    -    <!-- Tor -->
    430 
    -    <color name="feedback_survey_padded_background_color">#A76FFA</color>
    431 428 
     </resources>

    • —
    View it on GitLab.
    You're receiving this email because of your account on gitlab.torproject.org. If you'd like to receive fewer emails, you can adjust your notification settings.