Merge branch 'develop' into production

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,41 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: "[BUG]"
+labels: bug
+assignees: ''
+
+---
+
+### 발견한 문제
+
+---
+
+<aside>
+💡 정확한 문제와 상황을 적어주세요. 나중에 개발자가 다시 시연하기 편하게 상황까지 적어주시면 좋습니다.
+
+</aside>
+
+### 스크린샷
+
+---
+
+<aside>
+💡 텍스트로 설명하기 어렵거나 편하 게 이해하기 위해서는 발생한 문제의 스크린샷까지 남겨주세요.
+
+</aside>
+
+### 플랫폼(Android, iOS, Web)
+
+---
+
+- 플랫폼:
+- 디바이스:
+- OS:
+- 브라우저:
+
+### 기타 정보
+
+---
+
+- 앱 버전:

app/build.gradle.kts

@@ -44,12 +44,14 @@ android {
 
             isMinifyEnabled = false
             proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")
+
             var shrinkResources = false
             var minifyEnabled = false
         }
 
         debug {
 //            applicationIdSuffix = ".debug"
+
             val p = Properties()
             p.load(project.rootProject.file("local.properties").reader())
 

app/src/main/AndroidManifest.xml

@@ -27,11 +27,11 @@
         android:allowBackup="true"
         android:dataExtractionRules="@xml/data_extraction_rules"
         android:fullBackupContent="@xml/backup_rules"
-        android:icon="@drawable/image_logo_none"
+        android:icon="@drawable/img_logo1_44"
         android:label="@string/app_name"
         android:networkSecurityConfig="@xml/network_security_config"
         android:requestLegacyExternalStorage="true"
-        android:roundIcon="@drawable/image_logo_none"
+        android:roundIcon="@drawable/img_logo1_44"
         android:supportsRtl="true"
         android:theme="@style/Theme.EatSSUAndroid"
         android:usesCleartextTraffic="true"

app/src/main/java/com/eatssu/android/ui/mypage/myreview/MyReviewAdapter.kt

@@ -25,6 +25,7 @@ class MyReviewAdapter(private val dataList: List<Review>) :
             binding.tvReviewItemComment.text = dataList[position].content
             binding.tvReviewItemDate.text = dataList[position].writeDate
             binding.tvMenuName.text = dataList[position].menu
+
             binding.rbRate.rating = dataList[position].mainGrade.toFloat()
             binding.tvWriterNickname.text = MySharedPreferences.getUserName(binding.root.context)
 

app/src/main/java/com/eatssu/android/ui/review/list/ReviewAdapter.kt

@@ -34,7 +34,6 @@ class ReviewAdapter(
                 binding.tvReviewItemComment.text = content
                 binding.tvReviewItemDate.text = writeDate
                 binding.tvMenuName.text = menu //TODO 리사이클러뷰로 변경
-
                 binding.rbRate.rating = mainGrade.toFloat()
             }
 
@@ -48,11 +47,9 @@ class ReviewAdapter(
                 binding.ivReviewPhoto.visibility = View.VISIBLE
                 binding.cvPhotoReview.visibility = View.VISIBLE
 
-
                 if (data.imgUrl[0] == "") {
                     binding.ivReviewPhoto.visibility = View.GONE
                     binding.cvPhotoReview.visibility = View.GONE
-
                 }
             } else {
                 binding.ivReviewPhoto.visibility = View.GONE

app/src/main/res/layout/activity_main.xml

@@ -141,7 +141,6 @@
                 app:layout_constraintTop_toBottomOf="@id/week_recycler"
                 app:tabTextAppearance="@style/Subtitle2"
                 tools:ignore="NotSibling" />
-
         </FrameLayout>
 
         <!-- ViewPager2 - fragment 3개 -->

app/src/main/res/layout/activity_review.xml

@@ -147,6 +147,7 @@
 
 
                             <!--                            </LinearLayout>-->
+
                         </LinearLayout>
 
                         <!--  프로그래스 바   -->

app/src/main/res/layout/activity_review_write_rate.xml

@@ -23,7 +23,6 @@
                 android:layout_width="match_parent"
                 android:layout_height="match_parent">
 
-
                 <LinearLayout
                     android:id="@+id/tv_review2_menu"
                     android:layout_width="match_parent"

app/src/main/res/layout/item_review.xml

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout 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:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_margin="24dp">

app/src/main/res/values/themes.xml

@@ -109,7 +109,6 @@
         <item name="android:fontFamily">@font/pretendard_medium</item>
         <item name="android:textSize">10sp</item>
         <!--        <item name="android:lineHeight">12dp</item>-->
-
     </style>
 
     <style name="Button1">
@@ -142,7 +141,6 @@
     </style>
 
 
-
     <style name="Widget.CalendarView.Custom" parent="android:Widget.CalendarView">
         <item name="android:focusedMonthDateColor">@android:color/holo_blue_light</item>
         <item name="android:weekNumberColor">@android:color/holo_red_light</item>