ari/my-firt-android-app
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

early release view (+ they call me ms. refactor)

Browse source
This commit is contained in:
ari melody 2024-09-14 02:21:40 +01:00
parent dc64cb65b1
commit 3b71cdb02a
Signed by: ari
GPG key ID: CF99829C92678188
22 changed files with 728 additions and 291 deletions
Download patch file Download diff file Expand all files Collapse all files

41
app/src/main/res/layout/activity_main.xml
View file

@ -30,12 +30,24 @@
android:textColor="?attr/colorOnSurface"
android:textSize="32sp" />
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/musicList"
<FrameLayout
android:id="@+id/musicListContainer"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginVertical="5dp"
app:layout_constraintTop_toBottomOf="@id/musicListHeader"/>
app:layout_constraintTop_toBottomOf="@id/musicListHeader">
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/musicList"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginVertical="5dp">
</androidx.recyclerview.widget.RecyclerView>
<ProgressBar
android:id="@+id/musicListThrobber"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginVertical="50dp"
app:layout_constraintTop_toBottomOf="@id/musicListHeader" />
</FrameLayout>
<TextView
android:id="@+id/artistListHeader"
@ -43,17 +55,28 @@
android:layout_height="wrap_content"
android:layout_marginHorizontal="10dp"
android:layout_marginVertical="10dp"
app:layout_constraintTop_toBottomOf="@id/musicList"
app:layout_constraintTop_toBottomOf="@id/musicListContainer"
android:textSize="32sp"
android:fontFamily="@font/inter_black"
android:textColor="?attr/colorOnSurface"
android:text="@string/artists_list_title" />
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/artistList"
<FrameLayout
android:id="@+id/artistListContainer"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginVertical="5dp"
app:layout_constraintTop_toBottomOf="@id/artistListHeader"/>
app:layout_constraintTop_toBottomOf="@id/artistListHeader">
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/artistList"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginVertical="5dp" />
<ProgressBar
android:id="@+id/artistListThrobber"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginVertical="50dp"
app:layout_constraintTop_toBottomOf="@id/musicListHeader" />
</FrameLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.core.widget.NestedScrollView>

54
app/src/main/res/layout/activity_view_release.xml Normal file
View file

@ -0,0 +1,54 @@
<?xml version="1.0" encoding="utf-8"?>
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/release_view"
android:theme="@style/AriDroid.Theme"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="?attr/colorSurface"
xmlns:app="http://schemas.android.com/apk/res-auto">
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingVertical="20dp">
<ImageView
android:id="@+id/release_artwork"
android:layout_width="match_parent"
android:layout_height="300dp"
app:layout_constraintTop_toTopOf="parent"
android:layout_marginTop="10dp"
android:contentDescription="@string/music_artwork_description"
android:scaleType="fitCenter"
android:src="@mipmap/default_music_art"/>
<TextView
android:id="@+id/release_title"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toBottomOf="@id/release_artwork"
android:layout_marginHorizontal="20dp"
android:layout_marginTop="10dp"
android:textSize="32sp"
android:textColor="?attr/colorOnSurface"
android:fontFamily="@font/inter_black"
android:textAlignment="center"
android:text="@string/default_release_title" />
<TextView
android:id="@+id/release_artist"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toBottomOf="@id/release_title"
android:layout_marginHorizontal="20dp"
android:layout_marginTop="-10dp"
android:textSize="16sp"
android:textColor="?attr/colorOnSurface"
android:fontFamily="@font/inter_bold"
android:textAlignment="center"
android:text="@string/default_artist" />
</androidx.constraintlayout.widget.ConstraintLayout>
</ScrollView>

19
app/src/main/res/layout/artist_list_item.xml
View file

@ -1,7 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.cardview.widget.CardView 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/musicItem"
android:theme="@style/AriDroid.Card"
android:layout_width="match_parent"
@ -28,7 +27,7 @@
android:id="@+id/artistAvatar"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:contentDescription="@string/music_artwork_description"
android:contentDescription="@string/artist_avatar_description"
android:src="@mipmap/ic_launcher"/>
</androidx.cardview.widget.CardView>
@ -49,7 +48,7 @@
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
android:fontFamily="@font/inter_bold"
android:textSize="16dp"
android:textSize="16sp"
android:textColor="?attr/colorOnSurface"
android:text="@string/default_artist_name" />
@ -61,23 +60,11 @@
android:paddingVertical="0dp"
android:text="@string/artist_website"
android:textColor="?attr/colorSurface"
android:textColorLink="#77B7CE"
android:textColorLink="?attr/colorOnSurface"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<!-- <TextView-->
<!-- android:id="@+id/artistID"-->
<!-- android:layout_width="wrap_content"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:layout_marginStart="5dp"-->
<!-- app:layout_constraintRight_toRightOf="parent"-->
<!-- app:layout_constraintTop_toTopOf="@id/artistName"-->
<!-- android:fontFamily="@font/monaspace"-->
<!-- android:textColor="@color/on_surface_dim"-->
<!-- android:text="@string/default_artist_id" />-->
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.cardview.widget.CardView>

82
app/src/main/res/layout/top_release_card.xml Normal file
View file

