Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2024-12-30 10:26:58 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

remove titles from renamer alerts

Browse source
This commit is contained in:
Eric House 2022-06-25 21:18:35 -07:00
parent 880e0812a7
commit 0f2d8e7e8f
5 changed files with 11 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
xwords4/android/app/src/main/java/org/eehouse/android/xw4/DelegateBase.java
View file

@ -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 )

10
xwords4/android/app/src/main/java/org/eehouse/android/xw4/GamesListDelegate.java
View file

@ -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;

3
xwords4/android/app/src/main/java/org/eehouse/android/xw4/KnownPlayersDelegate.java
View file

@ -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;
}

10
xwords4/android/app/src/main/res/layout/renamer.xml
View file

@ -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"
>
<TextView android:id="@+id/name_label"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:layout_marginLeft="20dip"
android:layout_marginRight="20dip"
android:textAppearance="?android:attr/textAppearanceMedium"
/>
@ -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"

5
xwords4/android/app/src/main/res/values/strings.xml
View file

@ -138,8 +138,6 @@
<string name="no_copy_network">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.</string>
<!-- -->
<string name="game_rename_title">Rename game</string>
<!-- text within rename dialog (triggered by selecting
list_item_rename) -->
<string name="rename_label">Change the name of this game to:</string>
@ -1978,7 +1976,6 @@
deleted.)</item>
</plurals>
<string name="rename_group_label">Change the name of this group to:</string>
<string name="game_name_group_title">Name group</string>
<string name="cannot_delete_default_group_fmt">The group for new games, %1$s,
cannot be deleted.</string>
<plurals name="group_name_fmt">
@ -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.)</string>
<!-- Title of Alert for renaming Known Player -->
<string name="knowns_rename_title">Rename Player</string>
<!-- Error message when rename fails (which right now should only
happen because the name is in use) -->
<string name="knowns_dup_name_fmt">Unable to change name from