Merge branch 'refs/heads/Frontend' into Frontend_UI

# Conflicts:
#	app/src/main/res/values/strings.xml

app/src/main/java/ru/myitschool/work/ui/Main/AdminFragment.kt

@@ -0,0 +1,60 @@
+package ru.myitschool.work.ui.Main
+
+import android.os.Bundle
+import androidx.fragment.app.Fragment
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import ru.myitschool.work.R
+
+// TODO: Rename parameter arguments, choose names that match
+// the fragment initialization parameters, e.g. ARG_ITEM_NUMBER
+private const val ARG_PARAM1 = "param1"
+private const val ARG_PARAM2 = "param2"
+
+/**
+ * A simple [Fragment] subclass.
+ * Use the [AdminFragment.newInstance] factory method to
+ * create an instance of this fragment.
+ */
+class AdminFragment : Fragment() {
+    // TODO: Rename and change types of parameters
+    private var param1: String? = null
+    private var param2: String? = null
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        arguments?.let {
+            param1 = it.getString(ARG_PARAM1)
+            param2 = it.getString(ARG_PARAM2)
+        }
+    }
+
+    override fun onCreateView(
+        inflater: LayoutInflater, container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View? {
+        // Inflate the layout for this fragment
+        return inflater.inflate(R.layout.fragment_admin, container, false)
+    }
+
+    companion object {
+        /**
+         * Use this factory method to create a new instance of
+         * this fragment using the provided parameters.
+         *
+         * @param param1 Parameter 1.
+         * @param param2 Parameter 2.
+         * @return A new instance of fragment AdminFragment.
+         */
+        // TODO: Rename and change types and number of parameters
+        @JvmStatic
+        fun newInstance(param1: String, param2: String) =
+            AdminFragment().apply {
+                arguments = Bundle().apply {
+                    putString(ARG_PARAM1, param1)
+                    putString(ARG_PARAM2, param2)
+                }
+            }
+    }
+}

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

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".ui.Main.AdminFragment">
+
+    <!-- TODO: Update blank fragment layout -->
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:text="@string/hello_blank_fragment" />
+
+</FrameLayout>

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

@@ -23,7 +23,7 @@
     <string name="error_username_invalid_characters">Логин может содержать только латинские буквы и цифры.</string>
 
     <!-- Строки для главного экрана -->
-    <string name="fullname_label">Имя Фамилия</string>
+    <string name="fullname_label">ФИО</string>
     <string name="position_label">Должность</string>
     <string name="last_entry_label">Время последнего входа</string>
     <string name="error_no_user_data">Нет данных о пользователе.</string>
@@ -32,8 +32,8 @@
     <string name="qr_scan_success">Успешно</string>
     <string name="qr_scan_failure">Что-то пошло не так</string>
     <string name="qr_scan_cancelled">Вход был отменён / Operation was cancelled</string>
-    <string name="close_button">Закрыть</string>
+    <!-- TODO: Remove or change this placeholder text -->
-    <string name="result">Результат</string>
+    <string name="hello_blank_fragment">Hello blank fragment</string>
 
 
 </resources>