wismna/donext
1
0
Fork 0
mirror of https://github.com/wismna/DoNext.git synced 2025-10-03 07:30:13 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix some layout issues

Browse Source
This commit is contained in:
Geoffroy Bonneville
2023-12-22 23:12:19 +01:00
parent 6c992f6eae
commit ecfce99be1
10 changed files with 51 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/src/main/res/layout-v21/content_task_form.xml
View File

@@ -22,7 +22,8 @@
android:textSize="30sp" android:textSize="30sp"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:imeOptions="flagNoFullscreen"/> android:imeOptions="flagNoFullscreen"
android:autofillHints="@string/new_task_name_hint" />
<EditText <EditText
android:id="@+id/new_task_description" android:id="@+id/new_task_description"
android:hint="@string/new_task_description_hint" android:hint="@string/new_task_description_hint"
@@ -32,7 +33,9 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_below="@id/new_task_name" android:layout_below="@id/new_task_name"
android:imeOptions="flagNoFullscreen" /> android:imeOptions="flagNoFullscreen"
android:autofillHints="@string/new_task_description_hint"
android:inputType="textMultiLine" />
<TextView <TextView
android:id="@+id/new_task_priority_label" android:id="@+id/new_task_priority_label"
android:text="@string/new_task_priority" android:text="@string/new_task_priority"

38
app/src/main/res/layout-w600dp/fragment_main.xml
View File

@@ -15,46 +15,52 @@
</com.google.android.material.appbar.AppBarLayout> </com.google.android.material.appbar.AppBarLayout>
<androidx.constraintlayout.widget.ConstraintLayout <androidx.constraintlayout.widget.ConstraintLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_marginTop="?attr/actionBarSize"> android:layout_marginTop="?attr/actionBarSize">
<androidx.constraintlayout.widget.Guideline <androidx.constraintlayout.widget.Guideline
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/left_guideline" android:id="@+id/left_guideline"
app:layout_constraintGuide_percent="0"
android:orientation="vertical"/>
<androidx.constraintlayout.widget.Guideline
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical"
app:layout_constraintGuide_percent="0" />
<androidx.constraintlayout.widget.Guideline
android:id="@+id/center_guideline" android:id="@+id/center_guideline"
app:layout_constraintGuide_percent=".20"
android:orientation="vertical"/>
<androidx.constraintlayout.widget.Guideline
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical"
app:layout_constraintGuide_percent=".20" />
<androidx.constraintlayout.widget.Guideline
android:id="@+id/right_guideline" android:id="@+id/right_guideline"
app:layout_constraintGuide_percent="1" android:layout_width="wrap_content"
android:orientation="vertical"/> android:layout_height="wrap_content"
android:orientation="vertical"
app:layout_constraintGuide_percent="1" />
<android.widget.ListView <android.widget.ListView
android:id="@+id/list" android:id="@+id/list"
android:layout_height="wrap_content"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content"
android:choiceMode="singleChoice" android:choiceMode="singleChoice"
android:listSelector="@drawable/tasklist_select" android:listSelector="@drawable/tasklist_select"
app:layout_constraintLeft_toRightOf="@+id/left_guideline" app:layout_constraintLeft_toRightOf="@+id/left_guideline"
app:layout_constraintRight_toLeftOf="@+id/center_guideline" /> app:layout_constraintRight_toLeftOf="@+id/center_guideline"
app:layout_constraintTop_toTopOf="@+id/container" />
<com.wismna.geoffroy.donext.widgets.NonSwipeableViewPager <com.wismna.geoffroy.donext.widgets.NonSwipeableViewPager
android:id="@+id/container" android:id="@+id/container"
android:layout_height="match_parent"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="0dp"
android:layout_toEndOf="@id/list" android:layout_toEndOf="@id/list"
android:background="@android:color/background_light" android:background="@android:color/background_light"
app:layout_behavior="@string/appbar_scrolling_view_behavior" app:layout_behavior="@string/appbar_scrolling_view_behavior"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toRightOf="@+id/center_guideline" app:layout_constraintLeft_toRightOf="@+id/center_guideline"
app:layout_constraintRight_toLeftOf="@+id/right_guideline" /> app:layout_constraintRight_toLeftOf="@+id/right_guideline"
app:layout_constraintTop_toTopOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
</androidx.coordinatorlayout.widget.CoordinatorLayout> </androidx.coordinatorlayout.widget.CoordinatorLayout>

