Move widgets to views

Slion · Jan 29, 2024 · e48df74 · e48df74
1 parent bc354d6
commit e48df74
Show file tree

Hide file tree

Showing 17 changed files with 32 additions and 30 deletions.
diff --git a/app/src/main/java/fulguris/activity/WebBrowserActivity.kt b/app/src/main/java/fulguris/activity/WebBrowserActivity.kt
@@ -40,6 +40,8 @@ import android.webkit.WebView.HitTestResult.SRC_ANCHOR_TYPE
 import android.webkit.WebView.HitTestResult.SRC_IMAGE_ANCHOR_TYPE
 import android.widget.*
 import android.widget.AdapterView.OnItemClickListener
+import android.widget.ImageView
+import android.widget.LinearLayout
 import android.widget.TextView.OnEditorActionListener
 import androidx.annotation.ColorInt
 import androidx.annotation.IdRes
@@ -206,7 +208,7 @@ abstract class WebBrowserActivity : ThemedBrowserActivity(),
     @Inject lateinit var bookmarkPageInitializer: BookmarkPageInitializer
     @Inject @field:MainHandler
     lateinit var mainHandler: Handler
-    @Inject lateinit var proxyUtils: fulguris.utils.ProxyUtils
+    @Inject lateinit var proxyUtils: ProxyUtils
     @Inject lateinit var bookmarksDialogBuilder: LightningDialogBuilder
     @Inject lateinit var exitCleanup: ExitCleanup
     @Inject lateinit var abpUserRules: AbpUserRules
@@ -2200,7 +2202,7 @@ abstract class WebBrowserActivity : ThemedBrowserActivity(),
                         && currentView.url.isNotBlank()
                         && !currentView.url.isSpecialUrl()) {
                     HistoryEntry(currentView.url, currentView.title).also {
-                        fulguris.utils.Utils.createShortcut(this, it, currentView.favicon)
+                        Utils.createShortcut(this, it, currentView.favicon)
                         Timber.d("Creating shortcut: ${it.title} ${it.url}")
                     }
                 }
