vilyaem/Xrasher
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

android: rename package for new engine

Browse source
This commit is contained in:
Alibek Omarov 2019-11-28 23:06:56 +03:00
parent 76cd263c83
commit fe0661fde9
18 changed files with 56 additions and 85 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

56
android/AndroidManifest.xml
View file

@ -3,9 +3,9 @@
com.gamemaker.game
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="in.celest.xash3d.hl"
android:versionCode="1276"
android:versionName="0.19.3"
package="su.xash.engine"
android:versionCode="1705"
android:versionName="0.20"
android:installLocation="auto">
<application android:label="@string/app_name"
@ -14,31 +14,17 @@
android:debuggable="false"
android:hardwareAccelerated="true">
<activity android:name="in.celest.xash3d.LauncherActivity"
<activity android:name="su.xash.engine.LauncherActivity"
android:label="@string/launcher_name"
android:windowSoftInputMode="adjustResize"
android:configChanges="mcc|mnc|locale|touchscreen|keyboard|keyboardHidden|navigation|screenLayout|fontScale|uiMode|orientation|screenSize|smallestScreenSize">
<intent-filter>
<action android:name="in.celest.xash3d.LauncherActivity"/>
<action android:name="su.xash.engine.LauncherActivity"/>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
<!--<activity android:name="in.celest.xash3d.SteamActivity"
android:label="Steam"
android:windowSoftInputMode="adjustResize"
android:launchMode="singleTask">
<intent-filter>
<action android:name="in.celest.xash3d.SteamActivity"/>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>-->
<activity android:name="in.celest.xash3d.ShortcutActivity"
<activity android:name="su.xash.engine.ShortcutActivity"
android:label="@string/text_shortcut"
android:theme="@android:style/Theme.Dialog">
<intent-filter>
@ -47,39 +33,27 @@
</intent-filter>
<intent-filter>
<action android:name="in.celest.xash3d.SHORTCUT" />
<action android:name="su.xash.engine.SHORTCUT" />
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
</activity>
<!--
<activity android:name="org.libsdl.app.SDLActivity"
android:screenOrientation="sensorLandscape"
android:configChanges="orientation|screenSize"
android:label="@string/app_name"
android:taskAffinity="org.libsdl.app.SDLActivity" >
<intent-filter>
<action android:name="in.celest.xash3d.START" />
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
</activity>
-->
<activity android:name="in.celest.xash3d.XashActivity"
<activity android:name="su.xash.engine.XashActivity"
android:screenOrientation="sensorLandscape"
android:configChanges="mcc|mnc|locale|touchscreen|keyboard|keyboardHidden|navigation|screenLayout|fontScale|uiMode|orientation|screenSize|smallestScreenSize"
android:label="@string/app_name"
android:launchMode="singleTask">
<intent-filter>
<action android:name="in.celest.xash3d.START" />
<action android:name="su.xash.engine.START" />
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
</activity>
<activity android:name="in.celest.xash3d.FPicker"></activity>
<activity android:name="in.celest.xash3d.XashTutorialActivity">
<activity android:name="su.xash.engine.FPicker"></activity>
<activity android:name="su.xash.engine.XashTutorialActivity">
</activity>
<service android:name="in.celest.xash3d.XashService" android:stopWithTask="false" />
<receiver android:name="in.celest.xash3d.XashService$exitButtonListener" />
<receiver android:name="in.celest.xash3d.InstallReceiver">
<service android:name="su.xash.engine.XashService" android:stopWithTask="false" />
<receiver android:name="su.xash.engine.XashService$exitButtonListener" />
<receiver android:name="su.xash.engine.InstallReceiver">
<intent-filter android:priority="100">
<category android:name="android.intent.category.DEFAULT" />
<action android:name="android.intent.action.PACKAGE_ADDED" />
@ -90,7 +64,7 @@
<data android:scheme="package" />
</intent-filter>
</receiver>
<!--<service android:name="in.celest.xash3d.SteamService" />-->
<!--<service android:name="su.xash.engine.SteamService" />-->
<meta-data android:name="android.max_aspect" android:value="2.1" />
</application>

4
android/gen-config.sh
View file

