Merge pull request #15 from SystemEngineeringTeam/refactor_MojiChanged

Refactor moji changed
SystemEngineeringTeam · Jun 3, 2022 · 82bec2b · 82bec2b
2 parents b4aa255 + 14d37b2
commit 82bec2b
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 38 deletions.
diff --git a/Client/app/src/main/res/layout/fragment_acount.xml b/Client/app/src/main/res/layout/fragment_acount.xml
@@ -62,7 +62,7 @@
         tools:ignore="MissingConstraints">
 
         <com.google.android.material.textfield.TextInputEditText
-            android:id="@+id/user_id_edit_text"
+            android:id="@+id/main_student_number_edit_text_profile_fragment"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:hint="@string/student_number_profile_fragment_layout"

diff --git a/Client/app/src/main/res/layout/fragment_notifications.xml b/Client/app/src/main/res/layout/fragment_notifications.xml
@@ -6,20 +6,6 @@
     android:layout_height="match_parent"
     tools:context=".ui.setting.SettingFragment">
 
-    <TextView
-        android:id="@+id/text_notifications"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="8dp"
-        android:layout_marginTop="8dp"
-        android:layout_marginEnd="8dp"
-        android:textAlignment="center"
-        android:textSize="20sp"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
     <Button
         android:id="@+id/welcome_test_button"
         android:layout_width="wrap_content"

diff --git a/Client/app/src/main/res/layout/fragment_profile.xml b/Client/app/src/main/res/layout/fragment_profile.xml
@@ -8,7 +8,7 @@
     tools:context=".ui.profile.ProfileFragment" >
 
     <com.google.android.material.button.MaterialButton
-        android:id="@+id/main_edit"
+        android:id="@+id/profile_fix_button_profile_fragment"
         style="@style/Widget.MaterialComponents.Button"
         android:layout_width="wrap_content"
         android:layout_height="50dp"
@@ -25,20 +25,20 @@
         app:layout_constraintStart_toStartOf="parent" />
 
     <com.google.android.material.textfield.TextInputLayout
-        android:id="@+id/user_name_text_input_layout"
+        android:id="@+id/name_edit_text_profile_fragment"
         style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="16dp"
         android:layout_marginTop="32dp"
         android:layout_marginEnd="16dp"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toEndOf="@+id/imageView2"
-        app:layout_constraintTop_toBottomOf="@+id/imageButton"
+        app:layout_constraintStart_toEndOf="@+id/name_icon_image_view_profile_fragment"
+        app:layout_constraintTop_toBottomOf="@+id/user_icon_image_view_profile_fragment"
         tools:ignore="MissingConstraints">
 
         <com.google.android.material.textfield.TextInputEditText
-            android:id="@+id/user_name_edit_text"
+            android:id="@+id/main_name_edit_text_profile_fragment"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:hint="@string/name_profile_fragment_layout"
@@ -49,20 +49,20 @@
     </com.google.android.material.textfield.TextInputLayout>
 
     <com.google.android.material.textfield.TextInputLayout
-        android:id="@+id/user_id_text_input_layout"
+        android:id="@+id/student_number_edit_text_profile_fragment"
         style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="16dp"
         android:layout_marginTop="32dp"
         android:layout_marginEnd="16dp"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toEndOf="@+id/imageView3"
-        app:layout_constraintTop_toBottomOf="@+id/user_name_text_input_layout"
+        app:layout_constraintStart_toEndOf="@+id/student_number_icon_image_view_profile_fragment"
+        app:layout_constraintTop_toBottomOf="@+id/name_edit_text_profile_fragment"
         tools:ignore="MissingConstraints">
 
         <com.google.android.material.textfield.TextInputEditText
-            android:id="@+id/user_id_edit_text"
+            android:id="@+id/main_student_number_edit_text_profile_fragment"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:hint="@string/student_number_profile_fragment_layout"
@@ -73,30 +73,30 @@
     </com.google.android.material.textfield.TextInputLayout>
 
     <ImageView
-        android:id="@+id/imageView2"
+        android:id="@+id/name_icon_image_view_profile_fragment"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="16dp"
         android:src="@drawable/account_circle_fill0_wght400_grad0_opsz48"
-        android:tint="@color/text"
-        app:layout_constraintBottom_toBottomOf="@+id/user_name_text_input_layout"
-        app:layout_constraintEnd_toStartOf="@+id/user_name_text_input_layout"
+        app:layout_constraintBottom_toBottomOf="@+id/name_edit_text_profile_fragment"
+        app:layout_constraintEnd_toStartOf="@+id/name_edit_text_profile_fragment"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="@+id/user_name_text_input_layout" />
+        app:layout_constraintTop_toTopOf="@+id/name_edit_text_profile_fragment"
+        app:tint="@color/text" />
 
     <ImageView
-        android:id="@+id/imageView3"
+        android:id="@+id/student_number_icon_image_view_profile_fragment"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="16dp"
         android:src="@drawable/badge_fill0_wght400_grad0_opsz48"
-        android:tint="@color/text"
-        app:layout_constraintBottom_toBottomOf="@+id/user_id_text_input_layout"
+        app:layout_constraintBottom_toBottomOf="@+id/student_number_edit_text_profile_fragment"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="@+id/user_id_text_input_layout" />
+        app:layout_constraintTop_toTopOf="@+id/student_number_edit_text_profile_fragment"
+        app:tint="@color/text" />
 
     <ImageButton
-        android:id="@+id/imageButton"
+        android:id="@+id/user_icon_image_view_profile_fragment"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="32dp"

diff --git a/Client/app/src/main/res/layout/fragment_stater.xml b/Client/app/src/main/res/layout/fragment_stater.xml
@@ -17,7 +17,7 @@
         android:layout_marginBottom="64dp"
         android:paddingTop="8dp"
         android:paddingBottom="8dp"
-        android:text="ログイン"
+        android:text="@string/login_button_stater_fragment_string"
         android:textAllCaps="false"
         android:textAppearance="@style/TextAppearance.MaterialComponents.Button"
         app:backgroundTint="@color/purple_500"
@@ -32,7 +32,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="64dp"
-        android:text="ようこそ"
+        android:text="@string/welcome_textview_stater_fragment_staring"
         android:textSize="48sp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
@@ -44,7 +44,7 @@
         android:layout_height="wrap_content"
         android:layout_marginTop="32dp"
         android:gravity="center"
-        android:text="シス研温度・入退室\n管理システムへ\n(｀・∀・)ﾉ"
+        android:text="@string/intor_textview_stater_fragment_string"
         android:textSize="24sp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"

diff --git a/Client/app/src/main/res/values/strings.xml b/Client/app/src/main/res/values/strings.xml
@@ -1,5 +1,5 @@
 <resources>
-    <string name="app_name">TempManager</string>
+    <string name="app_name">体温・入退室管理システム</string>
     <string name="title_home">ホーム</string>
     <string name="title_profile">プロフィール</string>
     <string name="title_setting">設定</string>
@@ -8,4 +8,7 @@
     <string name="profile_fix_button_profile_fragment_layout">プロフィールの変更</string>
     <!-- TODO: Remove or change this placeholder text -->
     <string name="hello_blank_fragment">Hello blank fragment</string>
+    <string name="login_button_stater_fragment_string">ログイン</string>
+    <string name="welcome_textview_stater_fragment_staring">ようこそ</string>
+    <string name="intor_textview_stater_fragment_string">シス研温度・入退室\n管理システムへ\n(｀・∀・)ﾉ</string>
 </resources>