Merge pull request #14 from NaJuDoRyeong/feature/#12-home

Feature/#12 home

app/build.gradle

@@ -40,6 +40,7 @@ dependencies {
 
     api project(path: ':common-ui')
     api project(path: ':story')
+    api project(path: ':home')
 
     api "androidx.navigation:navigation-fragment-ktx:$rootProject.nav_version"
     api "androidx.navigation:navigation-ui-ktx:$rootProject.nav_version"

app/src/main/java/com/najudoryeong/mineme/MainActivity.kt

@@ -42,7 +42,7 @@ class MainActivity : AppCompatActivity(), MainViewModelUtil {
         // appbar 구성 요소 설정
         // 바텀네비게이션과 연결하면 해당 프래그먼트에 네비게이션으로는 backButton x
         appBarConfiguration = AppBarConfiguration(
-            setOf(R.id.storyFragment)
+            setOf(R.id.home,R.id.story)
         )
 
         // navController와 actionbar 연결

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

@@ -16,8 +16,10 @@
         tools:context=".MainActivity">
 
         <com.google.android.material.appbar.AppBarLayout
+            app:elevation="0dp"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content">
+            android:layout_height="wrap_content"
+            android:background="#00000000">
 
             <com.google.android.material.appbar.MaterialToolbar
                 android:id="@+id/toolbar"

app/src/main/res/menu/bottom_nav_menu.xml

@@ -7,7 +7,7 @@
         android:title="" />
 
     <item
-        android:id="@+id/search"
+        android:id="@+id/story"
         android:icon="@drawable/bottom_story_on_off"
         android:title="" />
 

app/src/main/res/navigation/nav_graph.xml

@@ -3,9 +3,13 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/nav_graph"
-    app:startDestination="@id/storyFragment">
+    app:startDestination="@id/home">
     <fragment
-        android:id="@+id/storyFragment"
+        android:id="@+id/story"
         android:name="com.najudoryeong.mineme.story.StoryFragment"
         android:label="StoryFragment" />
+    <fragment
+        android:id="@+id/home"
+        android:name="com.najudoryeong.mineme.home.HomeFragment"
+        android:label="HomeFragment" />
 </navigation>

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

@@ -10,7 +10,8 @@
         <item name="colorSecondaryVariant">@color/teal_700</item>
         <item name="colorOnSecondary">@color/black</item>
         <!-- Status bar color. -->
-        <item name="android:statusBarColor">?attr/colorPrimaryVariant</item>
+        <item name="android:statusBarColor">#00000000</item>
+        <item name="android:windowLightStatusBar">true</item>
         <!-- Customize your theme here. -->
     </style>
 </resources>

build.gradle

@@ -11,7 +11,7 @@ buildscript {
 }
 
 plugins {
-    id 'com.android.application' version '7.3.0' apply false
-    id 'com.android.library' version '7.3.0' apply false
+    id 'com.android.application' version '7.3.1' apply false
+    id 'com.android.library' version '7.3.1' apply false
     id 'org.jetbrains.kotlin.android' version '1.7.10' apply false
 }

common-ui/src/main/res/menu/home_menu.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+    <item
+        android:id="@+id/menu_SettingProfile"
+        android:title="프로필 설정"
+        android:icon="@drawable/img_setting"
+        app:showAsAction="always"/>
+</menu>

home/.gitignore

@@ -0,0 +1 @@
+/build

home/build.gradle

@@ -0,0 +1,46 @@
+plugins {
+    id 'com.android.library'
+    id 'org.jetbrains.kotlin.android'
+}
+
+android {
+    namespace 'com.najudoryeong.mineme.home'
+    compileSdk 32
+
+    defaultConfig {
+        minSdk 23
+        targetSdk 32
+
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+        consumerProguardFiles "consumer-rules.pro"
+    }
+
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+        }
+    }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+    kotlinOptions {
+        jvmTarget = '1.8'
+    }
+    buildFeatures {
+        dataBinding true
+    }
+}
+
+dependencies {
+
+    api project(path: ':common-ui')
+
+    implementation 'androidx.core:core-ktx:1.7.0'
+    implementation 'androidx.appcompat:appcompat:1.5.1'
+    implementation 'com.google.android.material:material:1.7.0'
+    testImplementation 'junit:junit:4.13.2'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.4'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.0'
+}

