Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix hidden remind me layout. center no todo imageView #116

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix hidden remind me layout. center no todo imageView #116

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
204 changes: 106 additions & 98 deletions app/src/main/res/layout/fragment_add_to_do.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,136 +80,144 @@

</com.example.avjindersinghsekhon.minimaltodo.Utility.CustomTextInputLayout>

<LinearLayout
android:id="@+id/todoReminderAndDateContainerLayout"
<ScrollView
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1.5"
android:orientation="vertical">


<LinearLayout
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_marginLeft="36dp"
android:layout_marginRight="36dp"
android:layout_marginTop="30dp"
android:layout_weight=".5"
android:gravity="center"
android:orientation="horizontal">

<ImageButton
android:id="@+id/userToDoReminderIconImageButton"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight=".4"
android:background="@android:color/transparent"
android:padding="8dp"
android:src="@drawable/ic_add_alarm_grey_200_24dp" />

<TextView
android:id="@+id/userToDoRemindMeTextView"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="2"
android:gravity="start"
android:paddingBottom="8dp"
android:paddingLeft="8dp"
android:paddingRight="8dp"
android:paddingTop="8dp"
android:text="@string/remind_me"
android:textColor="@color/secondary_text"
android:textSize="16sp" />

<android.support.v7.widget.SwitchCompat
android:id="@+id/toDoHasDateSwitchCompat"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_weight="1"
android:gravity="center"
android:padding="8dp" />

<Button
android:id="@+id/copyclipboard"
android:layout_width="0dp"
android:layout_height="28dp"
android:layout_margin="8dp"
android:layout_weight=".37"
android:background="@drawable/ic_content_copy_black_24dp"
android:backgroundTint="@color/grey600"
android:padding="8dp"
android:visibility="visible" />

</LinearLayout>
android:layout_weight="1.5">

<LinearLayout
android:id="@+id/toDoEnterDateLinearLayout"
android:id="@+id/todoReminderAndDateContainerLayout"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_marginLeft="36dp"
android:layout_marginRight="36dp"
android:layout_weight="1"
android:animateLayoutChanges="true"
android:gravity="center"
android:orientation="vertical">

<LinearLayout

<LinearLayout
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1"
android:gravity="top">

android:layout_marginLeft="36dp"
android:layout_marginRight="36dp"
android:layout_marginTop="30dp"
android:layout_weight=".5"
android:gravity="center"
android:orientation="horizontal">

<EditText
android:id="@+id/newTodoDateEditText"
<ImageButton
android:id="@+id/userToDoReminderIconImageButton"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1.5"
android:editable="false"
android:focusable="false"
android:focusableInTouchMode="false"
android:gravity="center"
android:textIsSelectable="false" />
android:layout_weight=".4"
android:background="@android:color/transparent"
android:padding="8dp"
android:src="@drawable/ic_add_alarm_grey_200_24dp" />

<TextView
android:id="@+id/userToDoRemindMeTextView"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight=".2"
android:gravity="center"
android:padding="4dp"
android:text="\@"
android:textColor="?attr/colorAccent" />

<EditText
android:id="@+id/newTodoTimeEditText"
android:layout_weight="2"
android:gravity="start"
android:paddingBottom="8dp"
android:paddingLeft="8dp"
android:paddingRight="8dp"
android:paddingTop="8dp"
android:text="@string/remind_me"
android:textColor="@color/secondary_text"
android:textSize="16sp" />

<android.support.v7.widget.SwitchCompat
android:id="@+id/toDoHasDateSwitchCompat"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_weight="1"
android:editable="false"
android:focusable="false"
android:focusableInTouchMode="false"
android:gravity="center"
android:textIsSelectable="false" />
android:padding="8dp" />

<Button
android:id="@+id/copyclipboard"
android:layout_width="0dp"
android:layout_height="28dp"
android:layout_margin="8dp"
android:layout_weight=".37"
android:background="@drawable/ic_content_copy_black_24dp"
android:backgroundTint="@color/grey600"
android:padding="8dp"
android:visibility="visible" />

</LinearLayout>

<TextView
android:id="@+id/newToDoDateTimeReminderTextView"
<LinearLayout
android:id="@+id/toDoEnterDateLinearLayout"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="2"
android:gravity="start"
android:text="@string/remind_date_and_time"
android:textColor="@color/secondary_text"
android:textSize="14sp" />
android:layout_marginLeft="36dp"
android:layout_marginRight="36dp"
android:layout_weight="1"
android:animateLayoutChanges="true"
android:gravity="center"
android:orientation="vertical">

<LinearLayout

android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1"
android:gravity="top">


<EditText
android:id="@+id/newTodoDateEditText"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1.5"
android:editable="false"
android:focusable="false"
android:focusableInTouchMode="false"
android:gravity="center"
android:textIsSelectable="false" />

<TextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight=".2"
android:gravity="center"
android:padding="4dp"
android:text="\@"
android:textColor="?attr/colorAccent" />

<EditText
android:id="@+id/newTodoTimeEditText"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:editable="false"
android:focusable="false"
android:focusableInTouchMode="false"
android:gravity="center"
android:textIsSelectable="false" />


</LinearLayout>

<TextView
android:id="@+id/newToDoDateTimeReminderTextView"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="2"
android:gravity="start"
android:text="@string/remind_date_and_time"
android:textColor="@color/secondary_text"
android:textSize="14sp" />

</LinearLayout>


</LinearLayout>

</ScrollView>


</LinearLayout>

</LinearLayout>

Expand Down
3 changes: 2 additions & 1 deletion app/src/main/res/layout/fragment_main.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,9 @@

<LinearLayout
android:id="@+id/toDoEmptyView"
android:orientation="vertical"
android:gravity="center"
android:orientation="vertical"
android:layout_gravity="center"
android:layout_width="match_parent"
android:layout_height="match_parent">

Expand Down