Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update UI #5

Open
wants to merge 46 commits into
base: master
Choose a base branch
from
Open

Update UI #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
46 commits
Select commit Hold shift + click to select a range
d054f9b
pathdata line 77 changed
Frankdroid7 Aug 5, 2023
9a467b6
pathdata line 72 changed
Frankdroid7 Aug 5, 2023
e8db9b3
pathdata line 67 changed
Frankdroid7 Aug 5, 2023
7573223
pathdata line 62 changed
Frankdroid7 Aug 5, 2023
56edaf0
pathdata line 57 changed
Frankdroid7 Aug 5, 2023
f9d50c7
pathdata line 52 changed
Frankdroid7 Aug 5, 2023
7789154
pathdata line 47 changed
Frankdroid7 Aug 5, 2023
d6badcf
pathdata line 42 changed
Frankdroid7 Aug 5, 2023
2a1ccce
pathdata line 37 changed
Frankdroid7 Aug 5, 2023
6d49744
pathdata line 32 changed
Frankdroid7 Aug 5, 2023
3c17421
pathdata line 27 changed
Frankdroid7 Aug 5, 2023
07f8052
pathdata line 22 changed
Frankdroid7 Aug 5, 2023
438eabf
pathdata line 102 changed
Frankdroid7 Aug 5, 2023
f513103
pathdata line 101 changed
Frankdroid7 Aug 5, 2023
c44b9ac
pathdata line 9 changed
Frankdroid7 Aug 5, 2023
92d709c
pathdata line 6 changed
Frankdroid7 Aug 5, 2023
37ff7a5
pathdata line 3 changed
Frankdroid7 Aug 5, 2023
5a6c08d
pathdata line 4 changed
Frankdroid7 Aug 5, 2023
b4a6e56
pathdata line 14 changed
Frankdroid7 Aug 5, 2023
560179c
fixed lint
Frankdroid7 Aug 5, 2023
7699a0a
changed phrase
Frankdroid7 Dec 11, 2023
84dc1e9
changed variable name
Frankdroid7 Dec 11, 2023
c229b6c
started fixing variable name
Frankdroid7 Dec 11, 2023
d7e41b7
edited variable name
Frankdroid7 Dec 11, 2023
2014051
fixing wrong variable name
Frankdroid7 Dec 11, 2023
056499d
fixed variable name
Frankdroid7 Dec 11, 2023
e26235b
emptied space
Frankdroid7 Dec 11, 2023
5f1e94e
intiated path data change
Frankdroid7 Dec 11, 2023
232db7c
pathdata 2 change
Frankdroid7 Dec 11, 2023
c7509c0
pathdata 3 change
Frankdroid7 Dec 11, 2023
340b5e2
edited laucher file
Frankdroid7 Dec 11, 2023
b8db815
changed variable value
Frankdroid7 Dec 11, 2023
54d815f
reverted pathdata variable
Frankdroid7 Dec 11, 2023
50b33fb
image change
Frankdroid7 Dec 11, 2023
cd206fe
changed value to 40
Frankdroid7 Dec 11, 2023
c7a0d52
laucher file edited
Frankdroid7 Dec 11, 2023
7895102
laucher file background changed
Frankdroid7 Dec 11, 2023
3dcae71
line 107 ic_launcher change
Frankdroid7 Dec 11, 2023
a278928
pathdata line 97 changed
Frankdroid7 Dec 11, 2023
12a8ee3
pathdata line 92 changed
Frankdroid7 Dec 11, 2023
65a5a17
pathdata line 87 changed
Frankdroid7 Dec 11, 2023
a35b7a9
pathdata line 82 changed
Frankdroid7 Aug 5, 2023
729691d
removed line
Frankdroid7 Sep 19, 2024
a2ee043
edited source module
Frankdroid7 Sep 19, 2024
e6b0256
edited source module file
Frankdroid7 Sep 19, 2024
998efc9
changed text
Frankdroid7 Dec 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion app/src/main/java/com/muryno/muzic/App.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,5 @@ package com.muryno.muzic
import android.app.Application
import dagger.hilt.android.HiltAndroidApp


