Merge pull request #194 from Team-B1ND/release/t/3.0.0

[Core] Release Teacher 3.0.0

dodam-teacher-android/build.gradle.kts

@@ -76,7 +76,7 @@ android {
         minSdk = 28
         targetSdk = 34
         versionCode = 1
-        versionName = "1.0"
+        versionName = "3.0.0"
 
     }
     compileOptions {

dodam-teacher-android/src/androidMain/res/drawable/ic_launcher_foreground.xml

@@ -0,0 +1,28 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="153"
+    android:viewportHeight="153">
+  <group android:scaleX="0.6111111"
+      android:scaleY="0.6111111"
+      android:translateX="29.75"
+      android:translateY="29.75">
+    <group>
+      <clip-path
+          android:pathData="M30,0L123,0A30,30 0,0 1,153 30L153,123A30,30 0,0 1,123 153L30,153A30,30 0,0 1,0 123L0,30A30,30 0,0 1,30 0z"/>
+      <path
+          android:pathData="M153,0H0V153H153V0Z"
+          android:fillColor="#ff0083F0"/>
+      <path
+          android:pathData="M56.93,119.75H60.45C63.11,119.75 65.48,119.35 67.56,118.54C69.65,117.73 71.39,116.61 72.81,115.19C74.27,113.78 75.37,112.1 76.1,110.17C76.89,108.18 77.26,106.04 77.26,103.71C77.26,101.38 76.87,99.29 76.1,97.31C75.31,95.32 74.2,93.62 72.73,92.2C71.31,90.78 69.56,89.67 67.48,88.86C65.4,88.05 63.05,87.64 60.45,87.64H56.93V119.75ZM41.61,75H64.3C68.31,75 72.06,75.79 75.56,77.35C79.1,78.93 82.18,81.04 84.78,83.67C87.44,86.26 89.52,89.3 91.04,92.81C92.56,96.25 93.31,99.88 93.31,103.69C93.31,107.5 92.56,111.06 91.04,114.57C89.59,118.01 87.53,121.07 84.86,123.7C82.26,126.34 79.18,128.44 75.64,130.02C72.14,131.6 68.38,132.38 64.3,132.38H41.61V75Z"
+          android:fillColor="#ffffffff"/>
+      <path
+          android:pathData="M20,97.83C20,96.64 20.23,95.52 20.7,94.46C21.17,93.36 21.81,92.4 22.64,91.61C23.46,90.81 24.41,90.19 25.5,89.73C26.64,89.27 27.83,89.05 29.07,89.05C30.3,89.05 31.46,89.27 32.55,89.73C33.68,90.19 34.67,90.81 35.5,91.61C36.32,92.4 36.96,93.36 37.43,94.46C37.91,95.52 38.14,96.64 38.14,97.83C38.14,99.03 37.91,100.19 37.43,101.29C36.96,102.34 36.32,103.26 35.5,104.06C34.67,104.86 33.68,105.48 32.55,105.94C31.46,106.39 30.3,106.61 29.07,106.61C27.83,106.61 26.64,106.39 25.5,105.94C24.41,105.48 23.46,104.86 22.64,104.06C21.81,103.26 21.17,102.34 20.7,101.29C20.23,100.19 20,99.03 20,97.83Z"
+          android:fillColor="#ffffffff"/>
+      <path
+          android:pathData="M20,123.4C20,122.17 20.23,121.03 20.7,119.95C21.17,118.83 21.81,117.85 22.64,117.03C23.46,116.22 24.41,115.58 25.5,115.11C26.64,114.64 27.83,114.42 29.07,114.42C30.3,114.42 31.46,114.64 32.55,115.11C33.68,115.58 34.67,116.22 35.5,117.03C36.32,117.85 36.96,118.83 37.43,119.95C37.91,121.03 38.14,122.17 38.14,123.4C38.14,124.62 37.91,125.81 37.43,126.93C36.96,128.01 36.32,128.95 35.5,129.76C34.67,130.58 33.68,131.21 32.55,131.68C31.46,132.15 30.3,132.38 29.07,132.38C27.83,132.38 26.64,132.15 25.5,131.68C24.41,131.21 23.46,130.58 22.64,129.76C21.81,128.95 21.17,128.01 20.7,126.93C20.23,125.81 20,124.62 20,123.4Z"
+          android:fillColor="#ffffffff"/>
+    </group>
+  </group>
+
+</vector>

dodam-teacher-android/src/androidMain/res/mipmap-anydpi-v26/ic_launcher.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background" />
-    <foreground android:drawable="@drawable/ic_launcher_foreground" />
+    <background android:drawable="@color/ic_launcher_background"/>
+    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
 </adaptive-icon>

dodam-teacher-android/src/androidMain/res/mipmap-anydpi-v26/ic_launcher_round.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background" />
-    <foreground android:drawable="@drawable/ic_launcher_foreground" />
+    <background android:drawable="@color/ic_launcher_background"/>
+    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
 </adaptive-icon>

dodam-teacher-android/src/androidMain/res/values/ic_launcher_background.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="ic_launcher_background">#0083F0</color>
+</resources>

dodam-teacher-android/src/androidMain/res/values/strings.xml

@@ -1,3 +1,3 @@
 <resources>
-    <string name="app_name">dodamTeacher</string>
+    <string name="app_name">도담도담 T</string>
 </resources>

dodam-teacher-android/src/commonMain/kotlin/com/b1nd/dodam/teacher/DodamTeacherApp.kt

@@ -38,8 +38,8 @@ import coil3.request.crossfade
 import coil3.util.DebugLogger
 import com.b1nd.dodam.all.navigation.ALL_ROUTE
 import com.b1nd.dodam.all.navigation.allScreen
-import com.b1nd.dodam.approvenightstudy.approveNightStudyScreen
-import com.b1nd.dodam.approvenightstudy.navigateToApproveNightStudy
+import com.b1nd.dodam.approvenightstudy.navigation.approveNightStudyScreen
+import com.b1nd.dodam.approvenightstudy.navigation.navigateToApproveNightStudy
 import com.b1nd.dodam.approveouting.approveOutingScreen
 import com.b1nd.dodam.approveouting.navigateToApproveOuting
 import com.b1nd.dodam.designsystem.DodamTheme
@@ -55,7 +55,6 @@ import com.b1nd.dodam.meal.navigation.MEAL_ROUTE
 import com.b1nd.dodam.meal.navigation.mealScreen
 import com.b1nd.dodam.meal.navigation.navigationToMeal
 import com.b1nd.dodam.nightstudy.navigation.NIGHT_STUDY_ROUTE
-import com.b1nd.dodam.nightstudy.navigation.navigateToNightStudy
 import com.b1nd.dodam.nightstudy.navigation.nightStudyScreen
 import com.b1nd.dodam.onboarding.navigation.ONBOARDING_ROUTE
 import com.b1nd.dodam.onboarding.navigation.navigateToOnboarding
@@ -207,6 +206,7 @@ fun DodamTeacherApp(exit: () -> Unit, viewModel: DodamTeacherAppViewModel = koin
                         )
                         approveOutingScreen(
                             onBackClick = navHostController::popBackStack,
+                            showSnackbar = showSnackbar,
                         )
 
                         allScreen(
@@ -218,12 +218,13 @@ fun DodamTeacherApp(exit: () -> Unit, viewModel: DodamTeacherAppViewModel = koin
 
                         approveNightStudyScreen(
                             onBackClick = navHostController::popBackStack,
+                            showSnackbar = showSnackbar,
                         )
 
                         settingScreen(
                             popBackStack = navHostController::popBackStack,
                             logout = exit,
-                            versionInfo = "3.2.0",
+                            versionInfo = "3.0.0",
                         )
                     }
 

dodam-teacher-ios/iosApp/Info.plist

@@ -4,10 +4,6 @@
 <dict>
 	<key>CADisableMinimumFrameDurationOnPhone</key>
 	<true/>
-    <key>NSAppTransportSecurity</key>
-    <dict>
-        <key>NSAllowsArbitraryLoads</key><true/>
-    </dict>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>$(DEVELOPMENT_LANGUAGE)</string>
 	<key>CFBundleExecutable</key>
@@ -26,6 +22,11 @@
 	<string>1</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
+	<key>NSAppTransportSecurity</key>
+	<dict>
+		<key>NSAllowsArbitraryLoads</key>
+		<true/>
+	</dict>
 	<key>UIApplicationSceneManifest</key>
 	<dict>
 		<key>UIApplicationSupportsMultipleScenes</key>
@@ -40,15 +41,6 @@
 	<key>UISupportedInterfaceOrientations</key>
 	<array>
 		<string>UIInterfaceOrientationPortrait</string>
-		<string>UIInterfaceOrientationLandscapeLeft</string>
-		<string>UIInterfaceOrientationLandscapeRight</string>
-	</array>
-	<key>UISupportedInterfaceOrientations~ipad</key>
-	<array>
-		<string>UIInterfaceOrientationPortrait</string>
-		<string>UIInterfaceOrientationPortraitUpsideDown</string>
-		<string>UIInterfaceOrientationLandscapeLeft</string>
-		<string>UIInterfaceOrientationLandscapeRight</string>
 	</array>
 </dict>
 </plist>

feature-teacher/approve-nightstudy/build.gradle.kts

@@ -28,6 +28,7 @@ kotlin{
             api(projects.data.nightStudy)
             implementation(libs.dodam.design.system.cmm)
             implementation(projects.ui)
+            implementation(libs.kotlinx.datetime)
         }
     }
 }