@ -5,7 +5,7 @@ PKG_TEST=false
CHECK_SIGNATURES=false
RELEASE=false
GP_VERSION=false
XASH_CONFIG=$1src/in/celest/xash3d/XashConfig.java
XASH_CONFIG=$1src/su/xash/engine/XashConfig.java
shift
case "$*" in
*test*) export PKG_TEST=true;;
@ -20,7 +20,7 @@ case "$*" in
*gp*) export GP_VERSION=true;;
esac
_V="public static final boolean"
echo package in.celest.xash3d\; >$XASH_CONFIG
echo package su.xash.engine\; >$XASH_CONFIG
echo public class XashConfig { >>$XASH_CONFIG
echo $_V PKG_TEST = $PKG_TEST\; >>$XASH_CONFIG
echo $_V CHECK_SIGNATURES = $CHECK_SIGNATURES\; >>$XASH_CONFIG

4
android/gen-version.sh
View file

@ -1,6 +1,6 @@
#!/bin/bash
GIT_REV_XML=gen/res/values/git-rev.xml
GIT_REV_XML=$1/res/values/git-rev.xml
mkdir -p $(dirname $GIT_REV_XML)
@ -8,7 +8,7 @@ echo '<?xml version="1.0" encoding="utf-8"?>' > $GIT_REV_XML
echo '<resources>' >> $GIT_REV_XML
echo -n '<string name="git_revisions">' >> $GIT_REV_XML
echo -n '<b>Version information:</b> ' $*_endl| sed -e s/_endl/'\\n'/ >> $GIT_REV_XML
git submodule --quiet foreach --recursive 'echo -n \<b\>`basename $name`:\</b\>\ `git log --abbrev-commit --pretty=oneline -1` _endl' | sed -e 's/_endl/\\n/g' >> $GIT_REV_XML
git submodule --quiet foreach --recursive 'echo -n \<b\>`basename $name`:\</b\>\ `git log --abbrev-commit --pretty=oneline -1` _endl' | sed -e "s|_endl|\\\n|g; s|'|\\\'|g" >> $GIT_REV_XML
echo -n $USER@$(hostname) $(date +%H:%M:%S-%d-%m-%y) >> $GIT_REV_XML
echo '</string>' >> $GIT_REV_XML
echo '</resources>' >> $GIT_REV_XML

3
android/res/layout/activity_fpicker.xml
View file

@ -7,8 +7,7 @@
android:paddingLeft="@dimen/activity_horizontal_margin"
android:paddingRight="@dimen/activity_horizontal_margin"
android:paddingTop="@dimen/activity_vertical_margin"
android:background="#252525"
tools:context="in.celest.xash3dVR.FPicker"
android:background="#252525"
android:orientation="vertical">
<ListView

3
android/res/layout/activity_launcher.xml
View file

@ -7,8 +7,7 @@
android:layout_height="match_parent"
android:orientation="vertical"
android:background="#252525"
android:weightSum="1"
tools:context="in.celest.xash3d.LauncherActivity" >
android:weightSum="1" >
<TextView
android:id="@+id/textView_tittle"
android:layout_width="fill_parent"

1
android/res/layout/activity_shortcut.xml
View file

@ -8,7 +8,6 @@
android:paddingRight="@dimen/activity_horizontal_margin"
android:paddingTop="@dimen/activity_vertical_margin"
android:paddingBottom="@dimen/activity_vertical_margin"
tools:context="in.celest.xash3d.ShortcutActivity"
android:id="@+id/layout_shortcut">
<Button

2
android/res/values-ru/strings.xml
View file

@ -71,7 +71,7 @@
<!-- Write check -->
<string name="write_failed">Тест чтения не удался</string>
<string name="ask_about_new_basedir_msg">Переместите файлы игры куда-нибудь ещё. Например, в Android/data/in.celest.xash3d.hl или во внутренюю память. На следующий запуск я снова спрошу местоположение файлов игры.</string>
<string name="ask_about_new_basedir_msg">Переместите файлы игры куда-нибудь ещё. Например, в Android/data/su.xash.engine/ или во внутренюю память. На следующий запуск я снова спрошу местоположение файлов игры.</string>
<string name="lollipop_request_permission_fail_msg">Тест записи не удался дважды. </string>
<string name="lollipop_write_fail_msg">Из-за политик записи в новых версиях Android, полноценно воспользоваться внешней памятью невозможно. </string>
<string name="kitkat_write_fail_msg">Из-за политик записи Android 4.4, вы не можете воспользоваться внешней памятью. </string>

5
android/res/values/strings.xml
View file

@ -84,7 +84,8 @@
<string name="about_links" translatable="false">
&#8226; <a href="https://vk.com/xashdroid">VK</a>\n
&#8226; <a href="http://moddb.com/games/xash3d-android">ModDB</a>\n
&#8226; <a href="https://github.com/FWGS">GitHub</a>
&#8226; <a href="http://discord.gg/WF7kdmz">Discord</a>\n
&#8226; <a href="https://github.com/FWGS">GitHub</a>\n
&#8226; <a href="http://xash.su/pp/privacy-policy-xash3d.html">Privacy Policy</a>
</string>
<!-- About -->
@ -98,7 +99,7 @@
<!-- Write check -->
<string name="write_failed">Write test has failed</string>
<string name="ask_about_new_basedir_msg">Move your game files somewhere else, for example Android/data/in.celest.xash3d.hl or internal memory. At next run I will ask you about folder again.</string>
<string name="ask_about_new_basedir_msg">Move your game files somewhere else, for example Android/data/su.xash.engine or internal memory. At next run I will ask you about folder again.</string>
<!-- These strings must be concat with a "ask_about_new_basedir" string -->
<string name="lollipop_request_permission_fail_msg">Write test has been failed twice. </string>
<string name="lollipop_write_fail_msg">Due to writing politics of newer Android versions, you can\'t use this storage. </string>

5
android/src/in/celest/xash3d/FPicker.java → android/src/su/xash/engine/FPicker.java
View file

@ -1,4 +1,4 @@
package in.celest.xash3d;
package su.xash.engine;
//Created by Solexid
import android.app.Activity;
import android.app.ListActivity;
@ -31,8 +31,7 @@ import java.util.Collections;
import java.util.Date;
import java.util.List;
import su.xash.fwgslib.FWGSLib;
import in.celest.xash3d.hl.R;
import su.xash.engine.R;
public class FPicker extends Activity {
private File currentDir;

3
android/src/in/celest/xash3d/InstallReceiver.java → android/src/su/xash/engine/InstallReceiver.java
View file

@ -1,4 +1,5 @@
package in.celest.xash3d;
package su.xash.engine;
import android.content.BroadcastReceiver;
import android.content.Context;
import android.content.Intent;

16
android/src/in/celest/xash3d/LauncherActivity.java → android/src/su/xash/engine/LauncherActivity.java
View file

@ -1,4 +1,4 @@
package in.celest.xash3d;
package su.xash.engine;
import android.app.*;
import android.content.*;
@ -12,7 +12,7 @@ import android.text.style.*;
import android.util.*;
import android.view.*;
import android.widget.*;
import in.celest.xash3d.hl.*;
import su.xash.engine.*;
import java.io.*;
import java.net.*;
import org.json.*;
@ -21,9 +21,9 @@ import su.xash.fwgslib.*;
public class LauncherActivity extends Activity
{
// public final static String ARGV = "in.celest.xash3d.MESSAGE";
// public final static String ARGV = "su.xash.engine.MESSAGE";
public final static int sdk = FWGSLib.sdk;
public final static String UPDATE_LINK = "https://api.github.com/repos/FWGS/xash3d-android-project/releases"; // releases/latest doesn't return prerelease and drafts
public final static String UPDATE_LINK = "https://api.github.com/repos/FWGS/xash3d-fwgs/releases"; // releases/latest doesn't return prerelease and drafts
static SharedPreferences mPref;
static EditText cmdArgs, resPath, writePath, resScale, resWidth, resHeight;
@ -440,14 +440,14 @@ public class LauncherActivity extends Activity
int m_iFirstRunCounter = 0;
public void showFirstRun()
{
startActivity(new Intent(this, in.celest.xash3d.XashTutorialActivity.class));
startActivity(new Intent(this, su.xash.engine.XashTutorialActivity.class));
}
public static final int ID_SELECT_FOLDER = 42, ID_SELECT_RW_FOLDER = 43;
public void selectFolder(View view)
{
Intent intent = new Intent(this, in.celest.xash3d.FPicker.class);
Intent intent = new Intent(this, su.xash.engine.FPicker.class);
startActivityForResult(intent, ID_SELECT_FOLDER);
resPath.setEnabled(false);
XashActivity.setFolderAsk( this, false );
@ -455,7 +455,7 @@ public class LauncherActivity extends Activity
public void selectRwFolder(View view)
{
Intent intent = new Intent(this, in.celest.xash3d.FPicker.class);
Intent intent = new Intent(this, su.xash.engine.FPicker.class);
startActivityForResult(intent, ID_SELECT_RW_FOLDER);
writePath.setEnabled(false);
XashActivity.setFolderAsk( this, false );
@ -511,7 +511,7 @@ public class LauncherActivity extends Activity
{
Intent intent = new Intent(this, ShortcutActivity.class);
intent.putExtra( "basedir", resPath.getText().toString() );
intent.putExtra( "name", "Xash3D" );
intent.putExtra( "name", "Xash3D FWGS" );
intent.putExtra( "argv", cmdArgs.getText().toString() );
startActivity(intent);
}

6
android/src/in/celest/xash3d/ShortcutActivity.java → android/src/su/xash/engine/ShortcutActivity.java
View file

@ -1,4 +1,4 @@
package in.celest.xash3d;
package su.xash.engine;
import android.app.Activity;
import android.view.View;
@ -6,7 +6,7 @@ import android.content.Intent;
import android.graphics.Bitmap;
import android.graphics.BitmapFactory;
import android.widget.Toast;
import in.celest.xash3d.hl.R;
import su.xash.engine.R;
import android.widget.EditText;
import android.widget.Button;
import java.io.File;
@ -58,7 +58,7 @@ public class ShortcutActivity extends Activity
public void saveShortcut(View view)
{
Intent intent = new Intent();
intent.setAction("in.celest.xash3d.START");
intent.setAction("su.xash.engine.START");
if(argv.length() != 0) intent.putExtra("argv",argv.getText().toString());
if(pkgname.length() != 0)
{

12
android/src/in/celest/xash3d/XashActivity.java → android/src/su/xash/engine/XashActivity.java
View file

@ -1,4 +1,4 @@
package in.celest.xash3d;
package su.xash.engine;
import javax.microedition.khronos.egl.EGL10;
import javax.microedition.khronos.egl.EGLConfig;
@ -30,9 +30,9 @@ import java.lang.reflect.*;
import java.util.*;
import java.security.MessageDigest;
import in.celest.xash3d.hl.R;
import in.celest.xash3d.XashConfig;
import in.celest.xash3d.JoystickHandler;
import su.xash.engine.R;
import su.xash.engine.XashConfig;
import su.xash.engine.JoystickHandler;
import android.provider.Settings.Secure;
import su.xash.fwgslib.*;
@ -144,7 +144,7 @@ public class XashActivity extends Activity {
{
Log.v( TAG, "folderask == true. Opening FPicker..." );
Intent intent = new Intent( this, in.celest.xash3d.FPicker.class );
Intent intent = new Intent( this, su.xash.engine.FPicker.class );
startActivityForResult( intent, FPICKER_RESULT );
}
else
@ -944,7 +944,7 @@ public class XashActivity extends Activity {
{
try
{
mSingleton.startActivity( new Intent( Intent.ACTION_VIEW, Uri.parse("market://details?id=in.celest.xash3d.hl") ) );
mSingleton.startActivity( new Intent( Intent.ACTION_VIEW, Uri.parse("market://details?id=su.xash.engine.hl") ) );
return;
}
catch( android.content.ActivityNotFoundException e )

2
android/src/in/celest/xash3d/XashConfig.java → android/src/su/xash/engine/XashConfig.java
View file

@ -1,4 +1,4 @@
package in.celest.xash3d;
package su.xash.engine;
public class XashConfig {
public static final boolean PKG_TEST = false;
public static final boolean CHECK_SIGNATURES = false;

8
android/src/in/celest/xash3d/XashService.java → android/src/su/xash/engine/XashService.java
View file

@ -1,4 +1,4 @@
package in.celest.xash3d;
package su.xash.engine;
import javax.microedition.khronos.egl.EGL10;
import javax.microedition.khronos.egl.EGLConfig;
@ -29,9 +29,9 @@ import java.lang.*;
import java.util.List;
import java.security.MessageDigest;
import in.celest.xash3d.hl.R;
import in.celest.xash3d.XashConfig;
import in.celest.xash3d.JoystickHandler;
import su.xash.engine.R;
import su.xash.engine.XashConfig;
import su.xash.engine.JoystickHandler;
public class XashService extends Service

4
android/src/in/celest/xash3d/XashTutorialActivity.java → android/src/su/xash/engine/XashTutorialActivity.java
View file

@ -1,4 +1,4 @@
package in.celest.xash3d;
package su.xash.engine;
import android.animation.*;
import android.app.*;
@ -9,7 +9,7 @@ import android.view.*;
import android.view.View.*;
import android.widget.*;
import android.widget.TableRow.*;
import in.celest.xash3d.hl.*;
import su.xash.engine.*;
import java.util.*;
import su.xash.fwgslib.*;

5
android/src/su/xash/fwgslib/CertCheck.java
View file

@ -1,4 +1,4 @@
package su.xash.fwgslib;
package su.xash.fwgslib;
import android.content.*;
import android.view.*;
@ -17,8 +17,7 @@ import java.lang.*;
import java.util.List;
import java.security.MessageDigest;
import in.celest.xash3d.XashConfig; // change pkgname if needed
// import in.celest.xash3d.hl.BuildConfig; // change pkgname if needed
import su.xash.engine.XashConfig; // change pkgname if needed
public class CertCheck
{

2
android/src/su/xash/fwgslib/CheckUpdate.java
View file

@ -7,7 +7,7 @@ import android.net.*;
import android.os.*;
import android.util.*;
import android.widget.*;
import in.celest.xash3d.hl.*;
import su.xash.engine.*;
import java.io.*;
import java.net.*;
import org.json.*;