home/proguard-rules.pro

@@ -0,0 +1,21 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile

home/src/androidTest/java/com/najudoryeong/mineme/home/ExampleInstrumentedTest.kt

@@ -0,0 +1,24 @@
+package com.najudoryeong.mineme.home
+
+import androidx.test.platform.app.InstrumentationRegistry
+import androidx.test.ext.junit.runners.AndroidJUnit4
+
+import org.junit.Test
+import org.junit.runner.RunWith
+
+import org.junit.Assert.*
+
+/**
+ * Instrumented test, which will execute on an Android device.
+ *
+ * See [testing documentation](http://d.android.com/tools/testing).
+ */
+@RunWith(AndroidJUnit4::class)
+class ExampleInstrumentedTest {
+    @Test
+    fun useAppContext() {
+        // Context of the app under test.
+        val appContext = InstrumentationRegistry.getInstrumentation().targetContext
+        assertEquals("com.najudoryeong.mineme.home.test", appContext.packageName)
+    }
+}

home/src/main/AndroidManifest.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+
+</manifest>

home/src/main/java/com/najudoryeong/mineme/home/FragmentObject.kt

@@ -0,0 +1,17 @@
+package com.najudoryeong.mineme.home
+
+import android.view.View
+import com.najudoryeong.mineme.common_ui.FragmentInfoUtil
+
+
+
+object Home : FragmentInfoUtil {
+    override val layoutID: Int
+        get() = R.layout.fragment_home
+    override val toolbarText: Int
+        get() = R.string.home
+    override val menu: Int
+        get() = com.najudoryeong.mineme.common_ui.R.menu.home_menu
+    override val bottomNavi_visibility: Int
+        get() = View.VISIBLE
+}

home/src/main/java/com/najudoryeong/mineme/home/HomeFragment.kt

@@ -0,0 +1,14 @@
+package com.najudoryeong.mineme.home
+
+import android.os.Bundle
+import androidx.fragment.app.Fragment
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import com.najudoryeong.mineme.common_ui.BaseFragment
+import com.najudoryeong.mineme.home.databinding.FragmentHomeBinding
+
+
+class HomeFragment : BaseFragment<FragmentHomeBinding>(Home) {
+
+}

home/src/main/java/com/najudoryeong/mineme/home/HomeViewModel.kt

@@ -0,0 +1,7 @@
+package com.najudoryeong.mineme.home
+
+import androidx.lifecycle.ViewModel
+
+class HomeViewModel : ViewModel() {
+
+}

home/src/main/res/drawable/img_add_story.xml

