diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DelegateBase.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DelegateBase.java index 57e7b5b78..1f78fe85e 100644 --- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DelegateBase.java +++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DelegateBase.java @@ -546,12 +546,10 @@ public abstract class DelegateBase implements DlgClickNotify, } } - protected Dialog buildNamerDlg( Renamer namer, int titleID, - OnClickListener lstnr1, OnClickListener lstnr2, - DlgID dlgID ) + protected Dialog buildNamerDlg( Renamer namer, OnClickListener lstnr1, + OnClickListener lstnr2, DlgID dlgID ) { Dialog dialog = makeAlertBuilder() - .setTitle( titleID ) .setPositiveButton( android.R.string.ok, lstnr1 ) .setNegativeButton( android.R.string.cancel, lstnr2 ) .setView( namer ) diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/GamesListDelegate.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/GamesListDelegate.java index eefc2e142..e40b247b8 100644 --- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/GamesListDelegate.java +++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/GamesListDelegate.java @@ -717,8 +717,7 @@ public class GamesListDelegate extends ListDelegateBase m_adapter.invalName( rowid ); } }; - dialog = buildNamerDlg( namer, R.string.game_rename_title, - lstnr, null, DlgID.RENAME_GAME ); + dialog = buildNamerDlg( namer, lstnr, null, DlgID.RENAME_GAME ); } break; @@ -737,8 +736,7 @@ public class GamesListDelegate extends ListDelegateBase self.mkListAdapter(); } }; - dialog = buildNamerDlg( namer, R.string.game_name_group_title, - lstnr, null, DlgID.RENAME_GROUP ); + dialog = buildNamerDlg( namer, lstnr, null, DlgID.RENAME_GROUP ); } break; @@ -771,9 +769,7 @@ public class GamesListDelegate extends ListDelegateBase curThis().showNewGroupIf(); } }; - dialog = buildNamerDlg( namer, - R.string.game_name_group_title, - lstnr, lstnr2, DlgID.RENAME_GROUP ); + dialog = buildNamerDlg( namer, lstnr, lstnr2, DlgID.RENAME_GROUP ); } break; diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/KnownPlayersDelegate.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/KnownPlayersDelegate.java index 7440a5d81..31990cbf2 100644 --- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/KnownPlayersDelegate.java +++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/KnownPlayersDelegate.java @@ -109,8 +109,7 @@ public class KnownPlayersDelegate extends DelegateBase { tryRename( oldName, namer.getName() ); } }; - dialog = buildNamerDlg( namer, R.string.knowns_rename_title, - lstnr, null, dlgID ); + dialog = buildNamerDlg( namer, lstnr, null, dlgID ); break; } diff --git a/xwords4/android/app/src/main/res/layout/renamer.xml b/xwords4/android/app/src/main/res/layout/renamer.xml index 66b4e53de..53b271816 100644 --- a/xwords4/android/app/src/main/res/layout/renamer.xml +++ b/xwords4/android/app/src/main/res/layout/renamer.xml @@ -4,13 +4,13 @@ xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="fill_parent" android:layout_height="wrap_content" - android:orientation="vertical"> + android:orientation="vertical" + android:padding="20dip" + > @@ -19,8 +19,8 @@ style="@style/edit_w_clear" android:layout_height="wrap_content" android:layout_width="fill_parent" - android:layout_marginLeft="30dip" - android:layout_marginRight="30dip" + android:layout_marginLeft="10dip" + android:layout_marginRight="10dip" android:autoText="false" android:maxLines="1" android:inputType="text" diff --git a/xwords4/android/app/src/main/res/values/strings.xml b/xwords4/android/app/src/main/res/values/strings.xml index dfccaee0b..ec455c6e2 100644 --- a/xwords4/android/app/src/main/res/values/strings.xml +++ b/xwords4/android/app/src/main/res/values/strings.xml @@ -138,8 +138,6 @@ Games that have already connected to the relay cannot be copied. Use “New from” for a ready-to-play copy with all the same settings. - - Rename game Change the name of this game to: @@ -1978,7 +1976,6 @@ deleted.) Change the name of this group to: - Name group The group for new games, %1$s, cannot be deleted. @@ -2629,8 +2626,6 @@ remove “%1$s” from Known Players?\n\n(This action cannot be undone, but players may reappear if you still have active games with them.) - - Rename Player Unable to change name from