antebudimir/tempus
1
0
Fork 0
mirror of https://github.com/antebudimir/tempus.git synced 2026-01-02 18:31:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Layouts XML cleanup

Browse source
This commit is contained in:
CappielloAntonio 2021-04-27 11:12:20 +02:00
parent 0a3a09e631
commit 1c0265c12e
45 changed files with 140 additions and 143 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/com/cappielloantonio/play/ui/fragment/AlbumCatalogueFragment.java
View file

@ -113,7 +113,7 @@ public class AlbumCatalogueFragment extends Fragment {
@Override
public void onCreateOptionsMenu(@NonNull Menu menu, @NonNull MenuInflater inflater) {
inflater.inflate(R.menu.album_catalogue_menu, menu);
inflater.inflate(R.menu.toolbar_menu, menu);
MenuItem searchItem = menu.findItem(R.id.action_search);

2
app/src/main/java/com/cappielloantonio/play/ui/fragment/ArtistCatalogueFragment.java
View file

@ -113,7 +113,7 @@ public class ArtistCatalogueFragment extends Fragment {
@Override
public void onCreateOptionsMenu(@NonNull Menu menu, @NonNull MenuInflater inflater) {
inflater.inflate(R.menu.album_catalogue_menu, menu);
inflater.inflate(R.menu.toolbar_menu, menu);
MenuItem searchItem = menu.findItem(R.id.action_search);

2
app/src/main/java/com/cappielloantonio/play/ui/fragment/GenreCatalogueFragment.java
View file

@ -126,7 +126,7 @@ public class GenreCatalogueFragment extends Fragment {
@Override
public void onCreateOptionsMenu(@NonNull Menu menu, @NonNull MenuInflater inflater) {
inflater.inflate(R.menu.album_catalogue_menu, menu);
inflater.inflate(R.menu.toolbar_menu, menu);
MenuItem searchItem = menu.findItem(R.id.action_search);

2
app/src/main/java/com/cappielloantonio/play/ui/fragment/PlaylistCatalogueFragment.java
View file

@ -109,7 +109,7 @@ public class PlaylistCatalogueFragment extends Fragment {
@Override
public void onCreateOptionsMenu(@NonNull Menu menu, @NonNull MenuInflater inflater) {
inflater.inflate(R.menu.album_catalogue_menu, menu);
inflater.inflate(R.menu.toolbar_menu, menu);
MenuItem searchItem = menu.findItem(R.id.action_search);

4
app/src/main/res/drawable/button_favorite_selector.xml
View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@drawable/ic_favorite" android:state_checked="true" android:color="@color/titleTextColor"/>
<item android:drawable="@drawable/ic_favorites_outlined" android:state_checked="false" android:color="@color/titleTextColor" />
<item android:color="@color/titleTextColor" android:drawable="@drawable/ic_favorite" android:state_checked="true" />
<item android:color="@color/titleTextColor" android:drawable="@drawable/ic_favorites_outlined" android:state_checked="false" />
</selector>

4
app/src/main/res/drawable/button_play_pause_selector.xml
View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@drawable/ic_play" android:state_checked="true" android:color="@color/titleTextColor"/>
<item android:drawable="@drawable/ic_pause" android:state_checked="false" android:color="@color/titleTextColor" />
<item android:color="@color/titleTextColor" android:drawable="@drawable/ic_play" android:state_checked="true" />
<item android:color="@color/titleTextColor" android:drawable="@drawable/ic_pause" android:state_checked="false" />
</selector>

6
app/src/main/res/drawable/gradient_backdrop_background_image.xml
View file

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<gradient
android:startColor="#00000000"
android:endColor="#FF121212"
android:angle="270"
android:dither="true" />
android:dither="true"
android:endColor="#FF121212"
android:startColor="#00000000" />
</shape>

6
app/src/main/res/drawable/gradient_discover_background_image.xml
View file

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<gradient
android:startColor="#00000000"
android:endColor="#FF000000"
android:angle="180"
android:dither="true" />
android:dither="true"
android:endColor="#FF000000"
android:startColor="#00000000" />
</shape>

4
app/src/main/res/drawable/ic_close.xml
View file

@ -1,9 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:tint="?attr/colorControlNormal"
android:viewportWidth="24"
android:viewportHeight="24"
android:tint="?attr/colorControlNormal">
android:viewportHeight="24">
<path
android:fillColor="@android:color/white"
android:pathData="M19,6.41L17.59,5 12,10.59 6.41,5 5,6.41 10.59,12 5,17.59 6.41,19 12,13.41 17.59,19 19,17.59 13.41,12z" />

4
app/src/main/res/drawable/ic_pause_white_24dp.xml
View file

@ -1,8 +1,8 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportHeight="24.0"
android:viewportWidth="24.0">
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:fillColor="#FFFFFFFF"
android:pathData="M6,19h4L10,5L6,5v14zM14,5v14h4L18,5h-4z" />

4
app/src/main/res/drawable/ic_play_arrow_white_24dp.xml
View file

@ -1,8 +1,8 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportHeight="24.0"
android:viewportWidth="24.0">
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:fillColor="#FFFFFFFF"
android:pathData="M8,5v14l11,-7z" />

4
app/src/main/res/drawable/ic_skip_next_white_24dp.xml
View file

@ -1,8 +1,8 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportHeight="24.0"
android:viewportWidth="24.0">
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:fillColor="#FFFFFFFF"
android:pathData="M6,18l8.5,-6L6,6v12zM16,6v12h2V6h-2z" />

4
app/src/main/res/drawable/ic_skip_previous_white_24dp.xml
View file

@ -1,8 +1,8 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportHeight="24.0"
android:viewportWidth="24.0">
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:fillColor="#FFFFFFFF"
android:pathData="M6,6h2v12L6,18zM9.5,12l8.5,6L18,6z" />

7
app/src/main/res/font/open_sans_font_family.xml
View file

@ -1,7 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<font-family
xmlns:app="http://schemas.android.com/apk/res-auto">
<font app:font="@font/regular" app:fontStyle="normal" app:fontWeight="400" />
<font app:font="@font/bold" app:fontStyle="normal" app:fontWeight="700" />
<font app:font="@font/extra_bold" app:fontStyle="normal" app:fontWeight="900" />
</font-family>

7
app/src/main/res/font/opensans.xml Normal file
View file

@ -0,0 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<font-family
xmlns:app="http://schemas.android.com/apk/res-auto">
<font app:font="@font/opensans_regular" app:fontStyle="normal" app:fontWeight="400" />
<font app:font="@font/opensans_bold" app:fontStyle="normal" app:fontWeight="700" />
<font app:font="@font/opensans_extra_bold" app:fontStyle="normal" app:fontWeight="900" />
</font-family>

0
app/src/main/res/font/bold.ttf → app/src/main/res/font/opensans_bold.ttf
View file

0
app/src/main/res/font/extra_bold.ttf → app/src/main/res/font/opensans_extra_bold.ttf
View file

0
app/src/main/res/font/regular.ttf → app/src/main/res/font/opensans_regular.ttf
View file

18
app/src/main/res/layout/bottom_sheet_album_dialog.xml
View file

@ -30,7 +30,7 @@
android:ellipsize="marquee"
android:focusable="true"
android:focusableInTouchMode="true"
android:fontFamily="@font/open_sans_font_family"
android:fontFamily="@font/opensans"
android:marqueeRepeatLimit="marquee_forever"
android:paddingStart="12dp"
android:paddingTop="8dp"
@ -49,7 +49,7 @@
android:id="@+id/album_artist_text_view"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:fontFamily="@font/open_sans_font_family"
android:fontFamily="@font/opensans"
android:paddingStart="12dp"
android:paddingEnd="12dp"
android:text="@string/label_placeholder"
@ -77,7 +77,7 @@
android:layout_height="wrap_content"
android:background="?attr/selectableItemBackground"
android:clickable="true"
android:fontFamily="@font/open_sans_font_family"
android:fontFamily="@font/opensans"
android:paddingStart="20dp"
android:paddingTop="12dp"
android:paddingEnd="20dp"
@ -93,7 +93,7 @@
android:layout_height="wrap_content"
android:background="?attr/selectableItemBackground"
android:clickable="true"
android:fontFamily="@font/open_sans_font_family"
android:fontFamily="@font/opensans"
android:paddingStart="20dp"
android:paddingTop="12dp"
android:paddingEnd="20dp"
@ -109,7 +109,7 @@
android:layout_height="wrap_content"
android:background="?attr/selectableItemBackground"
android:clickable="true"
android:fontFamily="@font/open_sans_font_family"
android:fontFamily="@font/opensans"
android:paddingStart="20dp"
android:paddingTop="12dp"
android:paddingEnd="20dp"
@ -125,7 +125,7 @@
android:layout_height="wrap_content"
android:background="?attr/selectableItemBackground"
android:clickable="true"
android:fontFamily="@font/open_sans_font_family"
android:fontFamily="@font/opensans"
android:paddingStart="20dp"
android:paddingTop="12dp"
android:paddingEnd="20dp"
@ -141,7 +141,7 @@
android:layout_height="wrap_content"
android:background="?attr/selectableItemBackground"
android:clickable="true"
android:fontFamily="@font/open_sans_font_family"
android:fontFamily="@font/opensans"
android:paddingStart="20dp"
android:paddingTop="12dp"
android:paddingEnd="20dp"
@ -157,7 +157,7 @@
android:layout_height="wrap_content"
android:background="?attr/selectableItemBackground"
android:clickable="true"
android:fontFamily="@font/open_sans_font_family"
android:fontFamily="@font/opensans"
android:paddingStart="20dp"
android:paddingTop="12dp"
android:paddingEnd="20dp"
@ -173,7 +173,7 @@
android:layout_height="wrap_content"
android:background="?attr/selectableItemBackground"
android:clickable="true"
android:fontFamily="@font/open_sans_font_family"
android:fontFamily="@font/opensans"
android:paddingStart="20dp"
android:paddingTop="12dp"
android:paddingEnd="20dp"

6
app/src/main/res/layout/bottom_sheet_artist_dialog.xml
View file

@ -30,7 +30,7 @@
android:ellipsize="marquee"
android:focusable="true"
android:focusableInTouchMode="true"
android:fontFamily="@font/open_sans_font_family"
android:fontFamily="@font/opensans"
android:marqueeRepeatLimit="marquee_forever"
android:paddingStart="12dp"
android:paddingEnd="12dp"
@ -63,7 +63,7 @@
android:layout_height="wrap_content"
android:background="?attr/selectableItemBackground"
android:clickable="true"
android:fontFamily="@font/open_sans_font_family"
android:fontFamily="@font/opensans"
android:paddingStart="20dp"
android:paddingTop="12dp"
android:paddingEnd="20dp"
@ -79,7 +79,7 @@
android:layout_height="wrap_content"
android:background="?attr/selectableItemBackground"
android:clickable="true"
android:fontFamily="@font/open_sans_font_family"
android:fontFamily="@font/opensans"
android:paddingStart="20dp"
android:paddingTop="12dp"
android:paddingEnd="20dp"

18
app/src/main/res/layout/bottom_sheet_song_dialog.xml
View file

@ -48,7 +48,7 @@
android:ellipsize="marquee"
android:focusable="true"
android:focusableInTouchMode="true"
android:fontFamily="@font/open_sans_font_family"
android:fontFamily="@font/opensans"
android:marqueeRepeatLimit="marquee_forever"
android:paddingStart="12dp"
android:paddingEnd="12dp"
@ -66,7 +66,7 @@
android:id="@+id/song_artist_text_view"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:fontFamily="@font/open_sans_font_family"
android:fontFamily="@font/opensans"
android:paddingStart="12dp"
android:paddingEnd="12dp"
android:text="@string/label_placeholder"
@ -106,7 +106,7 @@
android:layout_height="wrap_content"
android:background="?attr/selectableItemBackground"
android:clickable="true"
android:fontFamily="@font/open_sans_font_family"
android:fontFamily="@font/opensans"
android:paddingStart="20dp"
android:paddingTop="12dp"
android:paddingEnd="20dp"
@ -122,7 +122,7 @@
android:layout_height="wrap_content"
android:background="?attr/selectableItemBackground"
android:clickable="true"
android:fontFamily="@font/open_sans_font_family"
android:fontFamily="@font/opensans"
android:paddingStart="20dp"
android:paddingTop="12dp"
android:paddingEnd="20dp"
@ -138,7 +138,7 @@
android:layout_height="wrap_content"
android:background="?attr/selectableItemBackground"
android:clickable="true"
android:fontFamily="@font/open_sans_font_family"
android:fontFamily="@font/opensans"
android:paddingStart="20dp"
android:paddingTop="12dp"
android:paddingEnd="20dp"
@ -154,7 +154,7 @@
android:layout_height="wrap_content"
android:background="?attr/selectableItemBackground"
android:clickable="true"
android:fontFamily="@font/open_sans_font_family"
android:fontFamily="@font/opensans"
android:paddingStart="20dp"
android:paddingTop="12dp"
android:paddingEnd="20dp"
@ -170,7 +170,7 @@
android:layout_height="wrap_content"
android:background="?attr/selectableItemBackground"
android:clickable="true"
android:fontFamily="@font/open_sans_font_family"
android:fontFamily="@font/opensans"
android:paddingStart="20dp"
android:paddingTop="12dp"
android:paddingEnd="20dp"
@ -186,7 +186,7 @@
android:layout_height="wrap_content"
android:background="?attr/selectableItemBackground"
android:clickable="true"
android:fontFamily="@font/open_sans_font_family"
android:fontFamily="@font/opensans"
android:paddingStart="20dp"
android:paddingTop="12dp"
android:paddingEnd="20dp"
@ -202,7 +202,7 @@
android:layout_height="wrap_content"
android:background="?attr/selectableItemBackground"
android:clickable="true"
android:fontFamily="@font/open_sans_font_family"
android:fontFamily="@font/opensans"
android:paddingStart="20dp"
android:paddingTop="12dp"
android:paddingEnd="20dp"

2
app/src/main/res/layout/chip_search_filter_genre.xml
View file

@ -5,7 +5,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:checkable="true"
android:fontFamily="@font/open_sans_font_family"
android:fontFamily="@font/opensans"
android:gravity="center"
android:paddingLeft="8dp"
android:paddingRight="8dp"

2
app/src/main/res/layout/player_header_bottom_sheet.xml
View file

@ -36,7 +36,7 @@
style="@style/ItemSubtitleTextView"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:fontFamily="@font/open_sans_font_family"
android:fontFamily="@font/opensans"
android:paddingStart="8dp"
android:paddingEnd="8dp"
app:layout_constraintEnd_toStartOf="@+id/player_header_button"

9
app/src/main/res/menu/album_catalogue_menu.xml → app/src/main/res/menu/toolbar_menu.xml
View file

@ -1,14 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<menu
xmlns:android="http://schemas.android.com/apk/res/android"
<menu xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
<item
android:id="@+id/action_search"
android:icon="@drawable/ic_search"
android:title="Search"
app:showAsAction="ifRoom"
android:iconTint="@color/titleTextColor"
app:actionViewClass="android.widget.SearchView"/>
android:title="Search"
app:actionViewClass="android.widget.SearchView"
app:showAsAction="ifRoom" />
</menu>

9
app/src/main/res/navigation/nav_graph.xml
View file

@ -216,18 +216,15 @@
android:id="@+id/songBottomSheetDialog"
android:name="com.cappielloantonio.play.ui.fragment.bottomsheetdialog.SongBottomSheetDialog"
android:label="SongBottomSheetDialog"
tools:layout="@layout/bottom_sheet_song_dialog">
</dialog>
tools:layout="@layout/bottom_sheet_song_dialog" />
<dialog
android:id="@+id/artistBottomSheetDialog"
android:name="com.cappielloantonio.play.ui.fragment.bottomsheetdialog.ArtistBottomSheetDialog"
android:label="ArtistBottomSheetDialog"
tools:layout="@layout/bottom_sheet_artist_dialog">
</dialog>
tools:layout="@layout/bottom_sheet_artist_dialog" />
<dialog
android:id="@+id/albumBottomSheetDialog"
android:name="com.cappielloantonio.play.ui.fragment.bottomsheetdialog.AlbumBottomSheetDialog"
android:label="AlbumBottomSheetDialog"
tools:layout="@layout/bottom_sheet_album_dialog">
</dialog>
tools:layout="@layout/bottom_sheet_album_dialog" />
</navigation>

1
app/src/main/res/values-night/styles.xml
View file

@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<style name="AppTheme" parent="Theme.MaterialComponents.DayNight.NoActionBar">
<item name="colorPrimary">@color/colorPrimary</item>
<item name="colorPrimaryDark">@color/colorPrimaryDark</item>

24
app/src/main/res/xml/global_preferences.xml
View file

@ -1,5 +1,5 @@
<PreferenceScreen xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:android="http://schemas.android.com/apk/res/android">
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
<PreferenceCategory app:title="@string/general_header">
<ListPreference
app:defaultValue="400000000"
@ -49,19 +49,19 @@
<PreferenceCategory app:title="@string/sync_header">
<Preference
android:title="@string/music_sync"
android:key="@string/music_sync"
android:summary="@string/music_sync_caption" />
android:summary="@string/music_sync_caption"
android:title="@string/music_sync" />
<Preference
android:title="@string/genres_music_cross_sync"
android:key="@string/genres_music_cross_sync"
android:summary="@string/genres_music_cross_sync_caption" />
android:summary="@string/genres_music_cross_sync_caption"
android:title="@string/genres_music_cross_sync" />
<Preference
android:title="@string/playlist_song_cross_sync"
android:key="@string/playlist_song_cross_sync"
android:summary="@string/playlist_song_cross_sync_caption" />
android:summary="@string/playlist_song_cross_sync_caption"
android:title="@string/playlist_song_cross_sync" />
</PreferenceCategory>
@ -71,13 +71,13 @@
app:summary="@string/summary_about" />
<Preference
app:title="@string/title_version"
app:summary="@string/app_version" />
app:summary="@string/app_version"
app:title="@string/title_version" />
<!-- preference opens url in browser -->
<Preference
app:title="@string/github_page"
app:summary="@string/development">
app:summary="@string/development"
app:title="@string/github_page">
<intent
android:action="android.intent.action.VIEW"
android:data="@string/github_url" />