diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/ConnStatusHandler.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/ConnStatusHandler.java index cd2b7a970..801cb9346 100644 --- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/ConnStatusHandler.java +++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/ConnStatusHandler.java @@ -472,7 +472,7 @@ public class ConnStatusHandler { Assert.assertTrue( !BuildConfig.DEBUG || 1 >= Math.abs(scratchR.width() - scratchR.height()) ); - drawIn( canvas, res, R.drawable.multigame__gen, scratchR ); + drawIn( canvas, res, R.drawable.ic_multigame, scratchR ); if ( 0 < s_moveCount && XWPrefs.moveCountEnabled( context ) ) { String str = String.format( "%d", s_moveCount ); diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/GameListItem.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/GameListItem.java index 21b49355c..94594f1b0 100644 --- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/GameListItem.java +++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/GameListItem.java @@ -324,7 +324,7 @@ public class GameListItem extends LinearLayout m_modTime.setText( df.format( new Date( lastMoveTime ) ) ); int iconID = summary.isMultiGame() ? - R.drawable.multigame__gen : R.drawable.sologame__gen; + R.drawable.ic_multigame : R.drawable.ic_sologame; m_gameTypeImage.setImageResource( iconID ); boolean hasChat = summary.isMultiGame(); 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 55d393796..7ffd74c3c 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 @@ -869,7 +869,7 @@ public class GamesListDelegate extends ListDelegateBase boolean canDoDefaults = solo || 0 < XWPrefs.getAddrTypes( m_activity ).size(); - int iconResID = solo ? R.drawable.sologame__gen : R.drawable.multigame__gen; + int iconResID = solo ? R.drawable.ic_sologame : R.drawable.ic_multigame; int titleID = solo ? R.string.new_game : R.string.new_game_networked; String msg = getString( canDoDefaults ? R.string.new_game_message @@ -908,13 +908,13 @@ public class GamesListDelegate extends ListDelegateBase case GAMES_LIST_NAME_REMATCH: { final LinearLayout view = (LinearLayout) LocUtils.inflate( m_activity, R.layout.msg_label_and_edit ); - int iconResID = R.drawable.sologame__gen; + int iconResID = R.drawable.ic_sologame; if ( null != m_rematchExtras ) { EditWClear edit = (EditWClear)view.findViewById( R.id.edit ); edit.setText( m_rematchExtras.getString( REMATCH_NEWNAME_EXTRA )); boolean solo = m_rematchExtras.getBoolean( REMATCH_IS_SOLO, true ); if ( !solo ) { - iconResID = R.drawable.multigame__gen; + iconResID = R.drawable.ic_multigame; } view.findViewById( R.id.msg ).setVisibility( View.GONE ); } diff --git a/xwords4/android/app/src/main/res/drawable/ic_multigame.xml b/xwords4/android/app/src/main/res/drawable/ic_multigame.xml new file mode 100644 index 000000000..437dd1000 --- /dev/null +++ b/xwords4/android/app/src/main/res/drawable/ic_multigame.xml @@ -0,0 +1,22 @@ + + + + + + diff --git a/xwords4/android/app/src/main/res/drawable/ic_sologame.xml b/xwords4/android/app/src/main/res/drawable/ic_sologame.xml new file mode 100644 index 000000000..0e8f8f4af --- /dev/null +++ b/xwords4/android/app/src/main/res/drawable/ic_sologame.xml @@ -0,0 +1,18 @@ + + + + + diff --git a/xwords4/android/app/src/main/res/layout/game_list_item.xml b/xwords4/android/app/src/main/res/layout/game_list_item.xml index c064bd8d5..102b7a3f3 100644 --- a/xwords4/android/app/src/main/res/layout/game_list_item.xml +++ b/xwords4/android/app/src/main/res/layout/game_list_item.xml @@ -41,7 +41,7 @@ image/svg+xml \ No newline at end of file + id="g3344-0-0" + style="fill:#ffffff;fill-opacity:1" /> \ No newline at end of file diff --git a/xwords4/android/img_src/sologame.svg b/xwords4/android/img_src/sologame.svg index 0dcf49f02..76159c613 100644 --- a/xwords4/android/img_src/sologame.svg +++ b/xwords4/android/img_src/sologame.svg @@ -17,7 +17,7 @@ height="120" viewBox="0 0 120 120" xml:space="preserve" - inkscape:version="0.48.4 r9939" + inkscape:version="0.92.3 (2405546, 2018-03-11)" sodipodi:docname="sologame.svg">image/svg+xml \ No newline at end of file + id="path4374-1" + style="fill:#ffffff;fill-opacity:1" /> \ No newline at end of file diff --git a/xwords4/android/scripts/images.mk b/xwords4/android/scripts/images.mk index 1e013b8a7..e9f236482 100644 --- a/xwords4/android/scripts/images.mk +++ b/xwords4/android/scripts/images.mk @@ -15,7 +15,6 @@ SRC_SVGS = \ down.svg \ download.svg \ email.svg \ - multigame.svg \ new_group.svg \ prefs.svg \ relabel.svg \ @@ -25,7 +24,6 @@ SRC_SVGS = \ search.svg \ select_all.svg \ send.svg \ - sologame.svg \ trade.svg \ untrade.svg \ up.svg \