sudoxreboot/habitica-android
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica-android.git synced 2026-05-20 12:49:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix todo reminder dialog not being scrollable.

Browse source 
Fixes #579
This commit is contained in:
Phillip Thelen 2016-07-22 12:03:11 +02:00
parent e544a9a3ad
commit 0ea1f4d4b1
3 changed files with 33 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
Habitica/res/layout/custom_date_time_dialogue.xml
View file

@ -1,24 +1,28 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical" android:layout_width="match_parent"
android:layout_height="match_parent">
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical" android:layout_width="match_parent"
android:layout_height="match_parent">
<LinearLayout
android:orientation="vertical" android:layout_width="match_parent"
android:layout_height="wrap_content">
<DatePicker
android:id="@+id/datePicker"
android:layout_width="wrap_content"
android:layout_height="wrap_content" >
</DatePicker>
<DatePicker
android:id="@+id/datePicker"
android:layout_width="wrap_content"
android:layout_height="wrap_content" >
</DatePicker>
<TimePicker
android:id="@+id/timePicker"
android:layout_width="wrap_content"
android:layout_height="wrap_content" >
</TimePicker>
<TimePicker
android:id="@+id/timePicker"
android:layout_width="wrap_content"
android:layout_height="wrap_content" >
</TimePicker>
<Button
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Confirm"
android:id="@+id/customDialogConfirmButton"
/>
</LinearLayout>
<Button
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/confirm"
android:id="@+id/customDialogConfirmButton"
/>
</LinearLayout>
</ScrollView>

1
Habitica/res/values/strings.xml
View file

@ -347,4 +347,5 @@ To start, which parts of your life do you want to improve?</string>
<string name="open_in_store">Open in play store</string>
<string name="change_class_confirmation">Are you sure you want to change your class? This will cost 3 gems.</string>
<string name="leaderMessage" formatted="false">Message from %1$s</string>
<string name="confirm">Confirm</string>
</resources>

14
Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/TaskFormActivity.java
View file

@ -489,13 +489,15 @@ public class TaskFormActivity extends BaseActivity implements AdapterView.OnItem
@OnClick(R.id.add_reminder_button)
public void addReminder() {
RemindersItem item = remindersManager.createReminderFromDateString(newRemindersEditText.getText().toString());
if (item == null) {
return;
if (newRemindersEditText.getText().length() > 0) {
RemindersItem item = remindersManager.createReminderFromDateString(newRemindersEditText.getText().toString());
if (item == null) {
return;
}
item.setType(taskType);
remindersAdapter.addItem(item);
newRemindersEditText.setText("");
}
item.setType(taskType);
remindersAdapter.addItem(item);
newRemindersEditText.setText("");
}
@OnClick(R.id.new_reminder_edittext)