blallo
/
fenix
1
0
Fork 0
Code Releases Activity

For #10525 - Remove tab tray item dividers.

master
person808 2020-06-04 14:41:50 -07:00 committed by Jeff Boek
parent 094f3d0c97
commit 8c47b988b8
6 changed files with 6 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
app/src/main/java/org/mozilla/fenix/HomeActivity.kt
View File

@ -15,7 +15,6 @@ import androidx.annotation.IdRes
import androidx.annotation.VisibleForTesting
import androidx.annotation.VisibleForTesting.PROTECTED
import androidx.appcompat.app.ActionBar
import androidx.appcompat.content.res.AppCompatResources
import androidx.appcompat.widget.Toolbar
import androidx.core.view.doOnPreDraw
import androidx.lifecycle.lifecycleScope
@ -24,7 +23,6 @@ import androidx.navigation.NavDirections
import androidx.navigation.fragment.NavHostFragment
import androidx.navigation.ui.AppBarConfiguration
import androidx.navigation.ui.NavigationUI
import androidx.recyclerview.widget.DividerItemDecoration
import androidx.recyclerview.widget.LinearLayoutManager
import kotlinx.android.synthetic.main.activity_home.*
import kotlinx.coroutines.CoroutineScope
@ -54,17 +52,17 @@ import org.mozilla.fenix.browser.browsingmode.DefaultBrowsingModeManager
import org.mozilla.fenix.components.metrics.BreadcrumbsRecorder
import org.mozilla.fenix.components.metrics.Event
import org.mozilla.fenix.exceptions.ExceptionsFragmentDirections
import org.mozilla.fenix.ext.checkAndUpdateScreenshotPermission
import org.mozilla.fenix.ext.nav
import org.mozilla.fenix.ext.alreadyOnDestination
import org.mozilla.fenix.ext.settings
import org.mozilla.fenix.ext.checkAndUpdateScreenshotPermission
import org.mozilla.fenix.ext.components
import org.mozilla.fenix.ext.nav
import org.mozilla.fenix.ext.settings
import org.mozilla.fenix.home.HomeFragmentDirections
import org.mozilla.fenix.home.intent.CrashReporterIntentProcessor
import org.mozilla.fenix.home.intent.DeepLinkIntentProcessor
import org.mozilla.fenix.home.intent.OpenBrowserIntentProcessor
import org.mozilla.fenix.home.intent.StartSearchIntentProcessor
import org.mozilla.fenix.home.intent.CrashReporterIntentProcessor
import org.mozilla.fenix.home.intent.SpeechProcessingIntentProcessor
import org.mozilla.fenix.home.intent.StartSearchIntentProcessor
import org.mozilla.fenix.library.bookmarks.BookmarkFragmentDirections
import org.mozilla.fenix.library.history.HistoryFragmentDirections
import org.mozilla.fenix.perf.Performance
@ -235,20 +233,11 @@ open class HomeActivity : LocaleAwareAppCompatActivity() {
}
val adapter = FenixTabsAdapter(context)
val decoration = DividerItemDecoration(
context,
DividerItemDecoration.VERTICAL
)
val drawable = AppCompatResources.getDrawable(context, R.drawable.tab_tray_divider)
drawable?.let {
decoration.setDrawable(it)
}
BrowserTabsTray(
context,
attrs,
tabsAdapter = adapter,
layout = layout,
itemDecoration = decoration
layout = layout
)
}
else -> super.onCreateView(parent, name, context, attrs)

12
app/src/main/res/drawable/tab_tray_divider.xml
View File

@ -1,12 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Do this along with adding your values and values-ldrtl dimensions. -->
<inset xmlns:android="http://schemas.android.com/apk/res/android"
android:insetLeft="@dimen/tab_tray_divider_margin_start"
android:insetRight="@dimen/tab_tray_divider_margin_end">
<shape>
<size android:height="1dp"/>
<solid android:color="@color/tab_tray_item_divider_normal_theme" />
</shape>
</inset>

4
app/src/main/res/values-ldrtl/dimens.xml
View File

@ -5,8 +5,4 @@
<resources>
<!-- Onboarding -->
<dimen name="onboarding_dual_pane_radio_button_translation_x">7dp</dimen>
<!-- Tabs Tray -->
<dimen name="tab_tray_divider_margin_start">0dp</dimen>
<dimen name="tab_tray_divider_margin_end">124dp</dimen>
</resources>

1
app/src/main/res/values/attrs.xml
View File

@ -54,7 +54,6 @@
<attr name="tabTrayItemBackground" format="reference" />
<attr name="tabTrayItemSelectedBackground" format="reference" />
<attr name="tabTrayToolbarBackground" format="reference" />
<attr name="tabTrayItemDivider" format="reference" />
<attr name="tabTrayItemMediaBackground" format="reference" />
<attr name="tabTrayHeadingIcon" format="reference" />
<attr name="tabTrayHeadingIconInactive" format="reference" />

2
app/src/main/res/values/dimens.xml
View File

@ -148,8 +148,6 @@
<dimen name="addon_details_rating_view_margin_end">6dp</dimen>
<!-- Tabs Tray -->
<dimen name="tab_tray_divider_margin_start">124dp</dimen>
<dimen name="tab_tray_divider_margin_end">0dp</dimen>
<dimen name="tab_tray_top_offset">40dp</dimen>
<!-- Saved Logins Fragment -->

2
app/src/main/res/values/styles.xml
View File

@ -77,7 +77,6 @@
<item name="tabTrayItemBackground">@color/tab_tray_item_background_normal_theme</item>
<item name="tabTrayItemSelectedBackground">@color/tab_tray_item_selected_background_normal_theme</item>
<item name="tabTrayToolbarBackground">@color/tab_tray_toolbar_background_normal_theme</item>
<item name="tabTrayItemDivider">@color/tab_tray_item_divider_normal_theme</item>
<item name="tabTrayItemMediaBackground">@color/tab_tray_item_media_background_normal_theme</item>
<item name="tabTrayHeadingIcon">@color/tab_tray_heading_icon_normal_theme</item>
<item name="tabTrayHeadingIconInactive">@color/tab_tray_heading_icon_inactive_normal_theme</item>
@ -203,7 +202,6 @@
<item name="tabTrayItemBackground">@color/tab_tray_item_background_normal_theme</item>
<item name="tabTrayItemSelectedBackground">@color/tab_tray_item_selected_background_private_theme</item>
<item name="tabTrayToolbarBackground">@color/tab_tray_toolbar_background_private_theme</item>
<item name="tabTrayItemDivider">@color/tab_tray_item_divider_private_theme</item>
<item name="tabTrayItemMediaBackground">@color/tab_tray_item_media_background_private_theme</item>
<item name="tabTrayHeadingIcon">@color/tab_tray_heading_icon_dark_theme</item>
<item name="tabTrayHeadingIconInactive">@color/tab_tray_heading_icon_inactive_dark_theme</item>