blallo
/
fenix
1
0
Fork 0
Code Releases Activity

Issue #8277: Reuse app icon in widget layout. 

This patch refactors the widget layouts so that we can reuse the app icon and do not have to have
another logo resource with different constraints. This will also make it easier to update the
branding in #8277 and #8278.
master
Sebastian Kaspari 2020-02-13 16:17:28 +01:00
parent f1a3dffba2
commit ba54080177
7 changed files with 47 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/src/main/java/org/mozilla/gecko/search/SearchWidgetProvider.kt
View File

@ -17,7 +17,7 @@ import android.view.View
import android.widget.RemoteViews
import androidx.annotation.Dimension
import androidx.annotation.Dimension.DP
import androidx.appcompat.widget.AppCompatDrawableManager
import androidx.appcompat.content.res.AppCompatResources
import androidx.core.graphics.drawable.toBitmap
import org.mozilla.fenix.HomeActivity
import org.mozilla.fenix.IntentReceiverActivity
@ -168,13 +168,13 @@ class SearchWidgetProvider : AppWidgetProvider() {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
setImageViewResource(
R.id.button_search_widget_new_tab_icon,
R.drawable.ic_logo_widget)
R.drawable.ic_launcher_foreground)
} else {
setImageViewBitmap(
R.id.button_search_widget_new_tab_icon,
AppCompatDrawableManager.get().getDrawable(
AppCompatResources.getDrawable(
context,
R.drawable.ic_logo_widget
R.drawable.ic_launcher_foreground
)?.toBitmap())
}
}

26
app/src/main/res/drawable/ic_logo_widget.xml
View File

File diff suppressed because one or more lines are too long

24
app/src/main/res/layout/search_widget_extra_small_v1.xml
View File

@ -4,15 +4,19 @@
- file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@id/button_search_widget_new_tab"
android:layout_width="match_parent"
android:layout_height="50dp"
android:background="@drawable/rounded_white_corners"
android:layout_gravity="center">
xmlns:tools="http://schemas.android.com/tools"
android:id="@id/button_search_widget_new_tab"
android:layout_width="match_parent"
android:layout_height="50dp"
android:background="@drawable/rounded_white_corners"
android:layout_gravity="center">
<ImageView
android:id="@+id/button_search_widget_new_tab_icon"
android:layout_width="40dp"
android:layout_height="40dp"
android:layout_gravity="center"/>
</FrameLayout>
android:id="@+id/button_search_widget_new_tab_icon"
android:layout_width="50dp"
android:layout_height="50dp"
android:scaleType="centerInside"
tools:src="@drawable/ic_launcher_foreground"
android:layout_gravity="center"/>
</FrameLayout>

9
app/src/main/res/layout/search_widget_extra_small_v2.xml
View File

@ -4,6 +4,7 @@
- file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:id="@id/button_search_widget_new_tab"
android:layout_width="64dp"
android:layout_height="50dp"
@ -12,7 +13,9 @@
<ImageView
android:id="@+id/button_search_widget_new_tab_icon"
android:layout_width="40dp"
android:layout_height="40dp"
android:layout_width="50dp"
android:layout_height="50dp"
android:scaleType="centerInside"
tools:src="@drawable/ic_launcher_foreground"
android:layout_gravity="center"/>
</FrameLayout>
</FrameLayout>

7
app/src/main/res/layout/search_widget_large.xml
View File

@ -12,11 +12,10 @@
<ImageView
android:id="@+id/button_search_widget_new_tab_icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_width="50dp"
android:layout_height="50dp"
android:layout_alignParentStart="true"
android:adjustViewBounds="true"
android:padding="12dp"/>
android:scaleType="centerInside" />
<TextView
android:id="@+id/button_search_widget_new_tab"

7
app/src/main/res/layout/search_widget_medium.xml
View File

@ -12,11 +12,10 @@
<ImageView
android:id="@+id/button_search_widget_new_tab_icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_width="50dp"
android:layout_height="50dp"
android:layout_alignParentStart="true"
android:adjustViewBounds="true"
android:padding="12dp"/>
android:scaleType="centerInside" />
<TextView
android:id="@+id/button_search_widget_new_tab"

44
app/src/main/res/layout/search_widget_small.xml
View File

@ -2,33 +2,23 @@
<!-- This Source Code Form is subject to the terms of the Mozilla Public
- 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/. -->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="100dp"
android:layout_height="50dp"
android:background="@drawable/rounded_white_corners"
android:orientation="horizontal">
<RelativeLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="100dp"
<ImageView
android:id="@+id/button_search_widget_new_tab_icon"
android:layout_width="50dp"
android:layout_height="50dp"
android:background="@drawable/rounded_white_corners"
android:layout_gravity="center">
<FrameLayout android:id="@+id/button_search_widget_new_tab"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginTop="9dp">
<ImageView
android:id="@+id/button_search_widget_new_tab_icon"
android:layout_width="32dp"
android:layout_height="32dp"
android:layout_marginStart="9dp"/>
</FrameLayout>
<ImageButton
android:id="@+id/button_search_widget_voice"
android:layout_width="32dp"
android:layout_height="32dp"
android:background="@drawable/ic_microphone_widget"
android:layout_alignParentEnd="true"
android:layout_alignTop="@id/button_search_widget_new_tab"
android:layout_marginEnd="9dp"/>
</RelativeLayout>
android:scaleType="centerInside" />
<ImageView
android:id="@+id/button_search_widget_voice"
android:layout_width="50dp"
android:layout_height="50dp"
android:padding="10dp"
android:src="@drawable/ic_microphone_widget"
android:scaleType="centerInside" />
</LinearLayout>