2
app/src/main/res/layout/activity_history.xml
View File

@@ -5,7 +5,7 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:id="@+id/main_content" android:id="@+id/main_content"
tools:context="com.wismna.geoffroy.donext.activities.HistoryActivity"> tools:context="com.wismna.geoffroy.donext.activities.HistoryActivity">
<fragment <androidx.fragment.app.FragmentContainerView
android:id="@+id/fragment_main" android:id="@+id/fragment_main"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"

5
app/src/main/res/layout/activity_main.xml
View File

@@ -7,7 +7,7 @@
android:fitsSystemWindows="true" android:fitsSystemWindows="true"
tools:context=".activities.MainActivity"> tools:context=".activities.MainActivity">
<fragment <androidx.fragment.app.FragmentContainerView
android:id="@+id/fragment_main" android:id="@+id/fragment_main"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
@@ -21,6 +21,7 @@
android:layout_gravity="end|bottom" android:layout_gravity="end|bottom"
android:layout_margin="16dp" android:layout_margin="16dp"
android:onClick="onNewTaskClick" android:onClick="onNewTaskClick"
android:src="@drawable/ic_add" /> android:src="@drawable/ic_add"
android:contentDescription="@string/action_new_task" />
</androidx.coordinatorlayout.widget.CoordinatorLayout> </androidx.coordinatorlayout.widget.CoordinatorLayout>

5
app/src/main/res/layout/activity_today.xml
View File

@@ -22,7 +22,7 @@
android:textSize="24sp"/> android:textSize="24sp"/>
</com.google.android.material.appbar.AppBarLayout> </com.google.android.material.appbar.AppBarLayout>
<fragment <androidx.fragment.app.FragmentContainerView
android:name="com.wismna.geoffroy.donext.fragments.TasksFragment" android:name="com.wismna.geoffroy.donext.fragments.TasksFragment"
android:id="@+id/fragment_task_list" android:id="@+id/fragment_task_list"
android:layout_width="match_parent" android:layout_width="match_parent"
@@ -37,6 +37,7 @@
android:layout_gravity="end|bottom" android:layout_gravity="end|bottom"
android:layout_margin="@dimen/fab_margin" android:layout_margin="@dimen/fab_margin"
android:onClick="onNewTaskClick" android:onClick="onNewTaskClick"
android:src="@drawable/ic_add" /> android:src="@drawable/ic_add"
android:contentDescription="@string/action_new_task" />
</androidx.coordinatorlayout.widget.CoordinatorLayout> </androidx.coordinatorlayout.widget.CoordinatorLayout>

7
app/src/main/res/layout/content_task_form.xml
View File

@@ -22,7 +22,8 @@
android:textSize="30sp" android:textSize="30sp"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:imeOptions="flagNoFullscreen"/> android:imeOptions="flagNoFullscreen"
android:autofillHints="@string/new_task_name_hint" />
<EditText <EditText
android:id="@+id/new_task_description" android:id="@+id/new_task_description"
android:hint="@string/new_task_description_hint" android:hint="@string/new_task_description_hint"
@@ -32,7 +33,9 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_below="@id/new_task_name" android:layout_below="@id/new_task_name"
android:imeOptions="flagNoFullscreen" /> android:imeOptions="flagNoFullscreen"
android:autofillHints="@string/new_task_description_hint"
android:inputType="textMultiLine" />
<TextView <TextView
android:id="@+id/new_task_priority_label" android:id="@+id/new_task_priority_label"
android:text="@string/new_task_priority" android:text="@string/new_task_priority"

