| ... |
... |
@@ -48,10 +48,10 @@ |
|
48
|
48
|
app:layout_collapseParallaxMultiplier=".167"/>
|
|
49
|
49
|
<!-- This value needs to be 1.67 * the wordmark parallax value as its 24dp vs 40 -->
|
|
50
|
50
|
|
|
51
|
|
- <LinearLayout
|
|
|
51
|
+ <androidx.constraintlayout.widget.ConstraintLayout
|
|
52
|
52
|
android:id="@+id/wordmark"
|
|
53
|
53
|
android:layout_width="wrap_content"
|
|
54
|
|
- android:layout_height="40dp"
|
|
|
54
|
+ android:layout_height="wrap_content"
|
|
55
|
55
|
android:layout_marginStart="16dp"
|
|
56
|
56
|
android:layout_marginTop="18dp"
|
|
57
|
57
|
android:layout_marginBottom="32dp"
|
| ... |
... |
@@ -65,16 +65,21 @@ |
|
65
|
65
|
|
|
66
|
66
|
<ImageView
|
|
67
|
67
|
android:id="@+id/wordmarkLogo"
|
|
68
|
|
- android:layout_width="wrap_content"
|
|
69
|
|
- android:layout_height="match_parent"
|
|
70
|
|
- android:layout_marginEnd="10.dp"
|
|
|
68
|
+ android:layout_width="50dp"
|
|
|
69
|
+ android:layout_height="50dp"
|
|
71
|
70
|
android:adjustViewBounds="true"
|
|
72
|
71
|
android:contentDescription="@null"
|
|
73
|
72
|
app:srcCompat="@mipmap/ic_launcher_foreground"
|
|
74
|
73
|
tools:ignore="ImageContrastCheck"
|
|
|
74
|
+ app:layout_constraintBottom_toBottomOf="parent"
|
|
|
75
|
+ app:layout_constraintStart_toStartOf="parent"
|
|
|
76
|
+ app:layout_constraintTop_toTopOf="parent"
|
|
|
77
|
+ app:layout_constraintEnd_toStartOf="@id/app_name"
|
|
75
|
78
|
android:scaleX="1.5"
|
|
76
|
79
|
android:scaleY="1.5" />
|
|
77
|
80
|
|
|
|
81
|
+ <!--
|
|
|
82
|
+ tor-browser#42590
|
|
78
|
83
|
<ImageView
|
|
79
|
84
|
android:id="@+id/wordmarkText"
|
|
80
|
85
|
android:layout_width="wrap_content"
|
| ... |
... |
@@ -83,7 +88,30 @@ |
|
83
|
88
|
android:contentDescription="@null"
|
|
84
|
89
|
android:layout_marginTop="@dimen/wordmark_text_margin_top"
|
|
85
|
90
|
app:srcCompat="?fenixWordmarkText" />
|
|
86
|
|
- </LinearLayout>
|
|
|
91
|
+ -->
|
|
|
92
|
+
|
|
|
93
|
+ <TextView
|
|
|
94
|
+ android:id="@+id/app_name"
|
|
|
95
|
+ android:layout_width="wrap_content"
|
|
|
96
|
+ android:layout_height="wrap_content"
|
|
|
97
|
+ android:clickable="false"
|
|
|
98
|
+ android:focusable="false"
|
|
|
99
|
+ android:fontFamily="Roboto-Medium"
|
|
|
100
|
+ android:gravity="start"
|
|
|
101
|
+ android:importantForAccessibility="no"
|
|
|
102
|
+ android:maxLines="2"
|
|
|
103
|
+ android:paddingStart="16dp"
|
|
|
104
|
+ android:paddingEnd="16dp"
|
|
|
105
|
+ android:text="@string/app_name"
|
|
|
106
|
+ android:textColor="#DEFFFFFF"
|
|
|
107
|
+ android:textSize="20sp"
|
|
|
108
|
+ app:layout_constrainedWidth="true"
|
|
|
109
|
+ app:layout_constraintBottom_toBottomOf="parent"
|
|
|
110
|
+ app:layout_constraintEnd_toEndOf="parent"
|
|
|
111
|
+ app:layout_constraintStart_toEndOf="@id/wordmarkLogo"
|
|
|
112
|
+ app:layout_constraintTop_toTopOf="parent" />
|
|
|
113
|
+
|
|
|
114
|
+ </androidx.constraintlayout.widget.ConstraintLayout>
|
|
87
|
115
|
|
|
88
|
116
|
</com.google.android.material.appbar.CollapsingToolbarLayout>
|
|
89
|
117
|
|