diff --git a/app/src/debug/res/drawable/ic_launcher_background.png b/app/src/debug/res/drawable/ic_launcher_background.png new file mode 100644 index 000000000..ed2ce5054 Binary files /dev/null and b/app/src/debug/res/drawable/ic_launcher_background.png differ diff --git a/app/src/debug/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/debug/res/mipmap-anydpi-v26/ic_launcher_round.xml new file mode 100644 index 000000000..175de321f --- /dev/null +++ b/app/src/debug/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -0,0 +1,9 @@ + + + + + + + diff --git a/app/src/debug/res/mipmap-hdpi/ic_launcher.png b/app/src/debug/res/mipmap-hdpi/ic_launcher.png deleted file mode 100644 index 33d2231dc..000000000 Binary files a/app/src/debug/res/mipmap-hdpi/ic_launcher.png and /dev/null differ diff --git a/app/src/debug/res/mipmap-hdpi/ic_launcher_foreground.png b/app/src/debug/res/mipmap-hdpi/ic_launcher_foreground.png index a277d7183..aa0010673 100644 Binary files a/app/src/debug/res/mipmap-hdpi/ic_launcher_foreground.png and b/app/src/debug/res/mipmap-hdpi/ic_launcher_foreground.png differ diff --git a/app/src/debug/res/mipmap-hdpi/ic_launcher_round.png b/app/src/debug/res/mipmap-hdpi/ic_launcher_round.png deleted file mode 100644 index b88911b22..000000000 Binary files a/app/src/debug/res/mipmap-hdpi/ic_launcher_round.png and /dev/null differ diff --git a/app/src/debug/res/mipmap-mdpi/ic_launcher.png b/app/src/debug/res/mipmap-mdpi/ic_launcher.png deleted file mode 100644 index fb124443e..000000000 Binary files a/app/src/debug/res/mipmap-mdpi/ic_launcher.png and /dev/null differ diff --git a/app/src/debug/res/mipmap-mdpi/ic_launcher_foreground.png b/app/src/debug/res/mipmap-mdpi/ic_launcher_foreground.png index 755e7b130..23cf2b0af 100644 Binary files a/app/src/debug/res/mipmap-mdpi/ic_launcher_foreground.png and b/app/src/debug/res/mipmap-mdpi/ic_launcher_foreground.png differ diff --git a/app/src/debug/res/mipmap-mdpi/ic_launcher_round.png b/app/src/debug/res/mipmap-mdpi/ic_launcher_round.png deleted file mode 100644 index b65a0cb29..000000000 Binary files a/app/src/debug/res/mipmap-mdpi/ic_launcher_round.png and /dev/null differ diff --git a/app/src/debug/res/mipmap-xhdpi/ic_launcher.png b/app/src/debug/res/mipmap-xhdpi/ic_launcher.png deleted file mode 100644 index 73957cc1c..000000000 Binary files a/app/src/debug/res/mipmap-xhdpi/ic_launcher.png and /dev/null differ diff --git a/app/src/debug/res/mipmap-xhdpi/ic_launcher_foreground.png b/app/src/debug/res/mipmap-xhdpi/ic_launcher_foreground.png index 078dbb4f7..8d006fc84 100644 Binary files a/app/src/debug/res/mipmap-xhdpi/ic_launcher_foreground.png and b/app/src/debug/res/mipmap-xhdpi/ic_launcher_foreground.png differ diff --git a/app/src/debug/res/mipmap-xhdpi/ic_launcher_round.png b/app/src/debug/res/mipmap-xhdpi/ic_launcher_round.png deleted file mode 100644 index 36bc55caa..000000000 Binary files a/app/src/debug/res/mipmap-xhdpi/ic_launcher_round.png and /dev/null differ diff --git a/app/src/debug/res/mipmap-xxhdpi/ic_launcher.png b/app/src/debug/res/mipmap-xxhdpi/ic_launcher.png deleted file mode 100644 index 9749684e8..000000000 Binary files a/app/src/debug/res/mipmap-xxhdpi/ic_launcher.png and /dev/null differ diff --git a/app/src/debug/res/mipmap-xxhdpi/ic_launcher_foreground.png b/app/src/debug/res/mipmap-xxhdpi/ic_launcher_foreground.png index 2fb9c1569..22aafcf6e 100644 Binary files a/app/src/debug/res/mipmap-xxhdpi/ic_launcher_foreground.png and b/app/src/debug/res/mipmap-xxhdpi/ic_launcher_foreground.png differ diff --git a/app/src/debug/res/mipmap-xxhdpi/ic_launcher_round.png b/app/src/debug/res/mipmap-xxhdpi/ic_launcher_round.png deleted file mode 100644 index b2dc1375a..000000000 Binary files a/app/src/debug/res/mipmap-xxhdpi/ic_launcher_round.png and /dev/null differ diff --git a/app/src/debug/res/mipmap-xxxhdpi/ic_launcher.png b/app/src/debug/res/mipmap-xxxhdpi/ic_launcher.png deleted file mode 100644 index a711e7408..000000000 Binary files a/app/src/debug/res/mipmap-xxxhdpi/ic_launcher.png and /dev/null differ diff --git a/app/src/debug/res/mipmap-xxxhdpi/ic_launcher_foreground.png b/app/src/debug/res/mipmap-xxxhdpi/ic_launcher_foreground.png index fcb3731e2..79df963a9 100644 Binary files a/app/src/debug/res/mipmap-xxxhdpi/ic_launcher_foreground.png and b/app/src/debug/res/mipmap-xxxhdpi/ic_launcher_foreground.png differ diff --git a/app/src/debug/res/mipmap-xxxhdpi/ic_launcher_round.png b/app/src/debug/res/mipmap-xxxhdpi/ic_launcher_round.png deleted file mode 100644 index 1fe700b97..000000000 Binary files a/app/src/debug/res/mipmap-xxxhdpi/ic_launcher_round.png and /dev/null differ diff --git a/app/src/main/res/drawable-hdpi/ic_logo_wordmark.png b/app/src/main/res/drawable-hdpi/ic_logo_wordmark.png deleted file mode 100644 index 3cbdccb49..000000000 Binary files a/app/src/main/res/drawable-hdpi/ic_logo_wordmark.png and /dev/null differ diff --git a/app/src/main/res/drawable-mdpi/ic_logo_wordmark.png b/app/src/main/res/drawable-mdpi/ic_logo_wordmark.png deleted file mode 100644 index f5b2f5b51..000000000 Binary files a/app/src/main/res/drawable-mdpi/ic_logo_wordmark.png and /dev/null differ diff --git a/app/src/main/res/drawable-night-xxxhdpi/ic_logo_wordmark.png b/app/src/main/res/drawable-night-xxxhdpi/ic_logo_wordmark.png deleted file mode 100644 index 2d19890d8..000000000 Binary files a/app/src/main/res/drawable-night-xxxhdpi/ic_logo_wordmark.png and /dev/null differ diff --git a/app/src/main/res/drawable-night/ic_logo_wordmark_normal.png b/app/src/main/res/drawable-night/ic_logo_wordmark_normal.png new file mode 100644 index 000000000..cc14001d2 Binary files /dev/null and b/app/src/main/res/drawable-night/ic_logo_wordmark_normal.png differ diff --git a/app/src/main/res/drawable-xhdpi/ic_logo_wordmark.png b/app/src/main/res/drawable-xhdpi/ic_logo_wordmark.png deleted file mode 100644 index 4225986d0..000000000 Binary files a/app/src/main/res/drawable-xhdpi/ic_logo_wordmark.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_logo_wordmark.png b/app/src/main/res/drawable-xxhdpi/ic_logo_wordmark.png deleted file mode 100644 index 758478a2b..000000000 Binary files a/app/src/main/res/drawable-xxhdpi/ic_logo_wordmark.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxxhdpi/ic_logo_wordmark_white.png b/app/src/main/res/drawable-xxxhdpi/ic_logo_wordmark_white.png deleted file mode 100644 index d703de56e..000000000 Binary files a/app/src/main/res/drawable-xxxhdpi/ic_logo_wordmark_white.png and /dev/null differ diff --git a/app/src/main/res/drawable/ic_logo_wordmark_normal.png b/app/src/main/res/drawable/ic_logo_wordmark_normal.png new file mode 100644 index 000000000..904f4672f Binary files /dev/null and b/app/src/main/res/drawable/ic_logo_wordmark_normal.png differ diff --git a/app/src/main/res/drawable/ic_logo_wordmark_private.png b/app/src/main/res/drawable/ic_logo_wordmark_private.png new file mode 100644 index 000000000..cc14001d2 Binary files /dev/null and b/app/src/main/res/drawable/ic_logo_wordmark_private.png differ diff --git a/app/src/main/res/layout/fragment_about.xml b/app/src/main/res/layout/fragment_about.xml index 807ffbd09..763a150a7 100644 --- a/app/src/main/res/layout/fragment_about.xml +++ b/app/src/main/res/layout/fragment_about.xml @@ -18,9 +18,9 @@ android:importantForAccessibility="no" android:src="?fenixLogo" android:layout_marginTop="24dp" - android:layout_height="wrap_content" + android:layout_height="80dp" android:layout_width="0dp" - app:layout_constraintWidth_percent="0.5" + app:layout_constraintWidth_percent="0.75" app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="parent" /> diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml index e08d90268..d4c343a57 100644 --- a/app/src/main/res/layout/fragment_home.xml +++ b/app/src/main/res/layout/fragment_home.xml @@ -39,10 +39,11 @@ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png deleted file mode 100644 index 98a369772..000000000 Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher.png and /dev/null differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png index c06b97f21..0b098d276 100644 Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png and b/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png deleted file mode 100644 index 1366889a2..000000000 Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png and /dev/null differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.png b/app/src/main/res/mipmap-mdpi/ic_launcher.png deleted file mode 100644 index 75d5f56d4..000000000 Binary files a/app/src/main/res/mipmap-mdpi/ic_launcher.png and /dev/null differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png index 80713d586..8215753e7 100644 Binary files a/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png and b/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png deleted file mode 100644 index 598ee9949..000000000 Binary files a/app/src/main/res/mipmap-mdpi/ic_launcher_round.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/app/src/main/res/mipmap-xhdpi/ic_launcher.png deleted file mode 100644 index cb45f301d..000000000 Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png index 9f9bb1910..ab5e556cc 100644 Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png and b/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png deleted file mode 100644 index 1620896d8..000000000 Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png deleted file mode 100644 index d2820efe1..000000000 Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png index 0f434e63d..8098f6001 100644 Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png deleted file mode 100644 index f3e3cb59b..000000000 Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png deleted file mode 100644 index b0a5b167f..000000000 Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png index 2de5dd748..dbc835697 100644 Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png deleted file mode 100644 index 5624bd638..000000000 Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png and /dev/null differ diff --git a/app/src/main/res/values/static_strings.xml b/app/src/main/res/values/static_strings.xml index 6d2f6118e..5fd90c754 100644 --- a/app/src/main/res/values/static_strings.xml +++ b/app/src/main/res/values/static_strings.xml @@ -4,7 +4,7 @@ - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> - Fenix + Firefox Preview LeakCanary diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index e7aa66552..16a5394a7 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -27,7 +27,7 @@ @color/destructive_normal_theme - @drawable/ic_logo_wordmark + @drawable/ic_logo_wordmark_normal @color/foundation_normal_theme @android:color/transparent @color/primary_text_normal_theme @@ -58,7 +58,7 @@ @color/destructive_private_theme - @drawable/ic_logo_wordmark_white + @drawable/ic_logo_wordmark_private @drawable/private_home_background_gradient @color/accent_private_theme @color/above_private_theme diff --git a/app/src/main/res/xml/home_scene.xml b/app/src/main/res/xml/home_scene.xml index 28372f50e..5e842af71 100644 --- a/app/src/main/res/xml/home_scene.xml +++ b/app/src/main/res/xml/home_scene.xml @@ -98,7 +98,7 @@ android:layout_marginTop="16dp" android:alpha="0" android:layout_width="wrap_content" - android:layout_height="wrap_content" + android:layout_height="80dp" android:translationY="-10dp" motion:layout_constraintStart_toStartOf="parent" motion:layout_constraintTop_toTopOf="parent" />