Skip to content

7주차_미션_해리/박상재 #27

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

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

7주차_미션_해리/박상재 #27

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2f02059
7주차
saojaem May 27, 2024
3f50f7a
8주차 미션 해리/박상재
saojaem Jun 2, 2024
916b770
10주차 미션
saojaem Jun 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
Binary file modified 해리_박상재/UMCflo/.gradle/8.4/checksums/checksums.lock
View file
Open in desktop
Binary file not shown.
Binary file modified 해리_박상재/UMCflo/.gradle/8.4/checksums/md5-checksums.bin
View file
Open in desktop
Binary file not shown.
Binary file modified 해리_박상재/UMCflo/.gradle/8.4/checksums/sha1-checksums.bin
View file
Open in desktop
Binary file not shown.
Binary file modified 해리_박상재/UMCflo/.gradle/8.4/dependencies-accessors/dependencies-accessors.lock
View file
Open in desktop
Binary file not shown.
Binary file modified 해리_박상재/UMCflo/.gradle/8.4/executionHistory/executionHistory.bin
View file
Open in desktop
Binary file not shown.
Binary file modified 해리_박상재/UMCflo/.gradle/8.4/executionHistory/executionHistory.lock
View file
Open in desktop
Binary file not shown.
Binary file modified 해리_박상재/UMCflo/.gradle/8.4/fileHashes/fileHashes.bin
View file
Open in desktop
Binary file not shown.
Binary file modified 해리_박상재/UMCflo/.gradle/8.4/fileHashes/fileHashes.lock
View file
Open in desktop
Binary file not shown.
Binary file modified 해리_박상재/UMCflo/.gradle/8.4/fileHashes/resourceHashesCache.bin
View file
Open in desktop
Binary file not shown.
Binary file modified 해리_박상재/UMCflo/.gradle/buildOutputCleanup/buildOutputCleanup.lock
View file
Open in desktop
Binary file not shown.
Binary file modified 해리_박상재/UMCflo/.gradle/buildOutputCleanup/outputFiles.bin
View file
Open in desktop
Binary file not shown.
Binary file modified 해리_박상재/UMCflo/.gradle/file-system.probe
View file
Open in desktop
Binary file not shown.
17 changes: 9 additions & 8 deletions 해리_박상재/UMCflo/.idea/workspace.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

17 changes: 12 additions & 5 deletions 해리_박상재/UMCflo/app/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
plugins {
alias(libs.plugins.androidApplication)
alias(libs.plugins.jetbrainsKotlinAndroid)
id("com.android.application")
id("org.jetbrains.kotlin.android")
id("kotlin-kapt")
}

android {
Expand All @@ -27,18 +28,24 @@ android {
}
}
compileOptions {
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
}
kotlinOptions {
jvmTarget = "1.8"
jvmTarget = JavaVersion.VERSION_17.toString()
}
buildFeatures{
viewBinding = true
}

}