8
app/src/main/res/layout/content_tasklists.xml
View File

@@ -24,7 +24,8 @@
android:layout_weight="2" android:layout_weight="2"
android:hint="@string/task_list_new_list_hint" android:hint="@string/task_list_new_list_hint"
android:maxLines="1" android:maxLines="1"
android:inputType="text" /> android:inputType="text"
android:autofillHints="@string/task_list_new_list_hint" />
<Button <Button
android:id="@+id/new_task_list_button" android:id="@+id/new_task_list_button"
android:layout_width="80dp" android:layout_width="80dp"
@@ -32,10 +33,7 @@
style="@style/Widget.AppCompat.Button.Colored" style="@style/Widget.AppCompat.Button.Colored"
android:text="@string/task_list_new_list_create"/> android:text="@string/task_list_new_list_create"/>
</LinearLayout> </LinearLayout>
<androidx.recyclerview.widget.RecyclerView <androidx.recyclerview.widget.RecyclerView xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/task_lists_view" android:id="@+id/task_lists_view"
android:name="com.wismna.geoffroy.donext.fragments.TaskListFragment" android:name="com.wismna.geoffroy.donext.fragments.TaskListFragment"
android:layout_width="match_parent" android:layout_width="match_parent"

3
app/src/main/res/layout/content_today_form.xml
View File

@@ -14,7 +14,8 @@
android:textSize="30sp" android:textSize="30sp"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:imeOptions="flagNoFullscreen" /> android:imeOptions="flagNoFullscreen"
android:autofillHints="@string/today_search_hint" />
<ListView <ListView
android:id="@+id/today_tasks" android:id="@+id/today_tasks"
android:layout_width="match_parent" android:layout_width="match_parent"

3
app/src/main/res/layout/fragment_tasklist.xml
View File

@@ -24,7 +24,8 @@
android:layout_weight="2" android:layout_weight="2"
android:inputType="text" android:inputType="text"
android:hint="@string/task_list_edit_list_hint" android:hint="@string/task_list_edit_list_hint"
android:textAppearance="?android:attr/textAppearanceLarge"/> android:textAppearance="?android:attr/textAppearanceLarge"
android:autofillHints="@string/task_list_edit_list_hint" />
<Button <Button
android:id="@+id/task_list_delete" android:id="@+id/task_list_delete"
android:layout_width="wrap_content" android:layout_width="wrap_content"

11
app/src/main/res/layout/fragment_tasks.xml
View File

@@ -1,11 +1,10 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<FrameLayout <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="@drawable/task_select" > android:background="@drawable/task_select">
<TextView <TextView
android:id="@+id/no_more_tasks" android:id="@+id/no_more_tasks"
android:text="@string/task_no_tasks" android:text="@string/task_no_tasks"
@@ -25,10 +24,10 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="start|bottom" android:layout_gravity="start|bottom"
android:layout_marginBottom="40dp" android:layout_marginBottom="40dp"
android:drawableEnd="@drawable/ic_arrow_right_light"
android:drawablePadding="10dp" android:drawablePadding="10dp"
android:gravity="center_vertical" android:gravity="center_vertical"
android:visibility="gone"/> android:visibility="gone"
app:drawableEndCompat="@drawable/ic_arrow_right_light" />
<androidx.recyclerview.widget.RecyclerView <androidx.recyclerview.widget.RecyclerView
android:id="@+id/task_list_view" android:id="@+id/task_list_view"
android:layout_width="match_parent" android:layout_width="match_parent"
@@ -75,7 +74,7 @@
android:layout_marginBottom="40dp" android:layout_marginBottom="40dp"
android:layout_gravity="bottom" android:layout_gravity="bottom"
android:background="@color/colorPrimaryLight"/> android:background="@color/colorPrimaryLight"/>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="40dp" android:layout_height="40dp"
android:layout_gravity="bottom" android:layout_gravity="bottom"