diff --git a/app/src/main/java/fulguris/activity/WebBrowserActivity.kt b/app/src/main/java/fulguris/activity/WebBrowserActivity.kt index bd51d7b9f..b734e1585 100644 --- 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/app/src/main/java/fulguris/widget/ImageView.kt b/app/src/main/java/fulguris/view/ImageView.kt similarity index 98% rename from app/src/main/java/fulguris/widget/ImageView.kt rename to app/src/main/java/fulguris/view/ImageView.kt index 8afbd7946..8c4cb01ee 100644 --- a/app/src/main/java/fulguris/widget/ImageView.kt +++ b/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/app/src/main/java/fulguris/widget/LinearLayout.kt b/app/src/main/java/fulguris/view/LinearLayout.kt similarity index 97% rename from app/src/main/java/fulguris/widget/LinearLayout.kt rename to app/src/main/java/fulguris/view/LinearLayout.kt index fd6fe53d8..feb387346 100644 --- a/app/src/main/java/fulguris/widget/LinearLayout.kt +++ b/app/src/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 index 4f25e8197..cce519679 100644 --- 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"> - - - - - - - - - - - - - - - - - -