Skip to content

Commit d149145

Browse files
malmsteinmalmstein
authored
change icon in first permission dialog to use DAX icon and remove it'… (#928)
* change icon in first permission dialog to use DAX icon and remove it's shadow * fixed ktlint
1 parent 21608ea commit d149145

File tree

2 files changed

+49
-74
lines changed

2 files changed

+49
-74
lines changed

‎app/src/main/java/com/duckduckgo/app/location/ui/SystemLocationPermissionDialog.kt‎

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,11 @@
1717
package com.duckduckgo.app.location.ui
1818

1919
import android.app.Dialog
20-
import android.net.Uri
2120
import android.os.Bundle
22-
import android.widget.ImageView
2321
import android.widget.TextView
2422
import androidx.appcompat.app.AlertDialog
2523
import androidx.fragment.app.DialogFragment
2624
import com.duckduckgo.app.browser.R
27-
import com.duckduckgo.app.global.faviconLocation
28-
import com.duckduckgo.app.global.image.GlideApp
2925
import com.duckduckgo.app.global.view.websiteFromGeoLocationsApiOrigin
3026
import org.jetbrains.anko.find
3127

@@ -46,7 +42,6 @@ class SystemLocationPermissionDialog : DialogFragment() {
4642
val rootView = layoutInflater.inflate(R.layout.content_system_location_permission_dialog, null)
4743

4844
val subtitle = rootView.find<TextView>(R.id.systemPermissionDialogSubtitle)
49-
val favicon = rootView.find<ImageView>(R.id.faviconImage)
5045
val allowLocationPermission = rootView.find<TextView>(R.id.allowLocationPermission)
5146
val denyLocationPermission = rootView.find<TextView>(R.id.denyLocationPermission)
5247
val neverAllowLocationPermission = rootView.find<TextView>(R.id.neverAllowLocationPermission)
@@ -56,7 +51,6 @@ class SystemLocationPermissionDialog : DialogFragment() {
5651

5752
validateBundleArguments()
5853
populateSubtitle(subtitle)
59-
populateFavicon(favicon)
6054
configureListeners(allowLocationPermission, denyLocationPermission, neverAllowLocationPermission)
6155

6256
return alertBuilder.create()
@@ -78,18 +72,6 @@ class SystemLocationPermissionDialog : DialogFragment() {
7872
}
7973
}
8074

81-
private fun populateFavicon(imageView: ImageView) {
82-
arguments?.let { args ->
83-
val originUrl = args.getString(KEY_REQUEST_ORIGIN)
84-
val faviconUrl = Uri.parse(originUrl).faviconLocation()
85-
86-
GlideApp.with(requireContext())
87-
.load(faviconUrl)
88-
.error(R.drawable.ic_globe_gray_16dp)
89-
.into(imageView)
90-
}
91-
}
92-
9375
private fun configureListeners(
9476
allowLocationPermission: TextView,
9577
denyLocationPermission: TextView,

‎app/src/main/res/layout/content_system_location_permission_dialog.xml‎

Lines changed: 49 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -20,71 +20,64 @@
2020
xmlns:app="http://schemas.android.com/apk/res-auto"
2121
android:layout_width="wrap_content"
2222
android:layout_height="wrap_content"
23-
android:orientation="vertical"
23+
android:background="?toolbarBgColor"
2424
android:gravity="center"
25-
android:background="?toolbarBgColor">
25+
android:orientation="vertical">
2626

27-
<FrameLayout
28-
android:id="@+id/systemPermissionDialogFaviconContainer"
29-
android:layout_width="40dp"
30-
android:layout_height="40dp"
31-
android:layout_marginTop="24dp"
32-
android:background="@drawable/subtle_favicon_background"
33-
app:layout_constraintBottom_toBottomOf="parent"
34-
app:layout_constraintStart_toStartOf="parent"
35-
app:layout_constraintTop_toTopOf="parent">
27+
<ImageView
28+
android:id="@+id/faviconImage"
29+
android:layout_width="40dp"
30+
android:layout_height="40dp"
31+
android:layout_marginTop="24dp"
32+
android:layout_gravity="center"
33+
android:importantForAccessibility="no"
34+
android:src="@drawable/ic_dax_icon"
35+
app:layout_constraintBottom_toBottomOf="parent"
36+
app:layout_constraintStart_toStartOf="parent"
37+
app:layout_constraintTop_toTopOf="parent" />
3638

37-
<ImageView
38-
android:id="@+id/faviconImage"
39-
android:layout_width="22dp"
40-
android:layout_height="22dp"
41-
android:layout_gravity="center"
42-
android:importantForAccessibility="no"
43-
android:src="@drawable/ic_globe_gray_16dp" />
44-
</FrameLayout>
39+
<TextView
40+
android:id="@+id/systemPermissionDialogTitle"
41+
style="@style/LocationPermissionDialogTitle"
42+
android:layout_width="match_parent"
43+
android:layout_height="wrap_content"
44+
android:layout_marginTop="16dp"
45+
android:text="@string/preciseLocationSystemDialogTitle" />
4546

46-
<TextView
47-
android:id="@+id/systemPermissionDialogTitle"
48-
android:layout_width="match_parent"
49-
android:layout_height="wrap_content"
50-
style="@style/LocationPermissionDialogTitle"
51-
android:layout_marginTop="16dp"
52-
android:text="@string/preciseLocationSystemDialogTitle" />
47+
<TextView
48+
android:id="@+id/systemPermissionDialogSubtitle"
49+
style="@style/LocationPermissionDialogSubtitle"
50+
android:layout_width="match_parent"
51+
android:layout_height="wrap_content"
52+
android:layout_marginTop="12dp"
53+
android:layout_marginBottom="24dp"
54+
android:text="@string/preciseLocationSystemDialogSubtitle" />
5355

54-
<TextView
55-
android:id="@+id/systemPermissionDialogSubtitle"
56-
android:layout_width="match_parent"
57-
android:layout_height="wrap_content"
58-
style="@style/LocationPermissionDialogSubtitle"
59-
android:layout_marginTop="12dp"
60-
android:layout_marginBottom="24dp"
61-
android:text="@string/preciseLocationSystemDialogSubtitle" />
56+
<View style="@style/LocationPermissionDialogSplitter" />
6257

63-
<View style="@style/LocationPermissionDialogSplitter" />
58+
<Button
59+
android:id="@+id/allowLocationPermission"
60+
style="@style/LocationPermissionDialogButton"
61+
android:layout_width="match_parent"
62+
android:layout_height="wrap_content"
63+
android:text="@string/preciseLocationSystemDialogAllow" />
6464

65-
<Button
66-
android:id="@+id/allowLocationPermission"
67-
style="@style/LocationPermissionDialogButton"
68-
android:layout_width="match_parent"
69-
android:layout_height="wrap_content"
70-
android:text="@string/preciseLocationSystemDialogAllow" />
65+
<View style="@style/LocationPermissionDialogSplitter" />
7166

72-
<View style="@style/LocationPermissionDialogSplitter" />
67+
<Button
68+
android:id="@+id/denyLocationPermission"
69+
style="@style/LocationPermissionDialogButton"
70+
android:layout_width="match_parent"
71+
android:layout_height="wrap_content"
72+
android:text="@string/preciseLocationSystemDialogDeny" />
7373

74-
<Button
75-
android:id="@+id/denyLocationPermission"
76-
style="@style/LocationPermissionDialogButton"
77-
android:layout_width="match_parent"
78-
android:layout_height="wrap_content"
79-
android:text="@string/preciseLocationSystemDialogDeny" />
74+
<View style="@style/LocationPermissionDialogSplitter" />
8075

81-
<View style="@style/LocationPermissionDialogSplitter" />
82-
83-
<Button
84-
android:id="@+id/neverAllowLocationPermission"
85-
style="@style/LocationPermissionDialogButton"
86-
android:layout_width="match_parent"
87-
android:layout_height="wrap_content"
88-
android:text="@string/preciseLocationSystemDialogNeverAllow" />
76+
<Button
77+
android:id="@+id/neverAllowLocationPermission"
78+
style="@style/LocationPermissionDialogButton"
79+
android:layout_width="match_parent"
80+
android:layout_height="wrap_content"
81+
android:text="@string/preciseLocationSystemDialogNeverAllow" />
8982

9083
</LinearLayout>

0 commit comments

Comments
 (0)