Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
M
Magisk
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
Magisk
Commits
922e36cf
Commit
922e36cf
authored
Mar 17, 2020
by
Viktor De Pasquale
Committed by
John Wu
Mar 26, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Updated the width of bottom navigation
parent
edff0946
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
17 additions
and
3 deletions
+17
-3
build.gradle
app/build.gradle
+1
-1
activity_main_md2.xml
app/src/main/res/layout/activity_main_md2.xml
+15
-2
styles_md2_appearance.xml
app/src/main/res/values/styles_md2_appearance.xml
+1
-0
No files found.
app/build.gradle
View file @
922e36cf
...
@@ -131,5 +131,5 @@ dependencies {
...
@@ -131,5 +131,5 @@ dependencies {
implementation
'androidx.transition:transition:1.3.1'
implementation
'androidx.transition:transition:1.3.1'
implementation
'androidx.multidex:multidex:2.0.1'
implementation
'androidx.multidex:multidex:2.0.1'
implementation
'androidx.core:core-ktx:1.2.0'
implementation
'androidx.core:core-ktx:1.2.0'
implementation
'com.google.android.material:material:1.2.0-alpha0
3
'
implementation
'com.google.android.material:material:1.2.0-alpha0
5
'
}
}
app/src/main/res/layout/activity_main_md2.xml
View file @
922e36cf
...
@@ -14,7 +14,6 @@
...
@@ -14,7 +14,6 @@
<androidx.coordinatorlayout.widget.CoordinatorLayout
<androidx.coordinatorlayout.widget.CoordinatorLayout
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
android:layout_height=
"match_parent"
android:background=
"?colorSurface"
android:orientation=
"vertical"
android:orientation=
"vertical"
android:paddingLeft=
"@{viewModel.insets.left}"
android:paddingLeft=
"@{viewModel.insets.left}"
android:paddingRight=
"@{viewModel.insets.right}"
android:paddingRight=
"@{viewModel.insets.right}"
...
@@ -43,10 +42,21 @@
...
@@ -43,10 +42,21 @@
</com.google.android.material.appbar.AppBarLayout>
</com.google.android.material.appbar.AppBarLayout>
<!--
todo(diareuse) this stupid-ass bottom menu doesn't fit with the fab-s, so either of those
things need to be removed, probably the fab-s.
Using the BottomAppBar is not viable as it looks terrible with the blank space in the
middle and / or with the "animation" which BottomNavigationView performs when it's
reinflating its menu items. This bullshit cockblocks the entire feature. Terrific.
Possibility is then to keep the middle fab and assign it some other functionality on all
screens. Which -ha-ha- good luck finding something on superuser and homepage...
-->
<com.google.android.material.card.MaterialCardView
<com.google.android.material.card.MaterialCardView
android:id=
"@+id/main_bottom_bar"
android:id=
"@+id/main_bottom_bar"
style=
"@style/WidgetFoundation.Card.Elevated"
style=
"@style/WidgetFoundation.Card.Elevated"
android:layout_width=
"
192
dp"
android:layout_width=
"
224
dp"
android:layout_height=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_gravity=
"bottom|center_horizontal"
android:layout_gravity=
"bottom|center_horizontal"
android:layout_marginStart=
"@dimen/l1"
android:layout_marginStart=
"@dimen/l1"
...
@@ -65,8 +75,11 @@
...
@@ -65,8 +75,11 @@
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:layout_height=
"wrap_content"
android:background=
"@android:color/transparent"
android:background=
"@android:color/transparent"
android:textStyle=
"bold"
app:elevation=
"0dp"
app:elevation=
"0dp"
app:itemHorizontalTranslationEnabled=
"false"
app:itemIconTint=
"@color/color_menu_tint"
app:itemIconTint=
"@color/color_menu_tint"
app:itemRippleColor=
"?colorPrimary"
app:itemTextAppearanceActive=
"@style/AppearanceFoundation.Tiny.Bold"
app:itemTextAppearanceActive=
"@style/AppearanceFoundation.Tiny.Bold"
app:itemTextAppearanceInactive=
"@style/AppearanceFoundation.Tiny.Bold"
app:itemTextAppearanceInactive=
"@style/AppearanceFoundation.Tiny.Bold"
app:itemTextColor=
"@color/color_menu_tint"
app:itemTextColor=
"@color/color_menu_tint"
...
...
app/src/main/res/values/styles_md2_appearance.xml
View file @
922e36cf
...
@@ -103,6 +103,7 @@
...
@@ -103,6 +103,7 @@
<style
name=
"AppearanceFoundation.Tiny.Bold"
>
<style
name=
"AppearanceFoundation.Tiny.Bold"
>
<item
name=
"android:textStyle"
>
bold
</item>
<item
name=
"android:textStyle"
>
bold
</item>
<item
name=
"android:fontFamily"
>
@font/exo_bold
</item>
</style>
</style>
<style
name=
"AppearanceFoundation.Tiny.Variant"
>
<style
name=
"AppearanceFoundation.Tiny.Variant"
>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment