diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 16342fd..af86c2a 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -21,8 +21,7 @@ tools:targetApi="31"> + android:exported="true" > diff --git a/app/src/main/java/ru/myitschool/work/administrator_screen.java b/app/src/main/java/ru/myitschool/work/administrator_screen.java new file mode 100644 index 0000000..67346da --- /dev/null +++ b/app/src/main/java/ru/myitschool/work/administrator_screen.java @@ -0,0 +1,64 @@ +package ru.myitschool.work; + +import android.os.Bundle; + +import androidx.fragment.app.Fragment; + +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; + +/** + * A simple {@link Fragment} subclass. + * Use the {@link administrator_screen#newInstance} factory method to + * create an instance of this fragment. + */ +public class administrator_screen extends Fragment { + + // TODO: Rename parameter arguments, choose names that match + // the fragment initialization parameters, e.g. ARG_ITEM_NUMBER + private static final String ARG_PARAM1 = "param1"; + private static final String ARG_PARAM2 = "param2"; + + // TODO: Rename and change types of parameters + private String mParam1; + private String mParam2; + + public administrator_screen() { + // Required empty public constructor + } + + /** + * 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 administrator_screen. + */ + // TODO: Rename and change types and number of parameters + public static administrator_screen newInstance(String param1, String param2) { + administrator_screen fragment = new administrator_screen(); + Bundle args = new Bundle(); + args.putString(ARG_PARAM1, param1); + args.putString(ARG_PARAM2, param2); + fragment.setArguments(args); + return fragment; + } + + @Override + public void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + if (getArguments() != null) { + mParam1 = getArguments().getString(ARG_PARAM1); + mParam2 = getArguments().getString(ARG_PARAM2); + } + } + + @Override + public View onCreateView(LayoutInflater inflater, ViewGroup container, + Bundle savedInstanceState) { + // Inflate the layout for this fragment + return inflater.inflate(R.layout.fragment_administrator_screen, container, false); + } +} \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_back.xml b/app/src/main/res/drawable/ic_back.xml new file mode 100644 index 0000000..6081ae5 --- /dev/null +++ b/app/src/main/res/drawable/ic_back.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_block.xml b/app/src/main/res/drawable/ic_block.xml new file mode 100644 index 0000000..f8c5c7c --- /dev/null +++ b/app/src/main/res/drawable/ic_block.xml @@ -0,0 +1,12 @@ + + + + diff --git a/app/src/main/res/layout/main_fragment.xml b/app/src/main/res/layout/main_fragment.xml index 1303e85..662a7b4 100644 --- a/app/src/main/res/layout/main_fragment.xml +++ b/app/src/main/res/layout/main_fragment.xml @@ -112,18 +112,18 @@ android:layout_height="35dp" android:background="@drawable/button_grestroke_whiteback" app:layout_constraintBottom_toBottomOf="@+id/photo_field" - app:layout_constraintEnd_toEndOf="@+id/position_field" - app:layout_constraintTop_toBottomOf="@+id/position_field" /> + app:layout_constraintEnd_toEndOf="@+id/username_field" /> + diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 57cd0c6..721dd84 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -31,4 +31,6 @@ Введите логин сотрудника чтобы посмотреть информацию о нем error + Заблокировать + доступ \ No newline at end of file