Merge pull request #472 from chennemann/feat/create-habit-with-long-description

fix: habits with long description could not be saved
pull/480/head
Alinson S. Xavier 7 years ago committed by GitHub
commit db1ba822fe
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -19,6 +19,7 @@
package org.isoron.uhabits.activities.habits.edit; package org.isoron.uhabits.activities.habits.edit;
import android.app.Dialog;
import android.content.*; import android.content.*;
import android.os.*; import android.os.*;
import android.support.annotation.*; import android.support.annotation.*;
@ -117,6 +118,17 @@ public class EditHabitDialog extends AppCompatDialogFragment
return view; return view;
} }
@NonNull
@Override
public Dialog onCreateDialog(Bundle savedInstanceState) {
final Dialog dialog = super.onCreateDialog(savedInstanceState);
final Window window = dialog.getWindow();
if (window != null) {
window.setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE);
}
return dialog;
}
protected int getTitle() protected int getTitle()
{ {
if (originalHabit != null) return R.string.edit_habit; if (originalHabit != null) return R.string.edit_habit;

@ -17,11 +17,14 @@
~ with this program. If not, see <http://www.gnu.org/licenses/>. ~ with this program. If not, see <http://www.gnu.org/licenses/>.
--> -->
<LinearLayout <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="wrap_content"
android:layout_height="wrap_content">
<LinearLayout
android:id="@+id/container" android:id="@+id/container"
style="@style/dialogForm" style="@style/dialogForm"
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
tools:context=".activities.habits.edit.EditHabitDialog" tools:context=".activities.habits.edit.EditHabitDialog"
tools:ignore="MergeRootFrame"> tools:ignore="MergeRootFrame">
@ -32,22 +35,22 @@
<org.isoron.uhabits.activities.habits.edit.views.NameDescriptionPanel <org.isoron.uhabits.activities.habits.edit.views.NameDescriptionPanel
android:id="@+id/namePanel" android:id="@+id/namePanel"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"/> android:layout_height="wrap_content" />
<org.isoron.uhabits.activities.habits.edit.views.FrequencyPanel <org.isoron.uhabits.activities.habits.edit.views.FrequencyPanel
android:id="@+id/frequencyPanel" android:id="@+id/frequencyPanel"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"/> android:layout_height="wrap_content" />
<org.isoron.uhabits.activities.habits.edit.views.TargetPanel <org.isoron.uhabits.activities.habits.edit.views.TargetPanel
android:id="@+id/targetPanel" android:id="@+id/targetPanel"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"/> android:layout_height="wrap_content" />
<org.isoron.uhabits.activities.habits.edit.views.ReminderPanel <org.isoron.uhabits.activities.habits.edit.views.ReminderPanel
android:id="@+id/reminderPanel" android:id="@+id/reminderPanel"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"/> android:layout_height="wrap_content" />
</LinearLayout> </LinearLayout>
@ -56,23 +59,24 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="end" android:gravity="end"
android:paddingEnd="16dp" android:paddingStart="0dp"
android:paddingLeft="0dp" android:paddingLeft="0dp"
android:paddingRight="16dp" android:paddingEnd="16dp"
android:paddingStart="0dp"> android:paddingRight="16dp">
<Button <Button
android:id="@+id/buttonDiscard" android:id="@+id/buttonDiscard"
style="?android:attr/buttonBarButtonStyle" style="?android:attr/buttonBarButtonStyle"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/discard"/> android:text="@string/discard" />
<Button <Button
android:id="@+id/buttonSave" android:id="@+id/buttonSave"
style="?android:attr/buttonBarButtonStyle" style="?android:attr/buttonBarButtonStyle"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/save"/> android:text="@string/save" />
</LinearLayout>
</LinearLayout> </LinearLayout>
</LinearLayout> </ScrollView>
Loading…
Cancel
Save