Update
This commit is contained in:
Данил
Binary file not shown.
|
After Width: | Height: | Size: 18 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 9.0 KiB |
@@ -21,56 +21,17 @@
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:inputType="textMultiLine"/>
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
<Button
|
||||
android:id="@+id/btnDatePick"
|
||||
android:text="@string/button_DefaultData"
|
||||
android:layout_width="200sp"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="horizontal">
|
||||
<EditText
|
||||
android:id="@+id/day"
|
||||
android:hint="@string/hint_Day"
|
||||
android:textSize="20sp"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1"
|
||||
android:inputType="numberDecimal"/>
|
||||
<EditText
|
||||
android:id="@+id/month"
|
||||
android:hint="@string/hint_Month"
|
||||
android:textSize="20sp"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1"
|
||||
android:inputType="numberDecimal"/>
|
||||
<EditText
|
||||
android:id="@+id/year"
|
||||
android:hint="@string/hint_Yar"
|
||||
android:textSize="20sp"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1"
|
||||
android:inputType="numberDecimal"/>
|
||||
<EditText
|
||||
android:id="@+id/hour"
|
||||
android:hint="@string/hint_Hour"
|
||||
android:textSize="20sp"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1"
|
||||
android:inputType="numberDecimal"/>
|
||||
<EditText
|
||||
android:id="@+id/minute"
|
||||
android:hint="@string/hint_Minute"
|
||||
android:textSize="20sp"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1"
|
||||
android:inputType="numberDecimal"/>
|
||||
</LinearLayout>
|
||||
android:layout_margin="5sp"/>
|
||||
<Button
|
||||
android:id="@+id/AddTask"
|
||||
android:text="@string/button_AddTask"
|
||||
android:textSize="20sp"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"/>
|
||||
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_margin="5sp"/>
|
||||
</LinearLayout>
|
||||
@@ -0,0 +1,37 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:tools="http://schemas.android.com/tools"
|
||||
android:id="@+id/main"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
tools:context=".Activities.AddNewTask"
|
||||
android:orientation="vertical">
|
||||
|
||||
<EditText
|
||||
android:id="@+id/TaskName"
|
||||
android:hint="@string/hint_TaskName"
|
||||
android:textSize="20sp"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:inputType="textPersonName"/>
|
||||
<EditText
|
||||
android:id="@+id/TaskDescription"
|
||||
android:hint="@string/hint_TaskDescription"
|
||||
android:textSize="20sp"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:inputType="textMultiLine"/>
|
||||
<Button
|
||||
android:id="@+id/btnDatePick"
|
||||
android:text="@string/button_DefaultData"
|
||||
android:layout_width="200sp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_margin="5sp"/>
|
||||
<Button
|
||||
android:id="@+id/btnEditTask"
|
||||
android:text="@string/button_editTask"
|
||||
android:textSize="20sp"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_margin="5sp"/>
|
||||
</LinearLayout>
|
||||
@@ -8,7 +8,6 @@
|
||||
android:orientation="vertical"
|
||||
tools:context=".Activities.MainMenu">
|
||||
|
||||
|
||||
<EditText
|
||||
android:id="@+id/findLine"
|
||||
android:layout_width="match_parent"
|
||||
@@ -29,9 +28,18 @@
|
||||
app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
|
||||
app:layout_constraintTop_toBottomOf="@id/findLine"/>
|
||||
|
||||
<com.google.android.material.floatingactionbutton.FloatingActionButton
|
||||
android:id="@+id/button_SingOut"
|
||||
android:src="@drawable/exit"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
app:layout_constraintBottom_toTopOf="@+id/button_addNewTask"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
android:layout_margin="20sp"/>
|
||||
|
||||
<com.google.android.material.floatingactionbutton.FloatingActionButton
|
||||
android:id="@+id/button_addNewTask"
|
||||
android:src="@android:drawable/ic_menu_add"
|
||||
android:src="@drawable/add"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
<string name="button_NO">No</string>
|
||||
<string name="hint_Login">Login</string>
|
||||
<string name="hint_Password">Password</string>
|
||||
<string name="hint_Find">Task name</string>
|
||||
<string name="hint_Find">Name or description</string>
|
||||
<string name="hint_TaskName">Task name</string>
|
||||
<string name="hint_TaskDescription">Description</string>
|
||||
<string name="hint_Minute">Minute</string>
|
||||
@@ -22,8 +22,7 @@
|
||||
<string name="snackbar_EnterName">Enter task name</string>
|
||||
<string name="snackbar_EnterDate">Enter task date</string>
|
||||
<string name="snackbar_DataBaseError">Something went wrong.</string>
|
||||
<string name="title_AlertRemoveTask">Remove task?</string>
|
||||
<string name="message_RemoveTask">Task will remove on all devices.</string>
|
||||
<string name="button_editTask">Edit task</string>
|
||||
<string name="button_YES">Yes</string>
|
||||
<string name="hint_Day">Day</string>
|
||||
<string name="hint_Month">Month</string>
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
<string name="button_NO">Нет</string>
|
||||
<string name="hint_Login">Логин</string>
|
||||
<string name="hint_Password">Пароль</string>
|
||||
<string name="hint_Find">Название задачи</string>
|
||||
<string name="hint_Find">Название или описание</string>
|
||||
<string name="hint_TaskName">Название задачи</string>
|
||||
<string name="hint_TaskDescription">Описание</string>
|
||||
<string name="hint_Minute">Минута</string>
|
||||
@@ -22,8 +22,7 @@
|
||||
<string name="snackbar_EnterName">Введите назвние</string>
|
||||
<string name="snackbar_EnterDate">Введите дату</string>
|
||||
<string name="snackbar_DataBaseError">Что-то пошло не так</string>
|
||||
<string name="title_AlertRemoveTask">Удалить задачу?</string>
|
||||
<string name="message_RemoveTask">Задача удалится на всех устройствах.</string>
|
||||
<string name="button_editTask">Редакировать</string>
|
||||
<string name="button_YES">Да</string>
|
||||
<string name="hint_Day">День</string>
|
||||
<string name="hint_Month">Месяц</string>
|
||||
|
||||
@@ -7,13 +7,15 @@
|
||||
<string name="button_offline">Offline</string>
|
||||
<string name="button_Sort">Sort</string>
|
||||
<string name="button_AddTask">Add task</string>
|
||||
<string name="button_editTask">Edit task</string>
|
||||
<string name="button_YES">Yes</string>
|
||||
<string name="button_NO">No</string>
|
||||
<string name="button_DefaultData" translatable="false">DD/MM/YEAR</string>
|
||||
|
||||
<!-- Hints -->
|
||||
<string name="hint_Login">Login</string>
|
||||
<string name="hint_Password">Password</string>
|
||||
<string name="hint_Find">Task name</string>
|
||||
<string name="hint_Find">Name or description</string>
|
||||
<string name="hint_TaskName">Task name</string>
|
||||
<string name="hint_TaskDescription">Description</string>
|
||||
<string name="hint_Day">Day</string>
|
||||
@@ -33,9 +35,4 @@
|
||||
<string name="snackbar_EnterDate">Enter task date</string>
|
||||
<string name="snackbar_DataBaseError">Something went wrong.</string>
|
||||
|
||||
<!-- Titles -->
|
||||
<string name="title_AlertRemoveTask">Remove task?</string>
|
||||
|
||||
<!-- Messages -->
|
||||
<string name="message_RemoveTask">Task will remove on all devices.</string>
|
||||
</resources>
|
||||
Reference in New Issue
Block a user