Merge pull request #6 from GO-SOPT-ANDROID/feature/week3

Feature/week3
GO-SOPT-ANDROID · May 9, 2023 · ceb0023 · ceb0023
2 parents 44b84cc + bd44df5
commit ceb0023
Show file tree

Hide file tree

Showing 12 changed files with 310 additions and 23 deletions.
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -11,13 +11,7 @@
         android:supportsRtl="true"
         android:theme="@style/Theme.GOSOPTAndroid"
         tools:targetApi="31">
-        <activity
-            android:name=".IntroduceActivity"
-            android:exported="false" />
-        <activity
-            android:name=".SignUpActivity"
-            android:windowSoftInputMode="adjustPan"
-            android:exported="false" />
+
         <activity
             android:name=".MainActivity"
             android:windowSoftInputMode="adjustPan"

diff --git a/app/src/main/java/org/android/go/sopt/MultiViewAdapter.kt b/app/src/main/java/org/android/go/sopt/MultiViewAdapter.kt
@@ -53,6 +53,7 @@ class MultiViewAdapter(context: Context) :
 
         }
     }
+
     override fun getItemId(position: Int): Long {
         return position.toLong()
     }
@@ -119,8 +120,6 @@ class MultiViewAdapter(context: Context) :
             }
 
 
-
-
         }
 
         fun getItemDetails(viewHolder: RecyclerView.ViewHolder?): ItemDetailsLookup.ItemDetails<Long> {

diff --git a/app/src/main/res/font/font.xml b/app/src/main/res/font/font.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<font-family xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <font android:fontStyle="normal"
+        android:fontWeight="400"
+        android:font="@font/nanum_gothic_bold"/>
+
+</font-family>
diff --git a/app/src/main/res/font/nanum_gothic.ttf b/app/src/main/res/font/nanum_gothic.ttf
diff --git a/app/src/main/res/font/nanum_gothic_bold.ttf b/app/src/main/res/font/nanum_gothic_bold.ttf
diff --git a/app/src/main/res/font/nanum_gothic_light.ttf b/app/src/main/res/font/nanum_gothic_light.ttf
diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml
@@ -20,6 +20,7 @@
         android:id="@+id/btn_delete_item"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:backgroundTint="?attr/colorPrimaryVariant"
         android:text="삭제하기"
         app:layout_constraintTop_toBottomOf="@id/rv"
         app:layout_constraintStart_toStartOf="parent"

diff --git a/app/src/main/res/layout/item_bottom.xml b/app/src/main/res/layout/item_bottom.xml
@@ -3,6 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
+    android:backgroundTint="?attr/colorPrimary"
     android:layout_height="wrap_content">
 
     <TextView

diff --git a/app/src/main/res/layout/item_music.xml b/app/src/main/res/layout/item_music.xml
@@ -10,15 +10,16 @@
         android:id="@+id/item_container"
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
+
         <ImageView
             android:id="@+id/chk_select"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:src="@drawable/ic_music"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toStartOf="@id/iv_music"
             app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintTop_toTopOf="parent"/>
+            app:layout_constraintEnd_toStartOf="@id/iv_music"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
 
 
         <ImageView
@@ -38,6 +39,8 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="10dp"
             android:layout_marginEnd="40dp"
+            android:fontFamily="@font/nanum_gothic_bold"
+            android:textColor="?attr/colorOnBackground"
             android:textSize="15sp"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="parent"
@@ -47,6 +50,8 @@
             android:id="@+id/tv_music_singer"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:fontFamily="@font/nanum_gothic_light"
+            android:textColor="?attr/colorOnBackground"
             android:textSize="10sp"
             app:layout_constraintEnd_toEndOf="@id/tv_music_title"
             app:layout_constraintStart_toStartOf="@id/tv_music_title"

diff --git a/app/src/main/res/layout/item_top.xml b/app/src/main/res/layout/item_top.xml
@@ -3,8 +3,8 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:background="@color/purple_200"
-    android:layout_height="wrap_content">
+    android:layout_height="wrap_content"
+    android:background="?attr/colorPrimary">
 
 
     <ImageView
@@ -19,6 +19,7 @@
         android:id="@+id/tv_title"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:fontFamily="@font/nanum_gothic_bold"
         android:textSize="30sp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"