@@ -0,0 +1,16 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="125dp"
+    android:height="41dp"
+    android:viewportWidth="125"
+    android:viewportHeight="41">
+  <group>
+    <clip-path
+        android:pathData="M10,10.65h20v20h-20z"/>
+    <path
+        android:pathData="M20,10.65C18.02,10.65 16.09,11.24 14.44,12.34C12.8,13.44 11.52,15 10.76,16.83C10,18.65 9.81,20.66 10.19,22.6C10.58,24.54 11.53,26.33 12.93,27.72C14.33,29.12 16.11,30.08 18.05,30.46C19.99,30.85 22,30.65 23.83,29.89C25.65,29.14 27.22,27.85 28.31,26.21C29.41,24.56 30,22.63 30,20.65C30,18 28.94,15.46 27.07,13.59C25.19,11.71 22.65,10.66 20,10.65V10.65ZM23.33,21.49H20.83V23.99C20.83,24.21 20.75,24.42 20.59,24.58C20.43,24.73 20.22,24.82 20,24.82C19.78,24.82 19.57,24.73 19.41,24.58C19.25,24.42 19.17,24.21 19.17,23.99V21.49H16.67C16.45,21.49 16.23,21.4 16.08,21.24C15.92,21.09 15.83,20.87 15.83,20.65C15.83,20.43 15.92,20.22 16.08,20.06C16.23,19.91 16.45,19.82 16.67,19.82H19.17V17.32C19.17,17.1 19.25,16.89 19.41,16.73C19.57,16.57 19.78,16.49 20,16.49C20.22,16.49 20.43,16.57 20.59,16.73C20.75,16.89 20.83,17.1 20.83,17.32V19.82H23.33C23.55,19.82 23.77,19.91 23.92,20.06C24.08,20.22 24.17,20.43 24.17,20.65C24.17,20.87 24.08,21.09 23.92,21.24C23.77,21.4 23.55,21.49 23.33,21.49Z"
+        android:fillColor="#191919"/>
+  </group>
+  <path
+      android:pathData="M56.18,15.73C56.18,15.89 56.13,16.01 56.03,16.1C55.94,16.18 55.82,16.22 55.69,16.22H50.81C50.84,16.78 51.03,17.24 51.37,17.62C51.71,17.98 52.14,18.27 52.66,18.5C53.19,18.73 53.78,18.9 54.43,19.01C55.08,19.12 55.72,19.2 56.37,19.25C56.54,19.27 56.67,19.34 56.76,19.47C56.85,19.58 56.88,19.72 56.86,19.88C56.84,20.02 56.77,20.14 56.66,20.23C56.54,20.31 56.39,20.34 56.18,20.32C55.56,20.27 54.94,20.19 54.33,20.08C53.73,19.97 53.16,19.82 52.63,19.64C52.11,19.45 51.64,19.21 51.22,18.94C50.81,18.67 50.49,18.36 50.25,18.01C50.01,18.38 49.69,18.7 49.28,18.98C48.87,19.25 48.41,19.47 47.89,19.66C47.38,19.84 46.81,19.98 46.2,20.1C45.59,20.2 44.96,20.27 44.32,20.32C44.11,20.34 43.95,20.31 43.84,20.23C43.74,20.14 43.67,20.02 43.65,19.88C43.63,19.72 43.66,19.59 43.75,19.49C43.86,19.37 43.99,19.3 44.15,19.28C44.85,19.23 45.53,19.14 46.19,19.03C46.84,18.91 47.43,18.74 47.94,18.52C48.45,18.28 48.85,17.98 49.16,17.62C49.48,17.24 49.65,16.78 49.69,16.22H44.81C44.67,16.22 44.55,16.18 44.45,16.1C44.36,16.01 44.32,15.89 44.32,15.73C44.32,15.57 44.36,15.45 44.45,15.37C44.55,15.28 44.67,15.24 44.81,15.24H55.69C55.82,15.24 55.94,15.28 56.03,15.37C56.13,15.45 56.18,15.57 56.18,15.73ZM57.52,22.32C57.52,22.48 57.47,22.61 57.37,22.7C57.28,22.78 57.17,22.82 57.03,22.82H50.79V26.68C50.79,26.85 50.74,26.97 50.62,27.05C50.52,27.14 50.39,27.19 50.23,27.19C50.07,27.19 49.94,27.14 49.84,27.05C49.74,26.97 49.69,26.85 49.69,26.68V22.82H43.43C43.3,22.82 43.18,22.78 43.07,22.7C42.98,22.61 42.94,22.48 42.94,22.32C42.94,22.17 42.98,22.05 43.07,21.97C43.18,21.88 43.3,21.83 43.43,21.83H57.03C57.17,21.83 57.28,21.88 57.37,21.97C57.47,22.05 57.52,22.17 57.52,22.32ZM54.31,13.14C54.31,13.3 54.26,13.43 54.16,13.52C54.07,13.6 53.95,13.64 53.82,13.64H46.68C46.54,13.64 46.42,13.6 46.32,13.52C46.23,13.43 46.19,13.3 46.19,13.14C46.19,12.99 46.23,12.87 46.32,12.79C46.42,12.7 46.54,12.65 46.68,12.65H53.82C53.95,12.65 54.07,12.7 54.16,12.79C54.26,12.87 54.31,12.99 54.31,13.14ZM59.91,13.28C59.91,13.12 59.95,13 60.04,12.92C60.15,12.83 60.26,12.79 60.4,12.79H64.82C65.09,12.79 65.31,12.83 65.47,12.91C65.64,12.99 65.76,13.09 65.84,13.21C65.93,13.34 65.99,13.48 66.01,13.64C66.03,13.8 66.04,13.95 66.04,14.11V18.43C66.04,18.92 66.04,19.5 66.03,20.17C66.02,20.82 65.98,21.53 65.91,22.27C65.84,23.01 65.73,23.76 65.57,24.52C65.41,25.27 65.18,25.97 64.89,26.63C64.8,26.82 64.67,26.94 64.5,26.98C64.34,27.04 64.19,27.03 64.06,26.95C63.92,26.87 63.83,26.76 63.78,26.61C63.75,26.47 63.77,26.33 63.85,26.17C64.11,25.59 64.32,24.97 64.46,24.3C64.61,23.62 64.72,22.93 64.79,22.22C64.85,21.51 64.89,20.81 64.91,20.13C64.93,19.44 64.94,18.8 64.94,18.21V14.11C64.94,13.98 64.91,13.89 64.85,13.84C64.81,13.8 64.74,13.77 64.65,13.77H60.4C60.26,13.77 60.15,13.73 60.04,13.65C59.95,13.56 59.91,13.44 59.91,13.28ZM75.21,19.23C75.21,19.39 75.16,19.51 75.05,19.6C74.96,19.68 74.85,19.72 74.71,19.72H72.28V26.68C72.28,26.85 72.23,26.97 72.11,27.05C72.01,27.14 71.88,27.19 71.72,27.19C71.56,27.19 71.43,27.14 71.33,27.05C71.23,26.97 71.18,26.85 71.18,26.68V13.09C71.18,12.92 71.23,12.8 71.33,12.72C71.43,12.63 71.56,12.58 71.72,12.58C71.88,12.58 72.01,12.63 72.11,12.72C72.23,12.8 72.28,12.92 72.28,13.09V18.74H74.71C74.85,18.74 74.96,18.78 75.05,18.87C75.16,18.95 75.21,19.07 75.21,19.23ZM77.25,21.32C77.25,20.91 77.32,20.53 77.47,20.17C77.62,19.8 77.83,19.49 78.12,19.21C78.4,18.94 78.75,18.73 79.15,18.57C79.57,18.41 80.06,18.33 80.6,18.33C81.14,18.33 81.63,18.41 82.04,18.57C82.46,18.73 82.82,18.94 83.1,19.21C83.39,19.49 83.61,19.8 83.76,20.17C83.91,20.53 83.98,20.91 83.98,21.32V23.87C83.98,24.28 83.91,24.67 83.76,25.03C83.61,25.39 83.39,25.71 83.1,25.98C82.82,26.25 82.46,26.47 82.04,26.63C81.63,26.78 81.14,26.86 80.6,26.86C80.06,26.86 79.57,26.78 79.15,26.63C78.75,26.47 78.4,26.25 78.12,25.98C77.83,25.71 77.62,25.39 77.47,25.03C77.32,24.67 77.25,24.28 77.25,23.87V21.32ZM78.36,23.4C78.36,24.28 78.55,24.91 78.93,25.3C79.33,25.68 79.89,25.88 80.6,25.88C81.33,25.88 81.89,25.68 82.28,25.3C82.68,24.91 82.88,24.28 82.88,23.4V21.8C82.88,20.91 82.68,20.28 82.28,19.89C81.89,19.51 81.33,19.32 80.6,19.32C79.89,19.32 79.33,19.51 78.93,19.89C78.55,20.28 78.36,20.91 78.36,21.8V23.4ZM92.01,19.23C92.01,19.39 91.96,19.51 91.85,19.6C91.76,19.68 91.65,19.72 91.51,19.72H89.08V26.68C89.08,26.85 89.03,26.97 88.91,27.05C88.81,27.14 88.68,27.19 88.52,27.19C88.36,27.19 88.23,27.14 88.13,27.05C88.03,26.97 87.98,26.85 87.98,26.68V13.09C87.98,12.92 88.03,12.8 88.13,12.72C88.23,12.63 88.36,12.58 88.52,12.58C88.68,12.58 88.81,12.63 88.91,12.72C89.03,12.8 89.08,12.92 89.08,13.09V18.74H91.51C91.65,18.74 91.76,18.78 91.85,18.87C91.96,18.95 92.01,19.07 92.01,19.23ZM84.68,16.03C84.68,16.19 84.63,16.32 84.53,16.41C84.44,16.49 84.32,16.53 84.19,16.53H77.01C76.88,16.53 76.76,16.49 76.66,16.41C76.57,16.32 76.52,16.19 76.52,16.03C76.52,15.88 76.57,15.76 76.66,15.68C76.76,15.59 76.88,15.54 77.01,15.54H84.19C84.32,15.54 84.44,15.59 84.53,15.68C84.63,15.76 84.68,15.88 84.68,16.03ZM83.61,13.2C83.61,13.35 83.56,13.48 83.46,13.57C83.37,13.65 83.25,13.69 83.12,13.69H78.08C77.95,13.69 77.83,13.65 77.73,13.57C77.64,13.48 77.59,13.35 77.59,13.2C77.59,13.04 77.64,12.92 77.73,12.84C77.83,12.75 77.95,12.7 78.08,12.7H83.12C83.25,12.7 83.37,12.75 83.46,12.84C83.56,12.92 83.61,13.04 83.61,13.2ZM105.63,13.09C105.63,12.92 105.68,12.8 105.78,12.72C105.88,12.63 106.01,12.58 106.17,12.58C106.33,12.58 106.46,12.63 106.56,12.72C106.68,12.8 106.73,12.92 106.73,13.09V26.68C106.73,26.85 106.68,26.97 106.56,27.05C106.46,27.14 106.33,27.19 106.17,27.19C106.01,27.19 105.88,27.14 105.78,27.05C105.68,26.97 105.63,26.85 105.63,26.68V13.09ZM93.37,13.28C93.37,13.12 93.42,13 93.51,12.92C93.61,12.83 93.73,12.79 93.86,12.79H98.45C98.73,12.79 98.94,12.83 99.1,12.91C99.27,12.99 99.39,13.09 99.47,13.21C99.56,13.34 99.62,13.48 99.64,13.64C99.67,13.8 99.68,13.95 99.68,14.11V18.43C99.68,18.92 99.67,19.5 99.66,20.17C99.65,20.82 99.61,21.53 99.54,22.27C99.47,23.01 99.36,23.76 99.2,24.52C99.04,25.27 98.82,25.97 98.52,26.63C98.43,26.82 98.3,26.94 98.13,26.98C97.97,27.04 97.82,27.03 97.69,26.95C97.55,26.87 97.46,26.76 97.42,26.61C97.38,26.47 97.4,26.33 97.48,26.17C97.75,25.59 97.95,24.97 98.1,24.3C98.24,23.62 98.35,22.93 98.42,22.22C98.49,21.51 98.53,20.81 98.54,20.13C98.56,19.44 98.57,18.8 98.57,18.21V14.11C98.57,13.98 98.54,13.89 98.49,13.84C98.44,13.8 98.37,13.77 98.28,13.77H93.86C93.73,13.77 93.61,13.73 93.51,13.65C93.42,13.56 93.37,13.44 93.37,13.28Z"
+      android:fillColor="#191919"/>
+</vector>

