diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/activities/PNModeActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/loki/activities/PNModeActivity.kt index fe29f58914..5ddc8b9682 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/loki/activities/PNModeActivity.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/loki/activities/PNModeActivity.kt @@ -43,6 +43,7 @@ class PNModeActivity : BaseActionBarActivity() { backgroundPollingOptionView.mainColor = resources.getColorWithID(R.color.pn_option_background, theme) backgroundPollingOptionView.strokeColor = resources.getColorWithID(R.color.pn_option_border, theme) registerButton.setOnClickListener { register() } + toggleFCM() } override fun onCreateOptionsMenu(menu: Menu?): Boolean { diff --git a/app/src/main/res/layout-sw400dp/activity_recovery_phrase_restore.xml b/app/src/main/res/layout-sw400dp/activity_recovery_phrase_restore.xml index 83bd3e1244..b88592a68c 100644 --- a/app/src/main/res/layout-sw400dp/activity_recovery_phrase_restore.xml +++ b/app/src/main/res/layout-sw400dp/activity_recovery_phrase_restore.xml @@ -35,7 +35,7 @@ style="@style/SessionEditText" android:id="@+id/mnemonicEditText" android:layout_width="match_parent" - android:layout_height="80dp" + android:layout_height="64dp" android:layout_marginLeft="@dimen/very_large_spacing" android:layout_marginTop="12dp" android:layout_marginRight="@dimen/very_large_spacing" @@ -43,7 +43,7 @@ android:paddingBottom="0dp" android:gravity="center_vertical" android:inputType="textMultiLine" - android:maxLines="2" + android:maxLines="3" android:hint="@string/activity_restore_seed_edit_text_hint" /> diff --git a/app/src/main/res/layout/activity_recovery_phrase_restore.xml b/app/src/main/res/layout/activity_recovery_phrase_restore.xml index 47cf545565..188c592e97 100644 --- a/app/src/main/res/layout/activity_recovery_phrase_restore.xml +++ b/app/src/main/res/layout/activity_recovery_phrase_restore.xml @@ -35,7 +35,7 @@ style="@style/SmallSessionEditText" android:id="@+id/mnemonicEditText" android:layout_width="match_parent" - android:layout_height="80dp" + android:layout_height="64dp" android:layout_marginLeft="@dimen/very_large_spacing" android:layout_marginTop="10dp" android:layout_marginRight="@dimen/very_large_spacing" @@ -43,7 +43,7 @@ android:paddingBottom="0dp" android:gravity="center_vertical" android:inputType="textMultiLine" - android:maxLines="2" + android:maxLines="3" android:hint="@string/activity_restore_seed_edit_text_hint" /> 12sp 15sp 17sp - 22sp + 20sp 26sp 50sp