@ -0,0 +1,82 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:theme="@style/AriDroid.Theme"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?attr/colorSurface"
xmlns:app="http://schemas.android.com/apk/res-auto">
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/header_container"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:layout_constraintTop_toTopOf="parent">
<ImageView
android:id="@+id/release_artwork"
android:layout_width="match_parent"
android:layout_height="300dp"
app:layout_constraintTop_toTopOf="parent"
android:contentDescription="@string/music_artwork_description"
android:scaleType="centerCrop"
android:alpha="0.5"
android:src="@mipmap/default_music_art"/>
<androidx.cardview.widget.CardView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintLeft_toLeftOf="parent"
android:layout_marginTop="10dp"
android:layout_marginHorizontal="20dp"
app:cardBackgroundColor="?attr/colorPrimary"
app:cardCornerRadius="50dp">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginVertical="5dp"
android:layout_marginHorizontal="10dp"
android:fontFamily="@font/inter_bold"
android:textColor="?attr/colorOnPrimary"
android:text="@string/new_item" />
</androidx.cardview.widget.CardView>
<TextView
android:id="@+id/release_artist"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintBottom_toTopOf="@id/release_title"
android:layout_marginHorizontal="20dp"
android:layout_marginBottom="-14dp"
android:textSize="24sp"
android:textColor="?attr/colorOnSurface"
android:fontFamily="@font/inter_bold"
android:text="@string/default_artist" />
<TextView
android:id="@+id/release_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintBottom_toTopOf="@id/tap_to_view"
android:layout_marginHorizontal="20dp"
android:layout_marginBottom="-10dp"
android:textSize="40sp"
android:textColor="?attr/colorOnSurface"
android:fontFamily="@font/inter_black"
android:text="@string/default_release_title" />
<TextView
android:id="@+id/tap_to_view"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintBottom_toBottomOf="@id/release_artwork"
android:layout_marginHorizontal="20dp"
android:layout_marginBottom="10dp"
android:textSize="16sp"
android:textColor="?attr/colorOnSurface"
android:text="@string/tap_to_view" />
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout>

7
app/src/main/res/values-night/themes.xml
View file

@ -1,14 +1,17 @@
<resources>
<style name="AriDroid.Theme" parent="AriDroid.Base">
<item name="colorPrimary">@color/brand_green</item>
<item name="colorOnPrimary">@color/dark100</item>
<item name="colorSecondary">@color/brand_pink</item>
<item name="colorOnSecondary">@color/dark100</item>
<item name="colorSurface">@color/dark100</item>
<item name="colorOnSurface">@color/white90</item>
<item name="android:fontFamily">@font/inter</item>
<item name="colorOnSurfaceVariant">@color/white50</item>
</style>
<style name="AriDroid.Card" parent="AriDroid.Theme">
<item name="colorSurface">@color/dark90</item>
<item name="colorOnSurface">@color/white100</item>
<item name="colorOnSurface">@color/white90</item>
<item name="cornerRadius">10dp</item>
</style>
</resources>

4
app/src/main/res/values/colours.xml
View file

@ -1,11 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<color name="brand_green">#FFB7FD49</color>
<color name="brand_green_dark">#FF465E1F</color>
<color name="brand_green_dark">#FF5E7F2A</color>
<color name="brand_yellow">#FFF8E05B</color>
<color name="brand_yellow_dark">#FFC6A80F</color>
<color name="brand_pink">#FFF788FE</color>
<color name="brand_pink_dark">#FFDC62E5</color>
<color name="brand_pink_dark">#FFB448BB</color>
<color name="dark100">#FF000000</color>
<color name="dark90">#FF101010</color>

4
app/src/main/res/values/strings.xml
View file

@ -2,6 +2,9 @@
<string name="base_url">https://arimelody.me</string>
<string name="app_name">AriDroid</string>
<string name="new_item">NEW</string>
<string name="tap_to_view">Tap to view</string>
<string name="releases_list_title">Releases</string>
<string name="music_artwork_description">%s artwork</string>
<string name="default_release_title">Untitled Release</string>
@ -26,4 +29,5 @@
<string name="default_artist_name">Unknown Artist</string>
<string name="default_artist_id">artist001</string>
<string name="artist_website">Website</string>
<string name="artist_avatar_description">%s\'s avatar</string>
</resources>

8
app/src/main/res/values/themes.xml
View file

@ -4,11 +4,13 @@
</style>
<style name="AriDroid.Theme" parent="AriDroid.Base">
<item name="colorPrimary">@color/brand_green_dark</item>
<item name="colorSecondary">@color/brand_pink_dark</item>
<item name="colorPrimary">@color/brand_pink_dark</item>
<item name="colorOnPrimary">@color/white100</item>
<item name="colorSecondary">@color/brand_green_dark</item>
<item name="colorOnSecondary">@color/white100</item>
<item name="colorSurface">@color/white90</item>
<item name="colorOnSurfaceVariant">@color/white50</item>
<item name="colorOnSurface">@color/dark90</item>
<item name="colorOnSurfaceVariant">@color/dark50</item>
</style>
<style name="AriDroid.Card" parent="AriDroid.Theme">