@HiltAndroidApp
class App : Application()
3 changes: 0 additions & 3 deletions app/src/main/java/com/muryno/muzic/di/ArtistDataSourceModule.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ import javax.inject.Singleton
@InstallIn(SingletonComponent::class)
class ArtistDataSourceModule {


@Provides
fun providerArtistAlbumApiToResponseDataMapper() =
ArtistAlbumApiToResponseDataMapper()
Expand All @@ -32,8 +31,6 @@ class ArtistDataSourceModule {
fun providerArtistApiToResponseDataMapper() =
ArtistApiToResponseDataMapper()



@Provides
fun providerArtistRemoteDataSource(
musicApiService: MusicApiService,
Expand Down
12 changes: 6 additions & 6 deletions app/src/main/java/com/muryno/muzic/utils/NetworkConnectionInterceptor.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ class NetworkConnectionInterceptor(context: Context) : Interceptor {
@RequiresApi(Build.VERSION_CODES.M)
override fun intercept(chain: Interceptor.Chain): Response {
if (isNetworkAvailable() == 0) {
throw NoInternetException("Make sure you have an active data connection")
throw NoInternetException("Ensure you have an active internet connection")
} else {
return chain.proceed(chain.request())
}
Expand All @@ -25,16 +25,16 @@ class NetworkConnectionInterceptor(context: Context) : Interceptor {
var result = 0 // Returns connection type. 0: none; 1: mobile data; 2: wifi
val cm =
applicationContext.getSystemService(Context.CONNECTIVITY_SERVICE) as? ConnectivityManager
val capabilities = cm?.getNetworkCapabilities(cm.activeNetwork)
if (capabilities != null) {
val networkCapabilities = cm?.getNetworkCapabilities(cm.activeNetwork)
if (networkCapabilities != null) {
when {
capabilities.hasTransport(NetworkCapabilities.TRANSPORT_WIFI) -> {
networkCapabilities.hasTransport(NetworkCapabilities.TRANSPORT_WIFI) -> {
result = 2
}
capabilities.hasTransport(NetworkCapabilities.TRANSPORT_CELLULAR) -> {
networkCapabilities.hasTransport(NetworkCapabilities.TRANSPORT_CELLULAR) -> {
result = 1
}
capabilities.hasTransport(NetworkCapabilities.TRANSPORT_VPN) -> {
networkCapabilities.hasTransport(NetworkCapabilities.TRANSPORT_VPN) -> {
result = 3
}
}
Expand Down
66 changes: 34 additions & 32 deletions app/src/main/res/drawable/ic_launcher_background.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,100 +1,102 @@
<?xml version="1.0" encoding="utf-8"?>
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="108dp"
android:height="108dp"
android:width="110dp"
android:height="112dp"
android:viewportWidth="108"
android:viewportHeight="108">
android:viewportHeight="107">

<path
android:fillColor="#3DDC84"
android:pathData="M0,0h108v108h-108z" />
android:pathData="M0,0h108v108h-108" />

<path
android:fillColor="#00000000"
android:pathData="M9,0L9,108"
android:pathData="M9,0L9,102"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M19,0L19,108"
android:pathData="M19,0L19,102"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M29,0L29,108"
android:pathData="M29,0L29,106"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M39,0L39,108"
android:pathData="M39,0L39,101"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M49,0L49,108"
android:pathData="M49,0L49,100"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M59,0L59,108"
android:pathData="M59,0L59,109"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M69,0L69,108"
android:pathData="M69,0L69,100"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M79,0L79,108"
android:pathData="M79,0L79,102"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M89,0L89,108"
android:pathData="M89,0L89,103"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M99,0L99,108"
android:pathData="M99,0L99,107"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M0,9L108,9"
android:pathData="M0,9L108,10"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M0,19L108,19"
android:pathData="M0,19L108,20"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M0,29L108,29"
android:pathData="M0,29L108,30"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M0,39L108,39"
android:pathData="M0,39L108,40"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M0,49L108,49"
android:pathData="M0,49L108,50"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M0,59L108,59"
android:pathData="M0,59L108,60"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M0,69L108,69"
android:pathData="M0,69L108,65"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M0,79L108,79"
android:pathData="M0,79L108,80"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
Expand All @@ -104,22 +106,22 @@
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M0,99L108,99"
android:pathData="M0,99L108,10"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M19,29L89,29"
android:pathData="M19,29L89,22"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M19,39L89,39"
android:pathData="M19,39L89,31"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M19,49L89,49"
android:pathData="M19,49L89,40"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
Expand All @@ -129,12 +131,12 @@
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M19,69L89,69"
android:pathData="M19,69L89,60"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M19,79L89,79"
android:pathData="M19,79L89,75"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
Expand All @@ -149,22 +151,22 @@
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M49,19L49,89"
android:pathData="M49,19L49,12"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M59,19L59,89"
android:pathData="M59,19L59,87"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M69,19L69,89"
android:pathData="M69,19L69,91"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M79,19L79,89"
android:pathData="M79,19L79,90"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
</vector>