home/src/main/res/drawable/img_add_widget.xml

@@ -0,0 +1,21 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="76dp"
+    android:height="38dp"
+    android:viewportWidth="76"
+    android:viewportHeight="38">
+  <path
+      android:pathData="M19,3.167L57,3.167A15.833,15.833 0,0 1,72.833 19L72.833,19A15.833,15.833 0,0 1,57 34.833L19,34.833A15.833,15.833 0,0 1,3.167 19L3.167,19A15.833,15.833 0,0 1,19 3.167z"
+      android:fillColor="#B0B0B1"/>
+  <path
+      android:pathData="M38,12.667L38,25.333"
+      android:strokeWidth="3.16667"
+      android:fillColor="#00000000"
+      android:strokeColor="#ffffff"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M31.667,19L44.333,19"
+      android:strokeWidth="3.16667"
+      android:fillColor="#00000000"
+      android:strokeColor="#ffffff"
+      android:strokeLineCap="round"/>
+</vector>

home/src/main/res/drawable/img_heart.xml

@@ -0,0 +1,13 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="20dp"
+    android:height="20dp"
+    android:viewportWidth="20"
+    android:viewportHeight="20">
+  <group>
+    <clip-path
+        android:pathData="M0,0h20v20h-20z"/>
+    <path
+        android:pathData="M14.583,1.598C13.645,1.612 12.727,1.874 11.922,2.357C11.118,2.84 10.455,3.526 10,4.348C9.546,3.526 8.882,2.84 8.078,2.357C7.273,1.874 6.355,1.612 5.417,1.598C3.921,1.663 2.511,2.317 1.496,3.418C0.482,4.519 -0.056,5.976 0,7.473C0,11.262 3.988,15.4 7.333,18.206C8.08,18.833 9.024,19.178 10,19.178C10.976,19.178 11.92,18.833 12.667,18.206C16.012,15.4 20,11.262 20,7.473C20.056,5.976 19.518,4.519 18.503,3.418C17.489,2.317 16.079,1.663 14.583,1.598ZM11.596,16.931C11.149,17.307 10.584,17.513 10,17.513C9.416,17.513 8.851,17.307 8.404,16.931C4.123,13.338 1.667,9.892 1.667,7.473C1.61,6.418 1.972,5.384 2.674,4.596C3.377,3.807 4.363,3.329 5.417,3.264C6.471,3.329 7.456,3.807 8.159,4.596C8.861,5.384 9.224,6.418 9.167,7.473C9.167,7.694 9.254,7.906 9.411,8.062C9.567,8.218 9.779,8.306 10,8.306C10.221,8.306 10.433,8.218 10.589,8.062C10.745,7.906 10.833,7.694 10.833,7.473C10.776,6.418 11.139,5.384 11.841,4.596C12.544,3.807 13.529,3.329 14.583,3.264C15.637,3.329 16.623,3.807 17.326,4.596C18.028,5.384 18.39,6.418 18.333,7.473C18.333,9.892 15.877,13.338 11.596,16.927V16.931Z"
+        android:fillColor="#FE6B57"/>
+  </group>
+</vector>

home/src/main/res/drawable/img_line.xml

@@ -0,0 +1,11 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="310dp"
+    android:height="2dp"
+    android:viewportWidth="310"
+    android:viewportHeight="2">
+  <path
+      android:strokeWidth="1"
+      android:pathData="M0,1L310,1"
+      android:fillColor="#00000000"
+      android:strokeColor="#D9D9D9"/>
+</vector>