@@ -2235,7 +2237,7 @@ abstract class WebBrowserActivity : ThemedBrowserActivity(),
                 return true
             }
             R.id.action_share -> {
-                fulguris.utils.IntentUtils(this).shareUrl(currentUrl, currentView?.title)
+                IntentUtils(this).shareUrl(currentUrl, currentView?.title)
                 return true
             }
             R.id.action_bookmarks -> {
@@ -3540,7 +3542,7 @@ abstract class WebBrowserActivity : ThemedBrowserActivity(),
         currentToolBarTextColor = foregroundColorFromBackgroundColor(color)
         // Change search view text color
         searchView.setTextColor(currentToolBarTextColor)
-        searchView.setHintTextColor(fulguris.utils.DrawableUtils.mixColor(0.5f, currentToolBarTextColor, color))
+        searchView.setHintTextColor(DrawableUtils.mixColor(0.5f, currentToolBarTextColor, color))
         // Change tab counter color
         iBindingToolbarContent.tabsButton.apply {
             textColor = currentToolBarTextColor
@@ -3609,7 +3611,7 @@ abstract class WebBrowserActivity : ThemedBrowserActivity(),
         setSearchBarColors(color)
 
         // Progress bar background color
-        fulguris.utils.DrawableUtils.mixColor(0.5f, color, Color.WHITE).let {
+        DrawableUtils.mixColor(0.5f, color, Color.WHITE).let {
             // Set progress bar background color making sure it isn't too bright
             // That's notably making it more visible on lequipe.fr and bbc.com/sport
             // We hope this is going to work with most white themed website too
@@ -3778,8 +3780,8 @@ abstract class WebBrowserActivity : ThemedBrowserActivity(),
 
             return when (aInfo) {
                 HeaderInfo.Url -> tab.url
-                HeaderInfo.ShortUrl -> fulguris.utils.Utils.trimmedProtocolFromURL(tab.url)
-                HeaderInfo.Domain -> fulguris.utils.Utils.getDisplayDomainName(tab.url)
+                HeaderInfo.ShortUrl -> Utils.trimmedProtocolFromURL(tab.url)
+                HeaderInfo.Domain -> Utils.getDisplayDomainName(tab.url)
                 HeaderInfo.Title -> tab.title.ifBlank { getString(R.string.untitled) }
                 HeaderInfo.Session -> tabsManager.iCurrentSessionName
                 HeaderInfo.AppName -> getString(R.string.app_name)
@@ -3879,7 +3881,7 @@ abstract class WebBrowserActivity : ThemedBrowserActivity(),
      * Display downloads folder one way or another
      */
     private fun openDownloads() {
-        startActivity(fulguris.utils.Utils.getIntentForDownloads(this, userPreferences.downloadDirectory))
+        startActivity(Utils.getIntentForDownloads(this, userPreferences.downloadDirectory))
         // Our built-in downloads list did not display downloaded items properly
         // Not sure why, consider fixing it or just removing it altogether at some point
         //tabsManager.newTab(downloadPageInitializer,true)
@@ -4128,7 +4130,7 @@ abstract class WebBrowserActivity : ThemedBrowserActivity(),
                 putExtra("PhotoPath", cameraPhotoPath)
                 putExtra(
                         MediaStore.EXTRA_OUTPUT,
-                        Uri.fromFile(fulguris.utils.Utils.createImageFile().also { file ->
+                        Uri.fromFile(Utils.createImageFile().also { file ->
                             cameraPhotoPath = "file:${file.absolutePath}"
                         })
                 )

diff --git a/...rc/main/java/fulguris/widget/ImageView.kt → app/src/main/java/fulguris/view/ImageView.kt b/...rc/main/java/fulguris/widget/ImageView.kt → app/src/main/java/fulguris/view/ImageView.kt
@@ -20,7 +20,7 @@
  * All Rights Reserved.
  */
 
-package fulguris.widget
+package fulguris.view
 
 import android.content.Context
 import android.graphics.Canvas

diff --git a/...main/java/fulguris/widget/LinearLayout.kt → ...c/main/java/fulguris/view/LinearLayout.kt b/...main/java/fulguris/widget/LinearLayout.kt → ...c/main/java/fulguris/view/LinearLayout.kt
@@ -1,4 +1,4 @@
-package fulguris.widget
+package fulguris.view
 
 import android.content.Context
 import android.util.AttributeSet

diff --git a/app/src/main/res/layout/bookmark_drawer_view.xml b/app/src/main/res/layout/bookmark_drawer_view.xml
@@ -45,7 +45,7 @@
                 android:gravity="center_vertical"
                 android:orientation="horizontal">
 
-                <fulguris.widget.ImageView
+                <fulguris.view.ImageView
                     android:id="@+id/bookmark_back_button"
                     android:layout_width="?attr/actionBarSize"
                     android:layout_height="match_parent"

diff --git a/app/src/main/res/layout/bookmark_list_item.xml b/app/src/main/res/layout/bookmark_list_item.xml
@@ -28,7 +28,7 @@ android:focusableInTouchMode="true"
             android:gravity="center_vertical"
             android:orientation="horizontal">
 
-            <fulguris.widget.ImageView
+            <fulguris.view.ImageView
                 android:id="@+id/faviconBookmark"
                 android:layout_width="@dimen/material_grid_small_icon"
                 android:layout_height="@dimen/material_grid_small_icon"

diff --git a/app/src/main/res/layout/dialog_list_item.xml b/app/src/main/res/layout/dialog_list_item.xml
@@ -6,7 +6,7 @@
     android:gravity="center_vertical"
     android:orientation="horizontal">
 
-    <fulguris.widget.ImageView
+    <fulguris.view.ImageView
         android:id="@+id/icon"
         android:layout_width="@dimen/material_grid_small_icon"
         android:layout_height="@dimen/material_grid_small_icon"

diff --git a/app/src/main/res/layout/search.xml b/app/src/main/res/layout/search.xml
@@ -48,7 +48,7 @@
         android:focusable="true"
         >
 
-        <fulguris.widget.ImageView
+        <fulguris.view.ImageView
             android:id="@+id/search_ssl_status"
             android:layout_width="@dimen/material_grid_touch_small"
             android:layout_height="match_parent"

diff --git a/app/src/main/res/layout/tab_list_item.xml b/app/src/main/res/layout/tab_list_item.xml
@@ -30,7 +30,7 @@ android:focusableInTouchMode="true"
             android:layout_marginHorizontal="@dimen/material_grid_margin"
             android:weightSum="1">
 
-            <fulguris.widget.ImageView
+            <fulguris.view.ImageView
                 android:id="@+id/faviconTab"
                 android:layout_width="@dimen/material_grid_small_icon"
                 android:layout_height="@dimen/material_grid_small_icon"
@@ -56,7 +56,7 @@ android:focusableInTouchMode="true"
                 android:textAppearance="?android:attr/textAppearanceListItemSmall"
                 tools:text="My web page title is too long to fit in here much too long"/>
 
-            <fulguris.widget.ImageView
+            <fulguris.view.ImageView
                 android:id="@+id/deleteAction"
                 android:layout_width="@dimen/material_grid_touch_medium"
                 android:layout_height="match_parent"

diff --git a/app/src/main/res/layout/tab_list_item_horizontal.xml b/app/src/main/res/layout/tab_list_item_horizontal.xml
@@ -24,7 +24,7 @@
             android:paddingHorizontal="6dp"
             android:weightSum="1">
 
-            <fulguris.widget.ImageView
+            <fulguris.view.ImageView
                 android:id="@+id/faviconTab"
                 android:layout_width="20dp"
                 android:layout_height="20dp"
@@ -54,7 +54,7 @@
                 android:background="?attr/actionBarItemBackground"
                 android:gravity="center">
 
-                <fulguris.widget.ImageView
+                <fulguris.view.ImageView
                     android:id="@+id/deleteButton"
                     android:layout_width="20dp"
                     android:layout_height="20dp"

diff --git a/app/src/main/res/layout/toolbar.xml b/app/src/main/res/layout/toolbar.xml
@@ -27,7 +27,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content" />
 
-        <fulguris.widget.LinearLayout
+        <fulguris.view.LinearLayout
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"

diff --git a/app/src/main/res/layout/toolbar_button.xml b/app/src/main/res/layout/toolbar_button.xml
@@ -35,7 +35,7 @@
 
 
 
-    <fulguris.widget.ImageView
+    <fulguris.view.ImageView
 
         android:clickable="true"
         android:focusable="true"

diff --git a/app/src/main/res/layout/two_line_autocomplete.xml b/app/src/main/res/layout/two_line_autocomplete.xml
@@ -12,7 +12,7 @@
     android:paddingBottom="3dp"
     android:weightSum="1">
 
-    <fulguris.widget.ImageView
+    <fulguris.view.ImageView
         android:id="@+id/suggestionIcon"
         android:layout_width="@dimen/material_grid_small_icon"
         android:layout_height="@dimen/material_grid_small_icon"
@@ -46,7 +46,7 @@
             android:textColor="?attr/autoCompleteUrlColor" />
     </LinearLayout>
 
-    <fulguris.widget.ImageView
+    <fulguris.view.ImageView
         android:id="@+id/complete_search"
         android:layout_width="@dimen/material_grid_touch_small"
         android:layout_height="@dimen/material_grid_touch_small"

diff --git a/app/src/styx/res/layout/bookmark_drawer_view.xml b/app/src/styx/res/layout/bookmark_drawer_view.xml
@@ -28,7 +28,7 @@
                 android:gravity="center_vertical"
                 android:orientation="horizontal">
 
-                <fulguris.widget.ImageView
+                <fulguris.view.ImageView
                     android:id="@+id/bookmark_back_button"
                     android:layout_width="?attr/actionBarSize"
                     android:layout_height="match_parent"

diff --git a/app/src/styx/res/layout/bookmark_list_item.xml b/app/src/styx/res/layout/bookmark_list_item.xml
@@ -20,7 +20,7 @@
             android:background="?attr/trackColor"
             android:orientation="horizontal">
 
-            <fulguris.widget.ImageView
+            <fulguris.view.ImageView
                 android:id="@+id/faviconBookmark"
                 android:layout_width="24dp"
                 android:layout_height="24dp"

diff --git a/app/src/styx/res/layout/search.xml b/app/src/styx/res/layout/search.xml
@@ -19,7 +19,7 @@
         android:focusableInTouchMode="true"
         android:focusable="true">
 
-        <fulguris.widget.ImageView
+        <fulguris.view.ImageView
             android:id="@+id/search_ssl_status"
             android:layout_width="36dp"
             android:layout_height="match_parent"

diff --git a/app/src/styx/res/layout/tab_list_item.xml b/app/src/styx/res/layout/tab_list_item.xml
@@ -22,7 +22,7 @@
             android:orientation="horizontal"
             android:weightSum="1">
 
-            <fulguris.widget.ImageView
+            <fulguris.view.ImageView
                 android:id="@+id/faviconTab"
                 android:layout_width="24dp"
                 android:layout_height="24dp"
@@ -45,7 +45,7 @@
                 android:singleLine="true"
                 android:textAppearance="?attr/textAppearanceListItemSmall" />
 
-            <fulguris.widget.ImageView
+            <fulguris.view.ImageView
                 android:id="@+id/deleteAction"
                 android:layout_width="48dp"
                 android:layout_height="match_parent"

diff --git a/app/src/styx/res/layout/tab_list_item_horizontal.xml b/app/src/styx/res/layout/tab_list_item_horizontal.xml
@@ -23,7 +23,7 @@
             android:paddingHorizontal="6dp"
             android:weightSum="1">
 
-            <fulguris.widget.ImageView
+            <fulguris.view.ImageView
                 android:id="@+id/faviconTab"
                 android:layout_width="20dp"
                 android:layout_height="20dp"
@@ -53,7 +53,7 @@
                 android:background="?attr/actionBarItemBackground"
                 android:gravity="center">
 
-                <fulguris.widget.ImageView
+                <fulguris.view.ImageView
                     android:id="@+id/deleteButton"
                     android:layout_width="20dp"
                     android:layout_height="20dp"