dependencies {
implementation("androidx.room:room-migration:2.6.0")
implementation("androidx.room:room-runtime:2.6.0")
kapt("androidx.room:room-compiler:2.6.0")


implementation ("com.google.code.gson:gson:2.8.7")
implementation("me.relex:circleindicator:2.1.6")
implementation(libs.androidx.core.ktx)
Expand Down
101 changes: 51 additions & 50 deletions ...g_base_class_source_out/debug/out/com/example/umcflo/databinding/ActivitySongBinding.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,18 +32,9 @@ public final class ActivitySongBinding implements ViewBinding {
@NonNull
public final ImageView listIv;

@NonNull
public final ImageButton lowerIb;

@NonNull
public final TextView lyrics01Iv;

@NonNull
public final TextView musicTitleTv;

@NonNull
public final ImageView playerLikeIv;

@NonNull
public final LinearLayout playerLikeIvLayout;

Expand All @@ -63,20 +54,26 @@ public final class ActivitySongBinding implements ViewBinding {
public final ImageButton settingIb;

@NonNull
public final TextView singerNameTv;
public final ImageView songAlbumIv;

@NonNull
public final ImageView songAlbumIUIv;
public final ImageButton songDownIb;

@NonNull
public final TextView songEndTimeTv;

@NonNull
public final ImageView songLikeIv;

@NonNull
public final ImageView songMiniplayerIv;

@NonNull
public final TextView songMusicLyrics02Iv;

@NonNull
public final TextView songMusicTitleTv;

@NonNull
public final ImageView songNextIv;

Expand All @@ -95,49 +92,53 @@ public final class ActivitySongBinding implements ViewBinding {
@NonNull
public final ImageView songRepeatIv;

@NonNull
public final TextView songSingerNameTv;

@NonNull
public final ImageView songSingerPlusIv;

@NonNull
public final TextView songStartTimeTv;

private ActivitySongBinding(@NonNull ConstraintLayout rootView, @NonNull ImageButton eqIb,
@NonNull ImageView instagramIv, @NonNull ImageView listIv, @NonNull ImageButton lowerIb,
@NonNull TextView lyrics01Iv, @NonNull TextView musicTitleTv, @NonNull ImageView playerLikeIv,
@NonNull ImageView instagramIv, @NonNull ImageView listIv, @NonNull TextView lyrics01Iv,
@NonNull LinearLayout playerLikeIvLayout, @NonNull ImageView playerUnlikeIv,
@NonNull ImageButton plusIb, @NonNull ImageView randomIv, @NonNull ImageView relatedIv,
@NonNull ImageButton settingIb, @NonNull TextView singerNameTv,
@NonNull ImageView songAlbumIUIv, @NonNull TextView songEndTimeTv,
@NonNull ImageView songMiniplayerIv, @NonNull TextView songMusicLyrics02Iv,
@NonNull ImageButton settingIb, @NonNull ImageView songAlbumIv,
@NonNull ImageButton songDownIb, @NonNull TextView songEndTimeTv,
@NonNull ImageView songLikeIv, @NonNull ImageView songMiniplayerIv,
@NonNull TextView songMusicLyrics02Iv, @NonNull TextView songMusicTitleTv,
@NonNull ImageView songNextIv, @NonNull ImageView songPauseIv,
@NonNull LinearLayout songPlayerLayout, @NonNull ImageView songPreviousIv,
@NonNull SeekBar songProgressSb, @NonNull ImageView songRepeatIv,
@NonNull ImageView songSingerPlusIv, @NonNull TextView songStartTimeTv) {
@NonNull TextView songSingerNameTv, @NonNull ImageView songSingerPlusIv,
@NonNull TextView songStartTimeTv) {
this.rootView = rootView;
this.eqIb = eqIb;
this.instagramIv = instagramIv;
this.listIv = listIv;
this.lowerIb = lowerIb;
this.lyrics01Iv = lyrics01Iv;
this.musicTitleTv = musicTitleTv;
this.playerLikeIv = playerLikeIv;
this.playerLikeIvLayout = playerLikeIvLayout;
this.playerUnlikeIv = playerUnlikeIv;
this.plusIb = plusIb;
this.randomIv = randomIv;
this.relatedIv = relatedIv;
this.settingIb = settingIb;
this.singerNameTv = singerNameTv;
this.songAlbumIUIv = songAlbumIUIv;
this.songAlbumIv = songAlbumIv;
this.songDownIb = songDownIb;
this.songEndTimeTv = songEndTimeTv;
this.songLikeIv = songLikeIv;
this.songMiniplayerIv = songMiniplayerIv;
this.songMusicLyrics02Iv = songMusicLyrics02Iv;
this.songMusicTitleTv = songMusicTitleTv;
this.songNextIv = songNextIv;
this.songPauseIv = songPauseIv;
this.songPlayerLayout = songPlayerLayout;
this.songPreviousIv = songPreviousIv;
this.songProgressSb = songProgressSb;
this.songRepeatIv = songRepeatIv;
this.songSingerNameTv = songSingerNameTv;
this.songSingerPlusIv = songSingerPlusIv;
this.songStartTimeTv = songStartTimeTv;
}
Expand Down Expand Up @@ -187,30 +188,12 @@ public static ActivitySongBinding bind(@NonNull View rootView) {
break missingId;
}

id = R.id.lower_ib;
ImageButton lowerIb = ViewBindings.findChildViewById(rootView, id);
if (lowerIb == null) {
break missingId;
}

id = R.id.lyrics_01_iv;
TextView lyrics01Iv = ViewBindings.findChildViewById(rootView, id);
if (lyrics01Iv == null) {
break missingId;
}

id = R.id.music_title_tv;
TextView musicTitleTv = ViewBindings.findChildViewById(rootView, id);
if (musicTitleTv == null) {
break missingId;
}

id = R.id.player_like_iv;
ImageView playerLikeIv = ViewBindings.findChildViewById(rootView, id);
if (playerLikeIv == null) {
break missingId;
}

id = R.id.player_like_iv_layout;
LinearLayout playerLikeIvLayout = ViewBindings.findChildViewById(rootView, id);
if (playerLikeIvLayout == null) {
Expand Down Expand Up @@ -247,15 +230,15 @@ public static ActivitySongBinding bind(@NonNull View rootView) {
break missingId;
}

id = R.id.singer_name_tv;
TextView singerNameTv = ViewBindings.findChildViewById(rootView, id);
if (singerNameTv == null) {
id = R.id.song_album_iv;
ImageView songAlbumIv = ViewBindings.findChildViewById(rootView, id);
if (songAlbumIv == null) {
break missingId;
}

id = R.id.song_album_IU_iv;
ImageView songAlbumIUIv = ViewBindings.findChildViewById(rootView, id);
if (songAlbumIUIv == null) {
id = R.id.song_down_ib;
ImageButton songDownIb = ViewBindings.findChildViewById(rootView, id);
if (songDownIb == null) {
break missingId;
}

Expand All @@ -265,6 +248,12 @@ public static ActivitySongBinding bind(@NonNull View rootView) {
break missingId;
}

id = R.id.song_like_iv;
ImageView songLikeIv = ViewBindings.findChildViewById(rootView, id);
if (songLikeIv == null) {
break missingId;
}

id = R.id.song_miniplayer_iv;
ImageView songMiniplayerIv = ViewBindings.findChildViewById(rootView, id);
if (songMiniplayerIv == null) {
Expand All @@ -277,6 +266,12 @@ public static ActivitySongBinding bind(@NonNull View rootView) {
break missingId;
}

id = R.id.song_music_title_tv;
TextView songMusicTitleTv = ViewBindings.findChildViewById(rootView, id);
if (songMusicTitleTv == null) {
break missingId;
}

id = R.id.song_next_iv;
ImageView songNextIv = ViewBindings.findChildViewById(rootView, id);
if (songNextIv == null) {
Expand Down Expand Up @@ -313,6 +308,12 @@ public static ActivitySongBinding bind(@NonNull View rootView) {
break missingId;
}

id = R.id.song_singer_name_tv;
TextView songSingerNameTv = ViewBindings.findChildViewById(rootView, id);
if (songSingerNameTv == null) {
break missingId;
}

id = R.id.song_singer_plus_iv;
ImageView songSingerPlusIv = ViewBindings.findChildViewById(rootView, id);
if (songSingerPlusIv == null) {
Expand All @@ -326,10 +327,10 @@ public static ActivitySongBinding bind(@NonNull View rootView) {
}

return new ActivitySongBinding((ConstraintLayout) rootView, eqIb, instagramIv, listIv,
lowerIb, lyrics01Iv, musicTitleTv, playerLikeIv, playerLikeIvLayout, playerUnlikeIv,
plusIb, randomIv, relatedIv, settingIb, singerNameTv, songAlbumIUIv, songEndTimeTv,
songMiniplayerIv, songMusicLyrics02Iv, songNextIv, songPauseIv, songPlayerLayout,
songPreviousIv, songProgressSb, songRepeatIv, songSingerPlusIv, songStartTimeTv);
lyrics01Iv, playerLikeIvLayout, playerUnlikeIv, plusIb, randomIv, relatedIv, settingIb,
songAlbumIv, songDownIb, songEndTimeTv, songLikeIv, songMiniplayerIv, songMusicLyrics02Iv,
songMusicTitleTv, songNextIv, songPauseIv, songPlayerLayout, songPreviousIv,
songProgressSb, songRepeatIv, songSingerNameTv, songSingerPlusIv, songStartTimeTv);
}
String missingId = rootView.getResources().getResourceName(id);
throw new NullPointerException("Missing required view with ID: ".concat(missingId));
Expand Down
2 changes: 1 addition & 1 deletion ...termediates/annotation_processor_list/debug/javaPreCompileDebug/annotationProcessors.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{}
{"room-compiler-2.6.0.jar (androidx.room:room-compiler:2.6.0)":"KSP_PROCESSOR"}
Binary file modified 해리_박상재/UMCflo/app/build/intermediates/apk/debug/app-debug.apk
View file
Open in desktop
Binary file not shown.
Binary file modified ...mediates/compile_and_runtime_not_namespaced_r_class_jar/debug/processDebugResources/R.jar
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion ...ata_binding_layout_info_type_merge/debug/mergeDebugResources/out/activity_song-layout.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?><Layout layout="activity_song" modulePackage="com.example.umcflo" filePath="app\src\main\res\layout\activity_song.xml" directory="layout" isMerge="false" isBindingData="false" rootNodeType="androidx.constraintlayout.widget.ConstraintLayout"><Targets><Target tag="layout/activity_song_0" view="androidx.constraintlayout.widget.ConstraintLayout"><Expressions/><location startLine="1" startOffset="0" endLine="299" endOffset="51"/></Target><Target id="@+id/setting_ib" view="ImageButton"><Expressions/><location startLine="7" startOffset="4" endLine="17" endOffset="51"/></Target><Target id="@+id/eq_ib" view="ImageButton"><Expressions/><location startLine="19" startOffset="4" endLine="29" endOffset="60"/></Target><Target id="@+id/lower_ib" view="ImageButton"><Expressions/><location startLine="31" startOffset="4" endLine="41" endOffset="55"/></Target><Target id="@+id/plus_ib" view="ImageButton"><Expressions/><location startLine="43" startOffset="4" endLine="53" endOffset="61"/></Target><Target id="@+id/music_title_tv" view="TextView"><Expressions/><location startLine="55" startOffset="4" endLine="65" endOffset="59"/></Target><Target id="@+id/singer_name_tv" view="TextView"><Expressions/><location startLine="67" startOffset="4" endLine="77" endOffset="67"/></Target><Target id="@+id/song_singer_plus_iv" view="ImageView"><Expressions/><location startLine="80" startOffset="4" endLine="87" endOffset="64"/></Target><Target id="@+id/song_album_IU_iv" view="ImageView"><Expressions/><location startLine="89" startOffset="4" endLine="99" endOffset="72"/></Target><Target id="@+id/lyrics_01_iv" view="TextView"><Expressions/><location startLine="101" startOffset="4" endLine="110" endOffset="69"/></Target><Target id="@+id/song_music_lyrics_02_iv" view="TextView"><Expressions/><location startLine="112" startOffset="4" endLine="121" endOffset="65"/></Target><Target id="@+id/player_like_iv_layout" view="LinearLayout"><Expressions/><location startLine="123" startOffset="4" endLine="147" endOffset="18"/></Target><Target id="@+id/player_like_iv" view="ImageView"><Expressions/><location startLine="132" startOffset="8" endLine="138" endOffset="19"/></Target><Target id="@+id/player_unlike_iv" view="ImageView"><Expressions/><location startLine="140" startOffset="8" endLine="146" endOffset="19"/></Target><Target id="@+id/song_progress_sb" view="SeekBar"><Expressions/><location startLine="149" startOffset="4" endLine="166" endOffset="75"/></Target><Target id="@+id/song_start_time_tv" view="TextView"><Expressions/><location startLine="182" startOffset="4" endLine="192" endOffset="14"/></Target><Target id="@+id/song_end_time_tv" view="TextView"><Expressions/><location startLine="194" startOffset="4" endLine="204" endOffset="14"/></Target><Target id="@+id/song_player_layout" view="LinearLayout"><Expressions/><location startLine="207" startOffset="4" endLine="244" endOffset="18"/></Target><Target id="@+id/song_previous_iv" view="ImageView"><Expressions/><location startLine="217" startOffset="8" endLine="222" endOffset="61"/></Target><Target id="@+id/song_miniplayer_iv" view="ImageView"><Expressions/><location startLine="224" startOffset="8" endLine="228" endOffset="57"/></Target><Target id="@+id/song_pause_iv" view="ImageView"><Expressions/><location startLine="230" startOffset="8" endLine="235" endOffset="39"/></Target><Target id="@+id/song_next_iv" view="ImageView"><Expressions/><location startLine="237" startOffset="8" endLine="242" endOffset="57"/></Target><Target id="@+id/song_repeat_iv" view="ImageView"><Expressions/><location startLine="247" startOffset="4" endLine="255" endOffset="68"/></Target><Target id="@+id/random_iv" view="ImageView"><Expressions/><location startLine="257" startOffset="4" endLine="265" endOffset="68"/></Target><Target id="@+id/instagram_iv" view="ImageView"><Expressions/><location startLine="267" startOffset="4" endLine="275" endOffset="55"/></Target><Target id="@+id/list_iv" view="ImageView"><Expressions/><location startLine="278" startOffset="4" endLine="286" endOffset="51"/></Target><Target id="@+id/related_iv" view="ImageView"><Expressions/><location startLine="288" startOffset="4" endLine="296" endOffset="55"/></Target></Targets></Layout>
<?xml version="1.0" encoding="utf-8" standalone="yes"?><Layout layout="activity_song" modulePackage="com.example.umcflo" filePath="app\src\main\res\layout\activity_song.xml" directory="layout" isMerge="false" isBindingData="false" rootNodeType="androidx.constraintlayout.widget.ConstraintLayout"><Targets><Target tag="layout/activity_song_0" view="androidx.constraintlayout.widget.ConstraintLayout"><Expressions/><location startLine="1" startOffset="0" endLine="299" endOffset="51"/></Target><Target id="@+id/setting_ib" view="ImageButton"><Expressions/><location startLine="7" startOffset="4" endLine="17" endOffset="51"/></Target><Target id="@+id/eq_ib" view="ImageButton"><Expressions/><location startLine="19" startOffset="4" endLine="29" endOffset="60"/></Target><Target id="@+id/song_down_ib" view="ImageButton"><Expressions/><location startLine="31" startOffset="4" endLine="41" endOffset="55"/></Target><Target id="@+id/plus_ib" view="ImageButton"><Expressions/><location startLine="43" startOffset="4" endLine="53" endOffset="65"/></Target><Target id="@+id/song_music_title_tv" view="TextView"><Expressions/><location startLine="55" startOffset="4" endLine="65" endOffset="59"/></Target><Target id="@+id/song_singer_name_tv" view="TextView"><Expressions/><location startLine="67" startOffset="4" endLine="77" endOffset="72"/></Target><Target id="@+id/song_singer_plus_iv" view="ImageView"><Expressions/><location startLine="80" startOffset="4" endLine="87" endOffset="69"/></Target><Target id="@+id/song_album_iv" view="ImageView"><Expressions/><location startLine="89" startOffset="4" endLine="99" endOffset="72"/></Target><Target id="@+id/lyrics_01_iv" view="TextView"><Expressions/><location startLine="101" startOffset="4" endLine="110" endOffset="66"/></Target><Target id="@+id/song_music_lyrics_02_iv" view="TextView"><Expressions/><location startLine="112" startOffset="4" endLine="121" endOffset="65"/></Target><Target id="@+id/player_like_iv_layout" view="LinearLayout"><Expressions/><location startLine="123" startOffset="4" endLine="147" endOffset="18"/></Target><Target id="@+id/song_like_iv" view="ImageView"><Expressions/><location startLine="132" startOffset="8" endLine="138" endOffset="19"/></Target><Target id="@+id/player_unlike_iv" view="ImageView"><Expressions/><location startLine="140" startOffset="8" endLine="146" endOffset="19"/></Target><Target id="@+id/song_progress_sb" view="SeekBar"><Expressions/><location startLine="149" startOffset="4" endLine="166" endOffset="75"/></Target><Target id="@+id/song_start_time_tv" view="TextView"><Expressions/><location startLine="182" startOffset="4" endLine="192" endOffset="14"/></Target><Target id="@+id/song_end_time_tv" view="TextView"><Expressions/><location startLine="194" startOffset="4" endLine="204" endOffset="14"/></Target><Target id="@+id/song_player_layout" view="LinearLayout"><Expressions/><location startLine="207" startOffset="4" endLine="244" endOffset="18"/></Target><Target id="@+id/song_previous_iv" view="ImageView"><Expressions/><location startLine="217" startOffset="8" endLine="222" endOffset="61"/></Target><Target id="@+id/song_miniplayer_iv" view="ImageView"><Expressions/><location startLine="224" startOffset="8" endLine="228" endOffset="57"/></Target><Target id="@+id/song_pause_iv" view="ImageView"><Expressions/><location startLine="230" startOffset="8" endLine="235" endOffset="39"/></Target><Target id="@+id/song_next_iv" view="ImageView"><Expressions/><location startLine="237" startOffset="8" endLine="242" endOffset="57"/></Target><Target id="@+id/song_repeat_iv" view="ImageView"><Expressions/><location startLine="247" startOffset="4" endLine="255" endOffset="68"/></Target><Target id="@+id/random_iv" view="ImageView"><Expressions/><location startLine="257" startOffset="4" endLine="265" endOffset="68"/></Target><Target id="@+id/instagram_iv" view="ImageView"><Expressions/><location startLine="267" startOffset="4" endLine="275" endOffset="55"/></Target><Target id="@+id/list_iv" view="ImageView"><Expressions/><location startLine="278" startOffset="4" endLine="286" endOffset="51"/></Target><Target id="@+id/related_iv" view="ImageView"><Expressions/><location startLine="288" startOffset="4" endLine="296" endOffset="55"/></Target></Targets></Layout>
Loading