Siklos/Metro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Code clean

Browse source
This commit is contained in:
h4h13 2020-02-25 12:14:46 +05:30
parent c42e9cb0df
commit 5bce11177f
12 changed files with 46 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

10
app/src/main/res/layout-land/fragment_banner_home.xml
View file

@ -12,14 +12,14 @@
~ See the GNU General Public License for more details.
-->
<androidx.core.widget.NestedScrollView android:id="@+id/container"
xmlns:android="http://schemas.android.com/apk/res/android"
<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/container"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginEnd="@dimen/toolbar_margin_horizontal"
android:layout_marginStart="@dimen/toolbar_margin_horizontal"
android:layout_marginEnd="@dimen/toolbar_margin_horizontal"
app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior">
<LinearLayout
@ -59,9 +59,9 @@
android:id="@+id/userImage"
android:layout_width="42dp"
android:layout_height="42dp"
android:layout_marginBottom="8dp"
android:layout_marginStart="16dp"
app:civ_border="false"
android:layout_marginBottom="8dp"
android:scaleType="centerCrop"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:retroCornerSize="21dp"

10
app/src/main/res/layout-land/fragment_home.xml
View file

@ -12,14 +12,14 @@
~ See the GNU General Public License for more details.
-->
<androidx.core.widget.NestedScrollView android:id="@+id/container"
xmlns:android="http://schemas.android.com/apk/res/android"
<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/container"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginEnd="@dimen/toolbar_margin_horizontal"
android:layout_marginStart="@dimen/toolbar_margin_horizontal"
android:layout_marginEnd="@dimen/toolbar_margin_horizontal"
app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior">
<androidx.constraintlayout.widget.ConstraintLayout
@ -30,10 +30,10 @@
android:id="@+id/userImage"
android:layout_width="42dp"
android:layout_height="42dp"
android:layout_marginBottom="8dp"
android:layout_marginStart="16dp"
android:layout_marginTop="16dp"
app:civ_border="false"
android:layout_marginBottom="8dp"
android:scaleType="centerCrop"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:retroCornerSize="21dp"

9
app/src/main/res/layout-xlarge/activity_user_info.xml
View file

@ -75,15 +75,16 @@
android:layout_gravity="bottom"
android:layout_margin="8dp">
<code.name.monkey.retromusic.views.CircularImageView
<code.name.monkey.retromusic.views.RetroShapeableImageView
android:id="@+id/userImage"
android:layout_width="72dp"
android:layout_height="72dp"
android:layout_gravity="center"
android:scaleType="centerCrop"
app:civ_border="false"
app:civ_shadow="false"
app:srcCompat="@drawable/ic_person_flat" />
app:retroCornerSize="36dp"
app:strokeWidth="2dp"
app:srcCompat="@drawable/ic_person_flat"
app:strokeColor="?attr/colorSurface" />
<androidx.appcompat.widget.AppCompatImageView
android:layout_width="wrap_content"

13
app/src/main/res/layout/activity_user_info.xml
View file

@ -17,8 +17,8 @@
<com.google.android.material.appbar.MaterialToolbar
android:id="@+id/toolbar"
style="@style/Toolbar"
app:title="@string/profile"
app:navigationIcon="@drawable/ic_keyboard_backspace_black_24dp"
app:title="@string/profile"
app:titleTextAppearance="@style/ToolbarTextAppearanceNormal" />
</com.google.android.material.appbar.AppBarLayout>
@ -88,17 +88,16 @@
app:layout_constraintStart_toStartOf="@+id/imageContainer"
app:layout_constraintTop_toBottomOf="@id/imageContainer">
<code.name.monkey.retromusic.views.CircularImageView
<code.name.monkey.retromusic.views.RetroShapeableImageView
android:id="@+id/userImage"
android:layout_width="72dp"
android:layout_height="72dp"
android:layout_gravity="center"
android:scaleType="centerCrop"
app:civ_border="true"
app:civ_border_color="?android:colorBackground"
app:civ_border_width="2dp"
app:civ_shadow="false"
app:srcCompat="@drawable/ic_person_flat" />
app:retroCornerSize="36dp"
app:srcCompat="@drawable/ic_person_flat"
app:strokeColor="?attr/colorSurface"
app:strokeWidth="2dp" />
<androidx.appcompat.widget.AppCompatImageView
android:layout_width="wrap_content"

8
app/src/main/res/layout/fragment_banner_home.xml
View file

@ -11,10 +11,10 @@
~ without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
~ See the GNU General Public License for more details.
-->
<androidx.core.widget.NestedScrollView android:id="@+id/container"
xmlns:android="http://schemas.android.com/apk/res/android"
<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/container"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior">
@ -59,9 +59,9 @@
android:id="@+id/userImage"
android:layout_width="42dp"
android:layout_height="42dp"
android:layout_marginBottom="8dp"
android:layout_marginStart="16dp"
app:civ_border="false"
android:layout_marginBottom="8dp"
android:scaleType="centerCrop"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:retroCornerSize="21dp"

4
app/src/main/res/layout/fragment_home.xml
View file

@ -24,16 +24,16 @@
android:layout_height="wrap_content">
<code.name.monkey.retromusic.views.RetroShapeableImageView
app:retroCornerSize="21dp"
android:id="@+id/userImage"
android:layout_width="42dp"
android:layout_height="42dp"
android:layout_marginStart="16dp"
android:layout_marginTop="16dp"
android:layout_marginBottom="8dp"
app:civ_border="false"
android:scaleType="centerCrop"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:retroCornerSize="21dp"
tools:srcCompat="@tools:sample/avatars" />
<com.google.android.material.textview.MaterialTextView

11
app/src/main/res/layout/sliding_music_panel_layout.xml
View file

@ -19,17 +19,14 @@
android:focusable="true"
android:visibility="gone" />
<com.google.android.material.card.MaterialCardView
<FrameLayout
android:id="@+id/slidingPanel"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?attr/colorSurface"
app:behavior_hideable="false"
app:behavior_peekHeight="0dp"
app:cardBackgroundColor="?attr/colorSurface"
app:cardCornerRadius="0dp"
app:cardUseCompatPadding="false"
app:layout_behavior="com.google.android.material.bottomsheet.BottomSheetBehavior"
app:strokeWidth="0dp">
app:layout_behavior="com.google.android.material.bottomsheet.BottomSheetBehavior">
<FrameLayout
android:id="@+id/playerFragmentContainer"
@ -43,7 +40,7 @@
android:layout_height="48dp"
tools:layout="@layout/fragment_mini_player" />
</com.google.android.material.card.MaterialCardView>
</FrameLayout>
<code.name.monkey.retromusic.views.BottomNavigationBarTinted
android:id="@+id/bottomNavigationView"