From b776bd777c795ff86303164470e2d7bfcbc61b10 Mon Sep 17 00:00:00 2001
From: Yair Morgenstern <yairm210@hotmail.com>
Date: Wed, 2 Jan 2019 22:07:47 +0200
Subject: [PATCH] Google suspended the app because of "Impersonation" violation
 =( Changed library name from com.unciv.game to com.unciv.app for app change

---
 android/AndroidManifest.xml                   |  4 +--
 android/assets/game.atlas                     | 28 +++++++++----------
 android/build.gradle                          |  4 +--
 .../src/com/unciv/game/AndroidLauncher.java   |  2 +-
 .../unciv/game/desktop/DesktopLauncher.java   |  2 +-
 ios/src/com/unciv/game/IOSLauncher.java       |  2 +-
 6 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml
index 662203ba88..eec86e448a 100644
--- a/android/AndroidManifest.xml
+++ b/android/AndroidManifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.unciv.game" >
+    package="com.unciv.app" >
 
     <uses-sdk/>
 
@@ -12,7 +12,7 @@
         android:label="@string/app_name"
         android:theme="@style/GdxTheme" >
         <activity
-            android:name="com.unciv.game.AndroidLauncher"
+            android:name="com.unciv.app.AndroidLauncher"
             android:label="@string/app_name" 
             android:screenOrientation="landscape"
             android:configChanges="keyboard|keyboardHidden|orientation|screenSize">
diff --git a/android/assets/game.atlas b/android/assets/game.atlas
index b859d48811..f80da642bd 100644
--- a/android/assets/game.atlas
+++ b/android/assets/game.atlas
@@ -697,6 +697,20 @@ ImprovementIcons/Quarry
   orig: 100, 100
   offset: 0, 0
   index: -1
+ImprovementIcons/Railroad
+  rotate: false
+  xy: 1734, 722
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+OtherIcons/Railroad
+  rotate: false
+  xy: 1734, 722
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
 ImprovementIcons/Road
   rotate: false
   xy: 347, 407
@@ -774,20 +788,6 @@ OtherIcons/Pentagon
   orig: 100, 100
   offset: 0, 0
   index: -1
-OtherIcons/Railroad
-  rotate: false
-  xy: 1734, 722
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
-ImprovementIcons/Railroad
-  rotate: false
-  xy: 1734, 722
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
 OtherIcons/Shield
   rotate: false
   xy: 692, 622
diff --git a/android/build.gradle b/android/build.gradle
index a1c0e89779..5036a29031 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -18,7 +18,7 @@ android {
         exclude 'META-INF/robovm/ios/robovm.xml'
     }
     defaultConfig {
-        applicationId "com.unciv.game"
+        applicationId "com.unciv.app"
         minSdkVersion 14
         targetSdkVersion 28
         versionCode 185
@@ -104,7 +104,7 @@ task run(type: Exec) {
     }
 
     def adb = path + "/platform-tools/adb"
-    commandLine "$adb", 'shell', 'am', 'start', '-n', 'com.unciv.game/AndroidLauncher'
+    commandLine "$adb", 'shell', 'am', 'start', '-n', 'com.unciv.app/AndroidLauncher'
 }
 
 // sets up the Android Eclipse project, using the old Ant based build.
diff --git a/android/src/com/unciv/game/AndroidLauncher.java b/android/src/com/unciv/game/AndroidLauncher.java
index c213d598cb..4bde36f300 100644
--- a/android/src/com/unciv/game/AndroidLauncher.java
+++ b/android/src/com/unciv/game/AndroidLauncher.java
@@ -1,4 +1,4 @@
-package com.unciv.game;
+package com.unciv.app;
 
 import android.os.Bundle;
 
diff --git a/desktop/src/com/unciv/game/desktop/DesktopLauncher.java b/desktop/src/com/unciv/game/desktop/DesktopLauncher.java
index 41be611e49..1d56cd5314 100644
--- a/desktop/src/com/unciv/game/desktop/DesktopLauncher.java
+++ b/desktop/src/com/unciv/game/desktop/DesktopLauncher.java
@@ -1,4 +1,4 @@
-package com.unciv.game.desktop;
+package com.unciv.app.desktop;
 
 import com.badlogic.gdx.backends.lwjgl.LwjglApplication;
 import com.badlogic.gdx.backends.lwjgl.LwjglApplicationConfiguration;
diff --git a/ios/src/com/unciv/game/IOSLauncher.java b/ios/src/com/unciv/game/IOSLauncher.java
index 928c990095..4fbdc03c4d 100644
--- a/ios/src/com/unciv/game/IOSLauncher.java
+++ b/ios/src/com/unciv/game/IOSLauncher.java
@@ -1,4 +1,4 @@
-package com.unciv.game;
+package com.unciv.app;
 
 import com.badlogic.gdx.backends.iosrobovm.IOSApplication;
 import com.badlogic.gdx.backends.iosrobovm.IOSApplicationConfiguration;