Skip to content

Commit fe5df60

Browse files
committed
Merge branch 'master' of github.com:hojjatjafary/CafebazaarUnity
2 parents 48360ba + 60abd13 commit fe5df60

File tree

2 files changed

+32
-31
lines changed

2 files changed

+32
-31
lines changed

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,3 +107,4 @@ public static event Action<string> consumePurchaseFailedEvent;
107107

108108
# Thanks
109109
- [mohsen-srn](https://github.com/mohsen-srn) for pointing out the AndroidManifest.xml issue in newer Unity versions.
110+
- [Hossynkoala](https://github.com/Hossynkoala) for fixing white keyboard issue in AndroidManifest.

UnityProject/Assets/Plugins/Android/AndroidManifest.xml

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -3,38 +3,38 @@
33
xmlns:android="http://schemas.android.com/apk/res/android"
44
package="com.fanafzar.bazaarIABTest"
55
android:installLocation="preferExternal"
6-
android:theme="@android:style/Theme.NoTitleBar"
6+
77
android:versionCode="1"
88
android:versionName="1.0">
9-
<supports-screens
10-
android:smallScreens="true"
11-
android:normalScreens="true"
12-
android:largeScreens="true"
13-
android:xlargeScreens="true"
14-
android:anyDensity="true"/>
9+
<supports-screens
10+
android:smallScreens="true"
11+
android:normalScreens="true"
12+
android:largeScreens="true"
13+
android:xlargeScreens="true"
14+
android:anyDensity="true"/>
1515

16-
<application android:icon="@drawable/app_icon" android:label="@string/app_name" android:debuggable="true">
17-
<activity android:name="com.unity3d.player.UnityPlayerActivity" android:label="@string/app_name">
18-
<intent-filter>
19-
<action android:name="android.intent.action.MAIN" />
20-
<category android:name="android.intent.category.LAUNCHER" />
21-
</intent-filter>
22-
<meta-data android:name="unityplayer.UnityActivity" android:value="true" />
23-
<meta-data android:name="unityplayer.ForwardNativeEventsToDalvik" android:value="false" />
24-
</activity>
25-
26-
<meta-data android:name="unityplayer.UnityActivity" android:value="true" />
27-
<meta-data android:name="billing.service" android:value="bazaar.BazaarIabService" />
28-
<activity android:name="com.bazaar.BazaarIABProxyActivity" android:theme="@android:style/Theme.Translucent.NoTitleBar.Fullscreen" />
29-
30-
</application>
31-
32-
<uses-sdk android:minSdkVersion="10" android:targetSdkVersion="21" />
33-
34-
<uses-permission android:name="android.permission.INTERNET" />
35-
<uses-permission android:name="com.farsitel.bazaar.permission.PAY_THROUGH_BAZAAR" />
36-
<uses-permission android:name="android.permission.WAKE_LOCK" />
37-
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
38-
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
39-
16+
<application android:icon="@drawable/app_icon" android:label="@string/app_name" android:debuggable="true" android:theme="@style/UnityThemeSelector">
17+
<activity android:name="com.unity3d.player.UnityPlayerActivity" android:label="@string/app_name">
18+
<intent-filter>
19+
<action android:name="android.intent.action.MAIN" />
20+
<category android:name="android.intent.category.LAUNCHER" />
21+
</intent-filter>
22+
<meta-data android:name="unityplayer.UnityActivity" android:value="true" />
23+
<meta-data android:name="unityplayer.ForwardNativeEventsToDalvik" android:value="false" />
24+
</activity>
25+
26+
<meta-data android:name="unityplayer.UnityActivity" android:value="true" />
27+
<meta-data android:name="billing.service" android:value="bazaar.BazaarIabService" />
28+
<activity android:name="com.bazaar.BazaarIABProxyActivity" android:theme="@android:style/Theme.Translucent.NoTitleBar.Fullscreen" />
29+
30+
</application>
31+
32+
<uses-sdk android:minSdkVersion="10" android:targetSdkVersion="21" />
33+
34+
<uses-permission android:name="android.permission.INTERNET" />
35+
<uses-permission android:name="com.farsitel.bazaar.permission.PAY_THROUGH_BAZAAR" />
36+
<uses-permission android:name="android.permission.WAKE_LOCK" />
37+
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
38+
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
39+
4040
</manifest>

0 commit comments

Comments
 (0)