Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2025-02-11 08:48:06 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'android_branch' into android_dualpane2. Compiles after a ton of conflict resolution and some file removal. No idea if it runs, but little confidence.

Browse source 
Conflicts:
	xwords4/android/XWords4/.gitignore
	xwords4/android/XWords4/archive/R.java
	xwords4/android/XWords4/res/values/strings.xml
	xwords4/android/XWords4/res/values/styles.xml
	xwords4/android/XWords4/res_src/values-ba_CK/strings.xml
	xwords4/android/XWords4/res_src/values-ca_PS/strings.xml
	xwords4/android/XWords4/src/org/eehouse/android/xw4/BTInviteDelegate.java
	xwords4/android/XWords4/src/org/eehouse/android/xw4/BTService.java
	xwords4/android/XWords4/src/org/eehouse/android/xw4/BoardDelegate.java
	xwords4/android/XWords4/src/org/eehouse/android/xw4/ChatDelegate.java
	xwords4/android/XWords4/src/org/eehouse/android/xw4/DelegateBase.java
	xwords4/android/XWords4/src/org/eehouse/android/xw4/Delegator.java
	xwords4/android/XWords4/src/org/eehouse/android/xw4/DlgDelegate.java
	xwords4/android/XWords4/src/org/eehouse/android/xw4/DwnldDelegate.java
	xwords4/android/XWords4/src/org/eehouse/android/xw4/GameConfigDelegate.java
	xwords4/android/XWords4/src/org/eehouse/android/xw4/GamesListActivity.java
	xwords4/android/XWords4/src/org/eehouse/android/xw4/GamesListDelegate.java
	xwords4/android/XWords4/src/org/eehouse/android/xw4/InviteDelegate.java
	xwords4/android/XWords4/src/org/eehouse/android/xw4/ListDelegateBase.java
	xwords4/android/XWords4/src/org/eehouse/android/xw4/MultiService.java
	xwords4/android/XWords4/src/org/eehouse/android/xw4/NewGameDelegate.java
	xwords4/android/XWords4/src/org/eehouse/android/xw4/PrefsDelegate.java
	xwords4/android/XWords4/src/org/eehouse/android/xw4/RelayGameDelegate.java
	xwords4/android/XWords4/src/org/eehouse/android/xw4/RelayService.java
	xwords4/android/XWords4/src/org/eehouse/android/xw4/SMSInviteDelegate.java
	xwords4/android/XWords4/src/org/eehouse/android/xw4/SMSService.java
	xwords4/android/XWords4/src/org/eehouse/android/xw4/StudyListDelegate.java
	xwords4/android/XWords4/src/org/eehouse/android/xw4/XWActivity.java
	xwords4/android/XWords4/src/org/eehouse/android/xw4/XWListActivity.java
	xwords4/android/XWords4/src/org/eehouse/android/xw4/loc/LocItemEditDelegate.java
	xwords4/android/scripts/adb-install.sh
	xwords4/android/scripts/find-and-ant.sh
This commit is contained in:
Eric House 2016-03-11 22:19:37 -08:00
commit b7694b67d2
408 changed files with 28049 additions and 11172 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.gitignore vendored
View file

@ -3,7 +3,7 @@
*~ *~
/gitignored /gitignored
TAGS TAGS
core core*
*.apk *.apk
xwords_4.4.0.0* xwords_4.4.0.0*
gcm_loop.shelf gcm_loop.shelf

5
.projectile Normal file
View file

@ -0,0 +1,5 @@
-TAGS
-/xwords4/android/XWords4-dbg
-/xwords4/linux/discon_ok2.sh_logs
-/xwords4/android/XWords4/res_src/values-pt/strings.xml
-/xwords4/android/XWords4/res_src/values-ba_CK/strings.xml

2
xwords4/android/.gitignore vendored
View file

@ -1 +1,3 @@
/libraries
/modules
XWords4-gcm/ XWords4-gcm/

34
xwords4/android/INSTALL.txt
View file

@ -1,19 +1,29 @@
Here's how I'm building crosswords for Android. Here's how I'm building crosswords for Android.
First, the build process requires a file called local.properties that First, cd into the directory xwords4/android/XWords4. Everything
must be generated locally. Generate it before your first build by happens there.
running ./scripts/setup_local_props.sh.
The working directory is XWords4 within this (android/) directory. IF (and it's a big if) you have all the necessary tools installed (the
Run the following commands from there. Android SDK and NDK, apache ant, and probably other stuff I've
forgotten), two commands will build it, the first a one-time deal and
the second repeated every time you made a change.
Build the jni library (the cross-platform code): The build process requires a file called local.properties that must be
# ../scripts/ndkbuild.sh generated locally. Generate it before your first build by running
# ../scripts/setup_local_props.sh
Then build using this command:
# ant debug
Or, if you have a device or emulator attached (listed by 'adb
devices'), try
Then build the app for the emulator (assuming it's running)
# ant debug install # ant debug install
Build for a device (requires you've set up your keys. I did this too Making a release build requires that you've set up your keys. (I did
long ago to remember how but the info's easy to find): this too long ago to remember how but the info's easy to find). Once
# ant release that's done, just tether your device and type
(The above command not yet verified for new SDK I installed on 11/19/11)
# ant release install

9
xwords4/android/XWords4-bt/.gitignore vendored
View file

@ -1,9 +0,0 @@
*.apk
local.properties
bin
gen
proguard.cfg
proguard-project.txt
obj
res/drawable*/*gen.png
img_src

258
xwords4/android/XWords4-bt/AndroidManifest.xml
View file

@ -1,258 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- -*- compile-command: "ant install"; -*- -->
<!-- Copyright (C) 2007 The Android Open Source Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<!-- Declare the contents of this Android application. The namespace
attribute brings in the Android platform namespace, and the package
supplies a unique name for the application. When writing your
own application, the package name must be changed from "com.example.*"
to come from a domain that you own or have control over. -->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="org.eehouse.android.xw4bt"
android:versionCode="76"
android:versionName="@string/app_version"
>
<!-- BE SURE TO MODIFY project.project AND the variable TARGET in
../scripts/setup_local_props.sh if targetSdkVersion changes!!!
-->
<uses-sdk android:minSdkVersion="7" android:targetSdkVersion="14" />
<supports-screens android:resizeable="true"
android:smallScreens="true"
android:normalScreens="true"
android:largeScreens="true"
android:xlargeScreens="true"
/>
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
<uses-permission android:name="android.permission.VIBRATE" />
<uses-permission android:name="android.permission.RECEIVE_SMS" />
<uses-permission android:name="android.permission.SEND_SMS" />
<uses-permission android:name="android.permission.READ_SMS" />
<uses-permission android:name="android.permission.BLUETOOTH" />
<uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
<uses-permission android:name="android.permission.READ_CONTACTS" />
<uses-feature android:name="android.hardware.telephony"
android:required = "false"
/>
<uses-feature android:name="android.hardware.nfc" android:required="false" />
<!-- GCM stuff -->
<permission android:name="org.eehouse.android.xw4.permission.C2D_MESSAGE"
android:protectionLevel="signature" />
<uses-permission android:name="org.eehouse.android.xw4.permission.C2D_MESSAGE" />
<uses-permission android:name="com.google.android.c2dm.permission.RECEIVE" />
<uses-permission android:name="android.permission.GET_ACCOUNTS" />
<uses-permission android:name="android.permission.WAKE_LOCK" />
<uses-permission android:name="android.permission.NFC" />
<application android:icon="@drawable/icon48x48"
android:label="@string/app_name"
android:name=".XWApp"
>
<activity android:name="GamesListActivity"
android:label="@string/app_name"
android:launchMode="standard"
android:configChanges="keyboardHidden|orientation|screenSize"
>
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
<intent-filter>
<action android:name="android.nfc.action.NDEF_DISCOVERED" />
<category android:name="android.intent.category.DEFAULT" />
<data android:mimeType="@string/xwords_nfc_mime" />
</intent-filter>
</activity>
<activity android:name="DictsActivity"
android:label="@string/title_dicts_list"
android:configChanges="keyboardHidden|orientation|screenSize"
/>
<activity android:name="NewGameActivity"
android:theme="@android:style/Theme.NoTitleBar"
/>
<activity android:name="BTInviteActivity"
android:theme="@android:style/Theme.Dialog"
android:configChanges="keyboardHidden|orientation|screenSize"
/>
<activity android:name="SMSInviteActivity"
android:theme="@android:style/Theme.Dialog"
android:configChanges="keyboardHidden|orientation|screenSize"
android:screenOrientation="sensor"
/>
<activity android:name="GameConfigActivity"
android:screenOrientation="sensor"
android:configChanges="keyboardHidden|orientation|screenSize"
>
<intent-filter>
<action android:name="android.intent.action.EDIT" />
</intent-filter>
</activity>
<activity android:name="PrefsActivity"
android:label="@string/title_prefs"
android:screenOrientation="sensor"
android:configChanges="keyboardHidden|orientation|screenSize"
/>
<activity android:name="BoardActivity"
android:screenOrientation="portrait"
android:configChanges="keyboardHidden"
/>
<activity android:name="StudyListActivity"
android:configChanges="keyboardHidden|orientation|screenSize"
/>
<receiver android:name="RelayReceiver">
<intent-filter>
<action android:name="android.intent.action.BOOT_COMPLETED"/>
</intent-filter>
</receiver>
<receiver android:name="UpdateCheckReceiver">
<intent-filter>
<action android:name="android.intent.action.BOOT_COMPLETED"/>
</intent-filter>
</receiver>
<activity android:name="DispatchNotify">
<intent-filter>
<action android:name="android.intent.action.VIEW" />
<category android:name="android.intent.category.DEFAULT" />
<category android:name="android.intent.category.BROWSABLE" />
<data android:scheme="newxwgame"/>
</intent-filter>
<intent-filter>
<action android:name="android.intent.action.VIEW" />
<category android:name="android.intent.category.DEFAULT" />
<category android:name="android.intent.category.BROWSABLE" />
<data android:scheme="http"
android:host="@string/invite_host"
android:pathPrefix="@string/invite_prefix"
/>
</intent-filter>
<intent-filter>
<action android:name="android.intent.action.VIEW" />
<category android:name="android.intent.category.DEFAULT" />
<category android:name="android.intent.category.BROWSABLE" />
<data android:mimeType="@string/invite_mime" />
</intent-filter>
</activity>
<!-- downloading dicts -->
<activity android:name=".DwnldActivity"
android:label="@string/app_name"
android:theme="@android:style/Theme.Dialog"
android:configChanges="keyboardHidden|orientation|screenSize"
>
<intent-filter>
<action android:name="android.intent.action.VIEW"></action>
<category android:name="android.intent.category.DEFAULT"></category>
<category android:name="android.intent.category.BROWSABLE"></category>
<data android:scheme="file" android:host="*"
android:pathPattern=".*\\.xwd" />
<data android:scheme="http"
android:mimeType="application/x-xwordsdict"
android:host="*"
android:pathPattern=".*\\.xwd" />
</intent-filter>
</activity>
<activity android:name="RelayGameActivity"
android:configChanges="keyboardHidden|orientation|screenSize"
/>
<activity android:name="DictBrowseActivity"
android:configChanges="keyboardHidden|orientation|screenSize"
/>
<activity android:name="ChatActivity"
android:configChanges="keyboardHidden|orientation|screenSize"
/>
<activity android:name=".loc.LocActivity"
android:configChanges="keyboardHidden|orientation|screenSize"
/>
<activity android:name=".loc.LocItemEditActivity"
android:configChanges="keyboardHidden|orientation|screenSize"
/>
<service android:name="RelayService"/>
<receiver android:name=".MountEventReceiver">
<intent-filter>
<action android:name="android.intent.action.MEDIA_MOUNTED" />
<data android:scheme="file" />
</intent-filter>
<intent-filter>
<action android:name="android.intent.action.MEDIA_EJECT" />
<data android:scheme="file" />
</intent-filter>
</receiver>
<receiver android:name="BTReceiver">
<intent-filter>
<action android:name="android.bluetooth.adapter.action.STATE_CHANGED" />
</intent-filter>
<intent-filter>
<action android:name="android.bluetooth.device.action.ACL_CONNECTED" />
</intent-filter>
</receiver>
<service android:name="BTService"/>
<receiver android:name="SMSReceiver" >
<intent-filter android:priority="999" >
<action android:name="android.provider.Telephony.SMS_RECEIVED" />
</intent-filter>
<intent-filter>
<action android:name="android.intent.action.DATA_SMS_RECEIVED" />
<data android:scheme="sms" />
<data android:port="3344" />
<data android:host="*" />
</intent-filter>
</receiver>
<service android:name="SMSService"/>
<receiver android:name="com.google.android.gcm.GCMBroadcastReceiver"
android:permission="com.google.android.c2dm.permission.SEND" >
<intent-filter>
<action android:name="com.google.android.c2dm.intent.RECEIVE" />
<action android:name="com.google.android.c2dm.intent.REGISTRATION" />
<category android:name="org.eehouse.android.xw4" />
</intent-filter>
</receiver>
<service android:name=".GCMIntentService" />
</application>
</manifest>

1
xwords4/android/XWords4-bt/archive/.gitignore vendored
View file

@ -1 +0,0 @@
/R.java

3
xwords4/android/XWords4-bt/assets/.gitignore vendored
View file

@ -1,3 +0,0 @@
BasEnglish2to8.xwd
CollegeEng_2to8.xwd
Top5000.xwd

107
xwords4/android/XWords4-bt/build.xml
View file

@ -1,107 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project name="XWords4" default="release">
<!-- The local.properties file is created and updated by the 'android' tool.
It contains the path to the SDK. It should *NOT* be checked into
Version Control Systems. -->
<loadproperties srcFile="local.properties" />
<!-- The ant.properties file can be created by you. It is only edited by the
'android' tool to add properties to it.
This is the place to change some Ant specific build properties.
Here are some properties you may want to change/update:
source.dir
The name of the source directory. Default is 'src'.
out.dir
The name of the output directory. Default is 'bin'.
For other overridable properties, look at the beginning of the rules
files in the SDK, at tools/ant/build.xml
Properties related to the SDK location or the project target should
be updated using the 'android' tool with the 'update' action.
This file is an integral part of the build system for your
application and should be checked into Version Control Systems.
-->
<property file="ant.properties" />
<!-- The project.properties file is created and updated by the 'android'
tool, as well as ADT.
This contains project specific properties such as project target, and library
dependencies. Lower level build properties are stored in ant.properties
(or in .classpath for Eclipse projects).
This file is an integral part of the build system for your
application and should be checked into Version Control Systems. -->
<loadproperties srcFile="project.properties" />
<!-- An attempt to define stuff to be included from multiple build.xml files -->
<import file="../scripts/common_targets.xml" />
<!-- quick check on sdk.dir -->
<fail
message="sdk.dir is missing. Make sure to generate local.properties using 'android update project'"
unless="sdk.dir"
/>
<!-- extension targets. Uncomment the ones where you want to do custom work
in between standard targets -->
<property name="INITIAL_CLIENT_VERS" value="4"/>
<property name="VARIANT_NAME" value="xw4bt"/>
<target name="-pre-clean">
<antcall target="my-pre-clean" />
</target>
<target name="-pre-build" depends="my-copy-src">
<antcall target="my-pre-build">
<param name="VARIANT_NAME" value="${VARIANT_NAME}"/>
<param name="APP_NAME" value="cWords-BT"/>
</antcall>
</target>
<target name="-pre-compile">
<antcall target="my-pre-compile">
<param name="VARIANT_NAME" value="${VARIANT_NAME}"/>
</antcall>
</target>
<!--
<target name="-pre-compile">
</target>
/* This is typically used for code obfuscation.
Compiled code location: ${out.classes.absolute.dir}
If this is not done in place, override ${out.dex.input.absolute.dir} */
<target name="-post-compile">
</target>
-->
<!-- Import the actual build file.
To customize existing targets, there are two options:
- Customize only one target:
- copy/paste the target into this file, *before* the
<import> task.
- customize it to your needs.
- Customize the whole content of build.xml
- copy/paste the content of the rules files (minus the top node)
into this file, replacing the <import> task.
- customize to your needs.
***********************
****** IMPORTANT ******
***********************
In all cases you must update the value of version-tag below to read 'custom' instead of an integer,
in order to avoid having your file be overridden by tools such as "android update project"
-->
<!-- version-tag: 1 -->
<import file="${sdk.dir}/tools/ant/build.xml" />
</project>

20
xwords4/android/XWords4-bt/jni/.gitignore vendored
View file

@ -1,20 +0,0 @@
anddict.c
anddict.h
andglobals.h
andutils.c
andutils.h
drawwrapper.c
drawwrapper.h
jniutlswrapper.c
jniutlswrapper.h
LocalizedStrIncludes.h
paths.h
utils.c
utilwrapper.c
utilwrapper.h
xportwrapper.c
xportwrapper.h
xptypes.h
xwjni.c
#paths.h#
Application.mk

100
xwords4/android/XWords4-bt/jni/Android.mk
View file

@ -1,100 +0,0 @@
# -*- mode: Makefile; compile-command: "cd ../; ${NDK_ROOT}/ndk-build -j3"; -*-
LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS)
COMMON_PATH=../../../common
LOCAL_C_INCLUDES+= \
-I$(LOCAL_PATH)/$(COMMON_PATH) \
-I$(LOCAL_PATH)/../../../relay \
LOCAL_LDLIBS += -llog
ifeq ($(BUILD_TARGET),debug)
LOCAL_DEBUG = -DMEM_DEBUG -DDEBUG -DENABLE_LOGGING -DCOMMS_CHECKSUM -Wno-unused-but-set-variable
endif
LOCAL_DEFINES += \
$(LOCAL_DEBUG) \
-DXWFEATURE_RELAY \
-DXWFEATURE_BLUETOOTH \
-DXWFEATURE_SMS \
-DXWFEATURE_COMMSACK \
-DXWFEATURE_TURNCHANGENOTIFY \
-DCOMMS_XPORT_FLAGSPROC \
-DKEY_SUPPORT \
-DXWFEATURE_CROSSHAIRS \
-DPOINTER_SUPPORT \
-DSCROLL_DRAG_THRESHHOLD=1 \
-DDROP_BITMAPS \
-DXWFEATURE_TRAYUNDO_ONE \
-DDISABLE_TILE_SEL \
-DXWFEATURE_BOARDWORDS \
-DXWFEATURE_WALKDICT \
-DXWFEATURE_WALKDICT_FILTER \
-DXWFEATURE_DICTSANITY \
-DFEATURE_TRAY_EDIT \
-DXWFEATURE_BONUSALL \
-DMAX_ROWS=32 \
-DHASH_STREAM \
-DXWFEATURE_BASE64 \
-DXWFEATURE_DEVID \
-DCOMMON_LAYOUT \
-DINITIAL_CLIENT_VERS=${INITIAL_CLIENT_VERS} \
-DRELAY_ROOM_DEFAULT=\"\" \
-D__LITTLE_ENDIAN \
ifeq ($(CHAT_ENABLED),true)
LOCAL_DEFINES += -DXWFEATURE_CHAT
endif
# -DXWFEATURE_SCOREONEPASS \
LOCAL_SRC_FILES += \
xwjni.c \
utilwrapper.c \
drawwrapper.c \
xportwrapper.c \
anddict.c \
andutils.c \
jniutlswrapper.c \
COMMON_PATH=../../../common
COMMON_SRC_FILES += \
$(COMMON_PATH)/boarddrw.c \
$(COMMON_PATH)/scorebdp.c \
$(COMMON_PATH)/dragdrpp.c \
$(COMMON_PATH)/pool.c \
$(COMMON_PATH)/tray.c \
$(COMMON_PATH)/dictnry.c \
$(COMMON_PATH)/dictiter.c \
$(COMMON_PATH)/dictmgr.c \
$(COMMON_PATH)/mscore.c \
$(COMMON_PATH)/vtabmgr.c \
$(COMMON_PATH)/strutils.c \
$(COMMON_PATH)/engine.c \
$(COMMON_PATH)/board.c \
$(COMMON_PATH)/mempool.c \
$(COMMON_PATH)/game.c \
$(COMMON_PATH)/server.c \
$(COMMON_PATH)/model.c \
$(COMMON_PATH)/comms.c \
$(COMMON_PATH)/memstream.c \
$(COMMON_PATH)/movestak.c \
$(COMMON_PATH)/dbgutil.c \
LOCAL_CFLAGS+=$(LOCAL_C_INCLUDES) $(LOCAL_DEFINES) -Wall
LOCAL_SRC_FILES := $(linux_SRC_FILES) $(LOCAL_SRC_FILES) $(COMMON_SRC_FILES)
LOCAL_MODULE := xwjni
LOCAL_LDLIBS := -L${SYSROOT}/usr/lib -llog -lz
include $(BUILD_SHARED_LIBRARY)
ifneq ($(shell which ccache),)
TARGET_CC = ccache $(TOOLCHAIN_PREFIX)gcc
TARGET_CXX = ccache $(TOOLCHAIN_PREFIX)g++
endif
COMMON_SRC_FILES :=
COMMON_PATH :=

3
xwords4/android/XWords4-bt/libs/.gitignore vendored
View file

@ -1,3 +0,0 @@
armeabi
x86
gcm.jar

11
xwords4/android/XWords4-bt/project.properties
View file

@ -1,11 +0,0 @@
# This file is automatically generated by Android Tools.
# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
#
# This file must be checked in Version Control Systems.
#
# To customize properties used by the Ant build system use,
# "ant.properties", and override values to adapt the script to your
# project structure.
# Project target.
target=Google Inc.:Google APIs:14

20
xwords4/android/XWords4-bt/res/drawable-hdpi/.gitignore vendored
View file

@ -1,20 +0,0 @@
back__gen.png
content_discard__gen.png
content_edit.png
content_new__gen.png
dict__gen.png
down__gen.png
download__gen.png
edit__gen.png
email__gen.png
new_group__gen.png
prefs__gen.png
relabel__gen.png
reset__gen.png
save__gen.png
send__gen.png
up__gen.png
content_copy__gen.png
clear_all__gen.png
search__gen.png
select_all__gen.png

20
xwords4/android/XWords4-bt/res/drawable-mdpi/.gitignore vendored
View file

@ -1,20 +0,0 @@
back__gen.png
content_discard__gen.png
content_edit.png
content_new__gen.png
dict__gen.png
down__gen.png
download__gen.png
edit__gen.png
email__gen.png
new_group__gen.png
prefs__gen.png
relabel__gen.png
reset__gen.png
save__gen.png
send__gen.png
up__gen.png
content_copy__gen.png
clear_all__gen.png
search__gen.png
select_all__gen.png

20
xwords4/android/XWords4-bt/res/drawable-xhdpi/.gitignore vendored
View file

@ -1,20 +0,0 @@
back__gen.png
content_discard__gen.png
content_edit.png
content_new__gen.png
dict__gen.png
down__gen.png
download__gen.png
edit__gen.png
email__gen.png
new_group__gen.png
prefs__gen.png
relabel__gen.png
reset__gen.png
save__gen.png
send__gen.png
up__gen.png
content_copy__gen.png
clear_all__gen.png
search__gen.png
select_all__gen.png

29
xwords4/android/XWords4-bt/res/drawable/.gitignore vendored
View file

@ -1,29 +0,0 @@
bluetooth_active.png
bluetooth_disabled.png
dicticon.png
downarrow.png
expander_ic_maximized.9.png
expander_ic_minimized.9.png
flip.png
icon48x48.png
ic_popup_sync_1.png
netarrow_allconn.png
netarrow_someconn.png
netarrow_unconn.png
next_hint.png
origin.png
prev_hint.png
refresh.png
relaygame.png
rightarrow.png
shuffle.png
sologame.png
stat_notify_chat.png
stat_notify_sync.png
undo.png
values.png
zoom.png
in_arrow_active.png
in_arrow.png
out_arrow_active.png
out_arrow.png

1
xwords4/android/XWords4-bt/res/layout-small/.gitignore vendored
View file

@ -1 +0,0 @@
board.xml

40
xwords4/android/XWords4-bt/res/layout/.gitignore vendored
View file

@ -1,40 +0,0 @@
about_dlg.xml
board.xml
btinviter_item.xml
btinviter_item.xml.~1~
btinviter.xml
chat_history_local.xml
chat_history_remote.xml
chat.xml
color_display.xml
color_edit.xml
dflt_name.xml
dict_browser.xml
dict_browse.xml
divider_view.xml
force_remote.xml
game_config.xml
game_list_item.xml
game_list.xml
import_dict.xml
list_item.xml
lookup.xml
new_game.xml
passwd_view.xml
player_edit.xml
player_list_elem.xml
prefs_w_buttons.xml
relay_game_config.xml
rename_game.xml
select_dialog_item.xml
smsinviter_item.xml
smsinviter.xml
confirm_sms.xml
game_list_group.xml
studylist.xml
loc_list_item.xml
loc_main.xml
import_dict_item.xml
list_group.xml
loc_item_edit.xml
remote_dict_details.xml

1
xwords4/android/XWords4-bt/res/menu-small/.gitignore vendored
View file

@ -1 +0,0 @@
board_menu.xml

10
xwords4/android/XWords4-bt/res/menu/.gitignore vendored
View file

@ -1,10 +0,0 @@
board_menu.xml
chat_menu.xml
dicts_item_menu.xml
games_list_item_menu.xml
games_list_menu.xml
dicts_menu.xml
studylist.xml
loc_menu.xml
empty.xml
loc_item_menu.xml

1
xwords4/android/XWords4-bt/res/raw/.gitignore vendored
View file

@ -1 +0,0 @@
changes

1
xwords4/android/XWords4-bt/res/values-large/.gitignore vendored
View file

@ -1 +0,0 @@
styles.xml

4
xwords4/android/XWords4-bt/res/values/.gitignore vendored
View file

@ -1,4 +0,0 @@
git_string.xml
strings.xml
styles.xml
common_rsrc.xml

5
xwords4/android/XWords4-bt/res/values/app_name.xml
View file

@ -1,5 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="app_version">4.4-bt beta 76</string>
</resources>

1
xwords4/android/XWords4-bt/res/xml/.gitignore vendored
View file

@ -1 +0,0 @@
xwprefs.xml

109
xwords4/android/XWords4-bt/src/org/eehouse/android/xw4bt/.gitignore vendored
View file

@ -1,109 +0,0 @@
BoardActivity.java
BoardDims.java
BoardView.java
BTInviteActivity.java
BTReceiver.java
BTService.java
ChatActivity.java
CommsTransport.java
DbgUtils.java
DBHelper.java
DBUtils.java
DictBrowseActivity.java
DictImportActivity.java
DictLangCache.java
DictListPreference.java
DictsActivity.java
DictUtils.java
DispatchNotify.java
DlgDelegate.java
EditColorPreference.java
FirstRunDialog.java
GameConfig.java
GameListAdapter.java
GamesList.java
GameUtils.java
GitVersion.java
MountEventReceiver.java
MultiMsgSink.java
NetLaunchInfo.java
NetStateCache.java
NetUtils.java
NewGameActivity.java
PollListPreference.java
PrefsActivity.java
RefreshNamesTask.java
RelayGameActivity.java
RelayMsgSink.java
RelayReceiver.java
RelayService.java
StatusReceiver.java
Toolbar.java
Utils.java
XWActivity.java
XWConstants.java
XWEditTextPreference.java
XWListActivity.java
XWListAdapter.java
XWListItem.java
XWListPreference.java
GameNamer.java
LookupActivity.java
InviteActivity.java
SMSInviteActivity.java
SMSListItem.java
SMSReceiver.java
SMSService.java
MultiService.java
ABUtils.java
BoardCanvas.java
BuildConstants.java
ConnStatusHandler.java
DlgState.java
ExpiringDelegate.java
ExpiringLinearLayout.java
ExpiringTextView.java
GameListGroup.java
GameListItem.java
GameLock.java
GCMConsts.java
GCMIntentService.java
NFCUtils.java
SelectableItem.java
SMSCheckBoxPreference.java
ThumbCanvas.java
UpdateCheckReceiver.java
XWExpandableListActivity.java
XWPrefs.java
XWService.java
XWSumListPreference.java
XWThumbListPreference.java
StudyList.java
CrashTrack.java
DelegateBase.java
DlgID.java
GamesListActivity.java
GamesListDelegate.java
LookupAlert.java
BoardDelegate.java
BTInviteDelegate.java
ChatDelegate.java
DictBrowseDelegate.java
DictImportDelegate.java
DictsDelegate.java
DrawSelDelegate.java
GameConfigActivity.java
GameConfigDelegate.java
InviteDelegate.java
ListDelegateBase.java
NewGameDelegate.java
PrefsDelegate.java
RelayGameDelegate.java
SMSInviteDelegate.java
StudyListActivity.java
StudyListDelegate.java
DwnldActivity.java
DwnldDelegate.java
GroupStateListener.java
ListGroup.java
XWExpListAdapter.java

115
xwords4/android/XWords4-bt/src/org/eehouse/android/xw4bt/XWApp.java
View file

@ -1,115 +0,0 @@
/* -*- compile-command: "find-and-ant.sh debug install"; -*- */
/*
* Copyright 2010 - 2011 by Eric House (xwords@eehouse.org). All
* rights reserved.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
* published by the Free Software Foundation; either version 2 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
package org.eehouse.android.xw4bt;
import android.app.Application;
import android.content.Context;
import android.graphics.Color;
import android.os.Build;
import android.preference.PreferenceManager;
import java.util.UUID;
import org.eehouse.android.xw4bt.jni.XwJNI;
public class XWApp extends Application {
public static final boolean BTSUPPORTED = true;
public static final boolean SMSSUPPORTED = true;
public static final boolean GCMSUPPORTED = true;
public static final boolean ATTACH_SUPPORTED = true;
public static final boolean REMATCH_SUPPORTED = false;
public static final boolean DEBUG_LOCKS = false;
public static final boolean DEBUG_EXP_TIMERS = false;
public static final boolean GCM_IGNORED = false;
public static final boolean UDP_ENABLED = true;
public static final String SMS_PUBLIC_HEADER = "-XW4";
public static final int MAX_TRAY_TILES = 7; // comtypes.h
public static final int SEL_COLOR = Color.argb( 0xFF, 0x09, 0x70, 0x93 );
private static UUID s_UUID = null;
private static Boolean s_onEmulator = null;
@Override
public void onCreate()
{
super.onCreate();
// This one line should always get logged even if logging is
// off -- because logging is on by default until logEnable is
// called.
DbgUtils.logf( "XWApp.onCreate(); git_rev=%s",
getString( R.string.git_rev ) );
DbgUtils.logEnable( this );
ConnStatusHandler.loadState( this );
RelayReceiver.RestartTimer( this );
boolean mustCheck = Utils.firstBootThisVersion( this );
PreferenceManager.setDefaultValues( this, R.xml.xwprefs, mustCheck );
if ( mustCheck ) {
XWPrefs.setHaveCheckedUpgrades( this, false );
} else {
mustCheck = ! XWPrefs.getHaveCheckedUpgrades( this );
}
if ( mustCheck ) {
UpdateCheckReceiver.checkVersions( this, false );
}
UpdateCheckReceiver.restartTimer( this );
BTService.startService( this );
SMSService.checkForInvites( this );
RelayService.startService( this );
GCMIntentService.init( this );
}
// This is called on emulator only, but good for ensuring no memory leaks
// by forcing JNI cleanup
public void onTerminate()
{
DbgUtils.logf( "XwApp.onTerminate() called" );
XwJNI.cleanGlobals();
super.onTerminate();
}
public static UUID getAppUUID()
{
if ( null == s_UUID ) {
s_UUID = UUID.fromString( XwJNI.comms_getUUID() );
}
return s_UUID;
}
public static String getAppName( Context context )
{
return context.getString( R.string.app_name );
}
public static boolean onEmulator()
{
if ( null == s_onEmulator ) {
s_onEmulator = new Boolean( "google_sdk".equals(Build.MODEL) );
}
return s_onEmulator;
}
}

18
xwords4/android/XWords4-bt/src/org/eehouse/android/xw4bt/jni/.gitignore vendored
View file

@ -1,18 +0,0 @@
BoardHandler.java
CommonPrefs.java
CommsAddrRec.java
CurGameInfo.java
DictInfo.java
DrawCtx.java
DrawScoreInfo.java
GameSummary.java
JNIThread.java
JNIUtilsImpl.java
JNIUtils.java
LocalPlayer.java
SyncedDraw.java
TransportProcs.java
UtilCtxtImpl.java
UtilCtxt.java
XwJNI.java
BoardDims.java

11
xwords4/android/XWords4-bt/src/org/eehouse/android/xw4bt/loc/.gitignore vendored
View file

@ -1,11 +0,0 @@
LocActivity.java
LocDelegate.java
LocIDsData.java
LocIDs.java
LocListAdapter.java
LocListItem.java
LocSearcher.java
LocUtils.java
XlatingSpinnerAdapter.java
LocItemEditActivity.java
LocItemEditDelegate.java

69
xwords4/android/XWords4-dbg/AndroidManifest.xml
View file

@ -1,20 +1,4 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<!-- -*- compile-command: "ant install"; -*- -->
<!-- Copyright (C) 2007 The Android Open Source Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<!-- Declare the contents of this Android application. The namespace <!-- Declare the contents of this Android application. The namespace
attribute brings in the Android platform namespace, and the package attribute brings in the Android platform namespace, and the package
supplies a unique name for the application. When writing your supplies a unique name for the application. When writing your
@ -22,14 +6,14 @@
to come from a domain that you own or have control over. --> to come from a domain that you own or have control over. -->
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="org.eehouse.android.xw4dbg" package="org.eehouse.android.xw4dbg"
android:versionCode="78" android:versionCode="99"
android:versionName="@string/app_version" android:versionName="@string/app_version"
> >
<!-- BE SURE TO MODIFY project.project AND the variable TARGET in <!-- BE SURE TO MODIFY project.properties AND the variable TARGET in
../scripts/setup_local_props.sh if targetSdkVersion changes!!! ../scripts/setup_local_props.sh if targetSdkVersion changes!!!
--> -->
<uses-sdk android:minSdkVersion="7" android:targetSdkVersion="14" /> <uses-sdk android:minSdkVersion="7" android:targetSdkVersion="19" />
<supports-screens android:resizeable="true" <supports-screens android:resizeable="true"
android:smallScreens="true" android:smallScreens="true"
@ -45,8 +29,10 @@
<uses-permission android:name="android.permission.VIBRATE" /> <uses-permission android:name="android.permission.VIBRATE" />
<uses-permission android:name="android.permission.RECEIVE_SMS" /> <uses-permission android:name="android.permission.RECEIVE_SMS" />
<uses-permission android:name="android.permission.SEND_SMS" /> <uses-permission android:name="android.permission.SEND_SMS" />
<uses-permission android:name="android.permission.READ_SMS" /> <uses-permission android:name="android.permission.BLUETOOTH" />
<uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
<uses-permission android:name="android.permission.READ_CONTACTS" /> <uses-permission android:name="android.permission.READ_CONTACTS" />
<uses-permission android:name="android.permission.READ_PHONE_STATE"/>
<uses-feature android:name="android.hardware.telephony" <uses-feature android:name="android.hardware.telephony"
android:required = "false" android:required = "false"
@ -54,9 +40,9 @@
<uses-feature android:name="android.hardware.nfc" android:required="false" /> <uses-feature android:name="android.hardware.nfc" android:required="false" />
<!-- GCM stuff --> <!-- GCM stuff -->
<permission android:name="org.eehouse.android.xw4.permission.C2D_MESSAGE" <permission android:name="org.eehouse.android.xw4dbg.permission.C2D_MESSAGE"
android:protectionLevel="signature" /> android:protectionLevel="signature" />
<uses-permission android:name="org.eehouse.android.xw4.permission.C2D_MESSAGE" /> <uses-permission android:name="org.eehouse.android.xw4dbg.permission.C2D_MESSAGE" />
<uses-permission android:name="com.google.android.c2dm.permission.RECEIVE" /> <uses-permission android:name="com.google.android.c2dm.permission.RECEIVE" />
<uses-permission android:name="android.permission.GET_ACCOUNTS" /> <uses-permission android:name="android.permission.GET_ACCOUNTS" />
<uses-permission android:name="android.permission.WAKE_LOCK" /> <uses-permission android:name="android.permission.WAKE_LOCK" />
@ -68,6 +54,7 @@
<application android:icon="@drawable/icon48x48" <application android:icon="@drawable/icon48x48"
android:label="@string/app_name" android:label="@string/app_name"
android:name=".XWApp" android:name=".XWApp"
android:debuggable="true"
> >
<activity android:name="GamesListActivity" <activity android:name="GamesListActivity"
@ -93,19 +80,24 @@
android:configChanges="keyboardHidden|orientation|screenSize" android:configChanges="keyboardHidden|orientation|screenSize"
/> />
<activity android:name="NewGameActivity" <activity android:name="BTInviteActivity"
android:theme="@android:style/Theme.NoTitleBar" android:label="@string/bt_invite_title"
android:configChanges="keyboardHidden|orientation|screenSize" android:configChanges="keyboardHidden|orientation|screenSize"
/> />
<activity android:name="SMSInviteActivity" <activity android:name="SMSInviteActivity"
android:theme="@android:style/Theme.Dialog" android:label="@string/sms_invite_title"
android:configChanges="keyboardHidden|orientation|screenSize" android:configChanges="keyboardHidden|orientation|screenSize"
android:screenOrientation="sensor" android:screenOrientation="sensor"
/> />
<activity android:name="RelayInviteActivity"
android:label="@string/relay_invite_title"
android:configChanges="keyboardHidden|orientation|screenSize"
/>
<activity android:name="GameConfigActivity" <activity android:name="GameConfigActivity"
android:screenOrientation="sensor" android:screenOrientation="sensor"
android:configChanges="keyboardHidden|orientation|screenSize" android:configChanges="keyboardHidden|orientation|screenSize"
android:windowSoftInputMode="stateAlwaysHidden"
> >
<intent-filter> <intent-filter>
<action android:name="android.intent.action.EDIT" /> <action android:name="android.intent.action.EDIT" />
@ -120,18 +112,21 @@
<activity android:name="BoardActivity" <activity android:name="BoardActivity"
android:screenOrientation="portrait" android:screenOrientation="portrait"
android:configChanges="keyboardHidden" android:configChanges="keyboardHidden|orientation|screenSize"
android:windowSoftInputMode="stateAlwaysHidden|adjustPan"
/> />
<activity android:name="StudyListActivity" <activity android:name="StudyListActivity"
android:configChanges="keyboardHidden|orientation|screenSize" android:configChanges="keyboardHidden|orientation|screenSize"
/> />
<receiver android:name="RelayReceiver"> <receiver android:name="OnBootReceiver">
<intent-filter> <intent-filter>
<action android:name="android.intent.action.BOOT_COMPLETED"/> <action android:name="android.intent.action.BOOT_COMPLETED"/>
</intent-filter> </intent-filter>
</receiver> </receiver>
<receiver android:name="RelayReceiver"/>
<receiver android:name="NagTurnReceiver"/>
<receiver android:name="UpdateCheckReceiver"> <receiver android:name="UpdateCheckReceiver">
<intent-filter> <intent-filter>
@ -185,9 +180,6 @@
</intent-filter> </intent-filter>
</activity> </activity>
<activity android:name="RelayGameActivity"
android:configChanges="keyboardHidden|orientation|screenSize"
/>
<activity android:name="DictBrowseActivity" <activity android:name="DictBrowseActivity"
android:configChanges="keyboardHidden|orientation|screenSize" android:configChanges="keyboardHidden|orientation|screenSize"
/> />
@ -214,15 +206,22 @@
</intent-filter> </intent-filter>
</receiver> </receiver>
<receiver android:name="SMSReceiver" > <receiver android:name="BTReceiver">
<intent-filter android:priority="999" > <intent-filter>
<action android:name="android.provider.Telephony.SMS_RECEIVED" /> <action android:name="android.bluetooth.adapter.action.STATE_CHANGED" />
</intent-filter> </intent-filter>
<intent-filter>
<action android:name="android.bluetooth.device.action.ACL_CONNECTED" />
</intent-filter>
</receiver>
<service android:name="BTService"/>
<receiver android:name="SMSReceiver" >
<intent-filter> <intent-filter>
<action android:name="android.intent.action.DATA_SMS_RECEIVED" /> <action android:name="android.intent.action.DATA_SMS_RECEIVED" />
<data android:scheme="sms" /> <data android:scheme="sms" />
<data android:port="3344" /> <data android:port="@string/nbs_port" />
<data android:host="*" /> <data android:host="*" />
</intent-filter> </intent-filter>
@ -235,7 +234,7 @@
<intent-filter> <intent-filter>
<action android:name="com.google.android.c2dm.intent.RECEIVE" /> <action android:name="com.google.android.c2dm.intent.RECEIVE" />
<action android:name="com.google.android.c2dm.intent.REGISTRATION" /> <action android:name="com.google.android.c2dm.intent.REGISTRATION" />
<category android:name="org.eehouse.android.xw4" /> <category android:name="org.eehouse.android.xw4dbg" />
</intent-filter> </intent-filter>
</receiver> </receiver>

2
xwords4/android/XWords4-dbg/assets/.gitignore vendored
View file

@ -1,3 +1,5 @@
BasEnglish2to8.xwd BasEnglish2to8.xwd
CollegeEng_2to8.xwd CollegeEng_2to8.xwd
Top5000.xwd Top5000.xwd
changes.html
gitvers.txt

7
xwords4/android/XWords4-dbg/build.xml
View file

@ -1,6 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project name="XWords4" default="release"> <project name="XWords4" default="release">
<!-- eeh: allow ant files to refer e.g. to ${env.HOME} -->
<property environment="env" />
<!-- The local.properties file is created and updated by the 'android' tool. <!-- The local.properties file is created and updated by the 'android' tool.
It contains the path to the SDK. It should *NOT* be checked into It contains the path to the SDK. It should *NOT* be checked into
Version Control Systems. --> Version Control Systems. -->
@ -52,8 +55,10 @@
<!-- extension targets. Uncomment the ones where you want to do custom work <!-- extension targets. Uncomment the ones where you want to do custom work
in between standard targets --> in between standard targets -->
<property name="INITIAL_CLIENT_VERS" value="4"/> <property name="INITIAL_CLIENT_VERS" value="8"/>
<property name="VARIANT_NAME" value="xw4dbg"/> <property name="VARIANT_NAME" value="xw4dbg"/>
<property name="APP_NAME" value="CrossDbg"/>
<target name="-pre-clean"> <target name="-pre-clean">
<antcall target="my-pre-clean" /> <antcall target="my-pre-clean" />
</target> </target>

4
xwords4/android/XWords4-dbg/img_src/.gitignore vendored
View file

@ -19,3 +19,7 @@ up.svg
clear_all.svg clear_all.svg
search.svg search.svg
select_all.svg select_all.svg
content_new_net.svg
content_new_solo.svg
multigame.svg
sologame.svg

BIN
xwords4/android/XWords4-dbg/libs/crittercism_v4_4_0_sdkonly.jar
View file

Binary file not shown.

BIN
xwords4/android/XWords4-dbg/libs/crittercism_v5_5_5_sdkonly.jar Normal file
View file

Binary file not shown.

2
xwords4/android/XWords4-dbg/project.properties
View file

@ -8,4 +8,4 @@
# project structure. # project structure.
# Project target. # Project target.
target=android-14 target=android-19

4
xwords4/android/XWords4-dbg/res/drawable-hdpi/.gitignore vendored
View file

@ -20,3 +20,7 @@ up__gen.png
clear_all__gen.png clear_all__gen.png
search__gen.png search__gen.png
select_all__gen.png select_all__gen.png
content_new_net__gen.png
content_new_solo__gen.png
multigame__gen.png
sologame__gen.png

4
xwords4/android/XWords4-dbg/res/drawable-mdpi/.gitignore vendored
View file

@ -20,3 +20,7 @@ up__gen.png
clear_all__gen.png clear_all__gen.png
search__gen.png search__gen.png
select_all__gen.png select_all__gen.png
content_new_net__gen.png
content_new_solo__gen.png
multigame__gen.png
sologame__gen.png

4
xwords4/android/XWords4-dbg/res/drawable-xhdpi/.gitignore vendored
View file

@ -20,3 +20,7 @@ up__gen.png
clear_all__gen.png clear_all__gen.png
search__gen.png search__gen.png
select_all__gen.png select_all__gen.png
content_new_net__gen.png
content_new_solo__gen.png
multigame__gen.png
sologame__gen.png

1
xwords4/android/XWords4-dbg/res/drawable/.gitignore vendored
View file

@ -27,3 +27,4 @@ in_arrow_active.png
in_arrow.png in_arrow.png
out_arrow_active.png out_arrow_active.png
out_arrow.png out_arrow.png
notify.png

8
xwords4/android/XWords4-dbg/res/layout/.gitignore vendored
View file

@ -37,3 +37,11 @@ loc_main.xml
loc_item_edit.xml loc_item_edit.xml
import_dict_item.xml import_dict_item.xml
list_group.xml list_group.xml
conn_types_display.xml
expander_header.xml
msg_label_and_edit.xml
not_again_view.xml
relayinviter.xml
remote_dict_details.xml
toolbar.xml
chat_row.xml

3
xwords4/android/XWords4-dbg/res/menu/.gitignore vendored
View file

@ -1,10 +1,11 @@
board_menu.xml board_menu.xml
chat_menu.xml chat_menu.xml
dicts_item_menu.xml dicts_item_menu.xml
games_list_item_menu.xml
games_list_menu.xml games_list_menu.xml
dicts_menu.xml dicts_menu.xml
studylist.xml studylist.xml
loc_menu.xml loc_menu.xml
empty.xml empty.xml
loc_item_menu.xml loc_item_menu.xml
games_list_group_menu.xml
games_list_game_menu.xml

0
xwords4/android/XWords4-bt/res/values-ca/.gitignore → xwords4/android/XWords4-dbg/res/values-fr/.gitignore vendored
View file

0
xwords4/android/XWords4-bt/res/values-cs/.gitignore → xwords4/android/XWords4-dbg/res/values-ja/.gitignore vendored
View file

0
xwords4/android/XWords4-bt/res/values-pt/.gitignore → xwords4/android/XWords4-dbg/res/values-nl/.gitignore vendored
View file

3
xwords4/android/XWords4-dbg/res/values/.gitignore vendored
View file

@ -1,4 +1,5 @@
git_string.xml
strings.xml strings.xml
styles.xml styles.xml
common_rsrc.xml common_rsrc.xml
gen_strings.xml
app_name.xml

5
xwords4/android/XWords4-dbg/res/values/app_name.xml
View file

@ -1,5 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="app_version">4.4-dbg beta 80</string>
</resources>

1
xwords4/android/XWords4-dbg/res_src/values-ba_CK/.gitignore vendored
View file

@ -1 +1,2 @@
/strings.xml /strings.xml
strings.xml

0
xwords4/android/XWords4-bt/res/values-sk/.gitignore → xwords4/android/XWords4-dbg/res_src/values-ca/.gitignore vendored
View file

1
xwords4/android/XWords4-dbg/res_src/values-ca_PS/.gitignore vendored
View file

@ -1 +1,2 @@
/strings.xml /strings.xml
strings.xml

0
xwords4/android/XWords4-sms/res/values-ca/.gitignore → xwords4/android/XWords4-dbg/res_src/values-cs/.gitignore vendored
View file

0
xwords4/android/XWords4-sms/res/values-cs/.gitignore → xwords4/android/XWords4-dbg/res_src/values-fr/.gitignore vendored
View file

0
xwords4/android/XWords4-sms/res/values-sk/.gitignore → xwords4/android/XWords4-dbg/res_src/values-ja/.gitignore vendored
View file

1
xwords4/android/XWords4-dbg/res_src/values-nl/.gitignore vendored Normal file
View file

@ -0,0 +1 @@
strings.xml

1
xwords4/android/XWords4-dbg/res_src/values-pt/.gitignore vendored Normal file
View file

@ -0,0 +1 @@
strings.xml

1
xwords4/android/XWords4-dbg/res_src/values-sk/.gitignore vendored Normal file
View file

@ -0,0 +1 @@
strings.xml

16
xwords4/android/XWords4-dbg/src/org/eehouse/android/xw4dbg/.gitignore vendored
View file

@ -1,4 +1,3 @@
#CrashTrack.java#
/DlgID.java /DlgID.java
/LookupAlert.java /LookupAlert.java
ABUtils.java ABUtils.java
@ -111,3 +110,18 @@ DwnldActivity.java
DwnldDelegate.java DwnldDelegate.java
GroupStateListener.java GroupStateListener.java
ListGroup.java ListGroup.java
ConnViaViewLayout.java
Delegator.java
DevID.java
HeaderWithExpander.java
LangListPreference.java
ListDelegator.java
NagTurnReceiver.java
NotAgainView.java
OnBootReceiver.java
RelayInviteActivity.java
RelayInviteDelegate.java
XWConnAddrPreference.java
XWDevIDPreference.java
XWExpListAdapter.java
RequestCode.java

1
xwords4/android/XWords4-dbg/src/org/eehouse/android/xw4dbg/jni/.gitignore vendored
View file

@ -16,3 +16,4 @@ UtilCtxtImpl.java
UtilCtxt.java UtilCtxt.java
XwJNI.java XwJNI.java
BoardDims.java BoardDims.java
LastMoveInfo.java

7
xwords4/android/XWords4-sms/.gitignore vendored
View file

@ -1,7 +0,0 @@
*.apk
local.properties
bin
gen
libs
proguard.cfg
obj

168
xwords4/android/XWords4-sms/AndroidManifest.xml
View file

@ -1,168 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- -*- compile-command: "ant install"; -*- -->
<!-- Copyright (C) 2007 The Android Open Source Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<!-- Declare the contents of this Android application. The namespace
attribute brings in the Android platform namespace, and the package
supplies a unique name for the application. When writing your
own application, the package name must be changed from "com.example.*"
to come from a domain that you own or have control over. -->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="org.eehouse.android.xw4sms"
android:versionCode="44"
android:versionName="@string/app_version"
>
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
<uses-permission android:name="android.permission.VIBRATE" />
<uses-permission android:name="android.permission.RECEIVE_SMS" />
<uses-permission android:name="android.permission.SEND_SMS" />
<uses-permission android:name="android.permission.READ_SMS" />
<uses-permission android:name="android.permission.READ_CONTACTS" />
<uses-sdk android:minSdkVersion="7" android:targetSdkVersion="7" />
<application android:icon="@drawable/icon48x48"
android:label="@string/app_name"
android:name=".XWApp"
>
<activity android:name="GamesList"
android:label="@string/app_name"
android:launchMode="standard"
android:configChanges="keyboardHidden|orientation"
>
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
<activity android:name="DictsActivity"
android:label="@string/title_dicts_list"
android:configChanges="keyboardHidden|orientation"
/>
<activity android:name="NewGameActivity"
android:theme="@android:style/Theme.NoTitleBar"
android:configChanges="keyboardHidden|orientation"
/>
<activity android:name="SMSInviteActivity"
android:theme="@android:style/Theme.Dialog"
android:configChanges="keyboardHidden|orientation"
android:screenOrientation="portrait"
/>
<activity android:name="GameConfig"
android:screenOrientation="sensor"
android:configChanges="keyboardHidden|orientation"
>
<intent-filter>
<action android:name="android.intent.action.EDIT" />
</intent-filter>
</activity>
<activity android:name="PrefsActivity"
android:label="@string/title_prefs"
android:screenOrientation="sensor"
android:configChanges="keyboardHidden|orientation"
/>
<activity android:name="BoardActivity"
android:theme="@android:style/Theme.Light"
android:screenOrientation="portrait"
android:configChanges="keyboardHidden"
/>
<activity android:name="LookupActivity"
android:configChanges="keyboardHidden|orientation"
android:theme="@android:style/Theme.Dialog"
/>
<receiver android:name="RelayReceiver">
<intent-filter>
<action android:name="android.intent.action.BOOT_COMPLETED"/>
</intent-filter>
</receiver>
<receiver android:name="UpdateCheckReceiver">
<intent-filter>
<action android:name="android.intent.action.BOOT_COMPLETED"/>
</intent-filter>
</receiver>
<activity android:name="DispatchNotify"
>
<intent-filter>
<action android:name="android.intent.action.VIEW" />
<action android:name="android.intent.action.EDIT" />
<category android:name="android.intent.category.DEFAULT" />
<category android:name="android.intent.category.BROWSABLE" />
<data android:scheme="newxwgame"/>
</intent-filter>
</activity>
<!-- downloading dicts -->
<activity android:name=".DictImportActivity"
android:label="@string/app_name"
android:theme="@android:style/Theme.Dialog">
<intent-filter>
<action android:name="android.intent.action.VIEW"></action>
<category android:name="android.intent.category.DEFAULT"></category>
<category android:name="android.intent.category.BROWSABLE"></category>
<data android:scheme="file" android:host="*"
android:pathPattern=".*\\.xwd" />
<data android:scheme="http"
android:mimeType="application/x-xwordsdict"
android:host="*"
android:pathPattern=".*\\.xwd" />
</intent-filter>
</activity>
<activity android:name="RelayGameActivity"/>
<activity android:name="DictBrowseActivity"
android:configChanges="keyboardHidden|orientation"
/>
<activity android:name="ChatActivity"
android:configChanges="keyboardHidden|orientation"
/>
<service android:name="RelayService"/>
<receiver android:name=".MountEventReceiver">
<intent-filter>
<action android:name="android.intent.action.MEDIA_MOUNTED" />
<data android:scheme="file" />
</intent-filter>
<intent-filter>
<action android:name="android.intent.action.MEDIA_EJECT" />
<data android:scheme="file" />
</intent-filter>
</receiver>
<receiver android:name="SMSReceiver" >
<intent-filter android:priority="999" >
<action android:name="android.provider.Telephony.SMS_RECEIVED" />
</intent-filter>
</receiver>
<service android:name="SMSService"/>
</application>
</manifest>

3
xwords4/android/XWords4-sms/assets/.gitignore vendored
View file

@ -1,3 +0,0 @@
BasEnglish2to8.xwd
CollegeEng_2to8.xwd
Top5000.xwd

123
xwords4/android/XWords4-sms/build.xml
View file

@ -1,123 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project name="XWords4" default="release">
<!-- The local.properties file is created and updated by the 'android' tool.
It contains the path to the SDK. It should *NOT* be checked into
Version Control Systems. -->
<loadproperties srcFile="local.properties" />
<!-- The ant.properties file can be created by you. It is only edited by the
'android' tool to add properties to it.
This is the place to change some Ant specific build properties.
Here are some properties you may want to change/update:
source.dir
The name of the source directory. Default is 'src'.
out.dir
The name of the output directory. Default is 'bin'.
For other overridable properties, look at the beginning of the rules
files in the SDK, at tools/ant/build.xml
Properties related to the SDK location or the project target should
be updated using the 'android' tool with the 'update' action.
This file is an integral part of the build system for your
application and should be checked into Version Control Systems.
-->
<property file="ant.properties" />
<!-- The project.properties file is created and updated by the 'android'
tool, as well as ADT.
This contains project specific properties such as project target, and library
dependencies. Lower level build properties are stored in ant.properties
(or in .classpath for Eclipse projects).
This file is an integral part of the build system for your
application and should be checked into Version Control Systems. -->
<loadproperties srcFile="project.properties" />
<!-- quick check on sdk.dir -->
<fail
message="sdk.dir is missing. Make sure to generate local.properties using 'android update project'"
unless="sdk.dir"
/>
<target name="-pre-clean">
<exec dir="." executable="../scripts/ndkbuild.sh" output="/dev/null">
<arg value="clean"/>
</exec>
<exec dir="." executable="../scripts/cleanvariants.sh" >
<arg value="--dest-dir"/>
<arg value="./res"/>
<arg value="--dest-dir"/>
<arg value="./src"/>
<arg value="--dest-dir"/>
<arg value="./jni"/>
<arg value="--dest-dir"/>
<arg value="./assets"/>
</exec>
</target>
<!-- extension targets. Uncomment the ones where you want to do custom work
in between standard targets -->
<target name="-pre-build">
<exec dir="." executable="../scripts/mkvariant.sh" output="/dev/null">
<arg value="--variant-name"/>
<arg value="xw4sms"/>
<arg value="--app-name"/>
<arg value="cWords-SMS"/>
<arg value="--dest-dir"/>
<arg value="./res"/>
<arg value="--dest-dir"/>
<arg value="./src"/>
<arg value="--dest-dir"/>
<arg value="./jni"/>
<arg value="--dest-dir"/>
<arg value="./assets"/>
</exec>
<exec dir="." executable="../scripts/ndkbuild.sh" output="/dev/null">
<arg value="-j3"/>
</exec>
<exec dir=".." executable="./scripts/genvers.sh" output="/dev/null">
<arg value="XWords4-sms"/>
<arg value="xw4sms"/>
</exec>
</target>
<!--
<target name="-pre-compile">
</target>
/* This is typically used for code obfuscation.
Compiled code location: ${out.classes.absolute.dir}
If this is not done in place, override ${out.dex.input.absolute.dir} */
<target name="-post-compile">
</target>
-->
<!-- Import the actual build file.
To customize existing targets, there are two options:
- Customize only one target:
- copy/paste the target into this file, *before* the
<import> task.
- customize it to your needs.
- Customize the whole content of build.xml
- copy/paste the content of the rules files (minus the top node)
into this file, replacing the <import> task.
- customize to your needs.
***********************
****** IMPORTANT ******
***********************
In all cases you must update the value of version-tag below to read 'custom' instead of an integer,
in order to avoid having your file be overridden by tools such as "android update project"
-->
<!-- version-tag: 1 -->
<import file="${sdk.dir}/tools/ant/build.xml" />
</project>

18
xwords4/android/XWords4-sms/jni/.gitignore vendored
View file

@ -1,18 +0,0 @@
anddict.c
anddict.h
andglobals.h
andutils.c
andutils.h
drawwrapper.c
drawwrapper.h
jniutlswrapper.c
jniutlswrapper.h
LocalizedStrIncludes.h
paths.h
utils.c
utilwrapper.c
utilwrapper.h
xportwrapper.c
xportwrapper.h
xptypes.h
xwjni.c

84
xwords4/android/XWords4-sms/jni/Android.mk
View file

@ -1,84 +0,0 @@
# -*- mode: Makefile; compile-command: "cd ../; ${NDK_ROOT}/ndk-build -j3"; -*-
LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS)
COMMON_PATH=../../../common
local_C_INCLUDES+= \
-I$(LOCAL_PATH)/$(COMMON_PATH) \
-I$(LOCAL_PATH)/../../../relay \
local_LDLIBS += -llog
# local_DEBUG = -DMEM_DEBUG -DDEBUG -DENABLE_LOGGING
local_DEFINES += \
$(local_DEBUG) \
-DXWFEATURE_RELAY \
-DXWFEATURE_SMS \
-DXWFEATURE_COMMSACK \
-DXWFEATURE_TURNCHANGENOTIFY \
-DXWFEATURE_CHAT \
-DCOMMS_XPORT_FLAGSPROC \
-DKEY_SUPPORT \
-DXWFEATURE_CROSSHAIRS \
-DPOINTER_SUPPORT \
-DSCROLL_DRAG_THRESHHOLD=1 \
-DDROP_BITMAPS \
-DXWFEATURE_TRAYUNDO_ONE \
-DDISABLE_TILE_SEL \
-DXWFEATURE_BOARDWORDS \
-DXWFEATURE_WALKDICT \
-DXWFEATURE_WALKDICT_FILTER \
-DXWFEATURE_DICTSANITY \
-DFEATURE_TRAY_EDIT \
-DXWFEATURE_BONUSALL \
-DMAX_ROWS=32 \
-DHASH_STREAM \
-DXWFEATURE_BASE64 \
-DINITIAL_CLIENT_VERS=2 \
-DRELAY_ROOM_DEFAULT=\"\" \
-D__LITTLE_ENDIAN \
local_SRC_FILES += \
xwjni.c \
utilwrapper.c \
drawwrapper.c \
xportwrapper.c \
anddict.c \
andutils.c \
jniutlswrapper.c \
COMMON_PATH=../../../common
common_SRC_FILES += \
$(COMMON_PATH)/boarddrw.c \
$(COMMON_PATH)/scorebdp.c \
$(COMMON_PATH)/dragdrpp.c \
$(COMMON_PATH)/pool.c \
$(COMMON_PATH)/tray.c \
$(COMMON_PATH)/dictnry.c \
$(COMMON_PATH)/dictiter.c \
$(COMMON_PATH)/mscore.c \
$(COMMON_PATH)/vtabmgr.c \
$(COMMON_PATH)/strutils.c \
$(COMMON_PATH)/engine.c \
$(COMMON_PATH)/board.c \
$(COMMON_PATH)/mempool.c \
$(COMMON_PATH)/game.c \
$(COMMON_PATH)/server.c \
$(COMMON_PATH)/model.c \
$(COMMON_PATH)/comms.c \
$(COMMON_PATH)/memstream.c \
$(COMMON_PATH)/movestak.c \
$(COMMON_PATH)/dbgutil.c \
LOCAL_CFLAGS+=$(local_C_INCLUDES) $(local_DEFINES) -Wall
LOCAL_SRC_FILES := $(linux_SRC_FILES) $(local_SRC_FILES) $(common_SRC_FILES)
LOCAL_MODULE := xwjni
LOCAL_LDLIBS := -L${SYSROOT}/usr/lib -llog -lz
include $(BUILD_SHARED_LIBRARY)

11
xwords4/android/XWords4-sms/project.properties
View file

@ -1,11 +0,0 @@
# This file is automatically generated by Android Tools.
# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
#
# This file must be checked in Version Control Systems.
#
# To customize properties used by the Ant build system use,
# "ant.properties", and override values to adapt the script to your
# project structure.
# Project target.
target=android-7

30
xwords4/android/XWords4-sms/res/drawable/.gitignore vendored
View file

@ -1,30 +0,0 @@
bluetooth_active.png
bluetooth_disabled.png
dicticon.png
downarrow.png
expander_ic_maximized.9.png
expander_ic_minimized.9.png
flip.png
icon48x48.png
ic_popup_sync_1.png
netarrow_allconn.png
netarrow_someconn.png
netarrow_unconn.png
next_hint.png
origin.png
prev_hint.png
refresh.png
relaygame.png
rightarrow.png
shuffle.png
sologame.png
stat_notify_chat.png
stat_notify_sync.png
undo.png
values.png
zoom.png
sym_action_chat.png
in_arrow.png
out_arrow.png
in_arrow_active.png
out_arrow_active.png

1
xwords4/android/XWords4-sms/res/layout-small/.gitignore vendored
View file

@ -1 +0,0 @@
board.xml

31
xwords4/android/XWords4-sms/res/layout/.gitignore vendored
View file

@ -1,31 +0,0 @@
about_dlg.xml
board.xml
btinviter_item.xml
btinviter.xml
chat_history_local.xml
chat_history_remote.xml
chat.xml
color_display.xml
color_edit.xml
dflt_name.xml
dict_browser.xml
dict_browse.xml
divider_view.xml
force_remote.xml
game_config.xml
game_list_item.xml
game_list.xml
import_dict.xml
list_item.xml
lookup.xml
new_game.xml
passwd_view.xml
player_edit.xml
player_list_elem.xml
prefs_w_buttons.xml
relay_game_config.xml
rename_game.xml
smsinviter_item.xml
smsinviter.xml
game_list_tmp.xml
confirm_sms.xml

1
xwords4/android/XWords4-sms/res/menu-small/.gitignore vendored
View file

@ -1 +0,0 @@
board_menu.xml

5
xwords4/android/XWords4-sms/res/menu/.gitignore vendored
View file

@ -1,5 +0,0 @@
board_menu.xml
chat_menu.xml
dicts_item_menu.xml
games_list_item_menu.xml
games_list_menu.xml

35
xwords4/android/XWords4-sms/res/raw/changes
View file

@ -1,35 +0,0 @@
<html>
<head>
<style type="text/css">
body {font-size: smaller;}
</style>
</head>
<body>
<b>CrossW-SMS 4.4 beta 52 release</b>
<p>This is first release of this variant of Crosswords featuring the
ability to play via SMS</p>
<ul>Other changes
<li>Remember wordlist browser position, word size, etc.</li>
<li>Fix wordlist browser bugs for languages with more than one
letter on a tile</li>
<li>New word lookup URLs for Catalan language lists</li>
<li>Display wordlist comment if present</li>
</ul>
<p>Please remember that this is beta software. Please let me know (at
eehouse@eehouse.org) what's broken and what features you'd most like
to see.</p>
<p>(Website <a href="http://eehouse.org/xw4sms.html">here</a>.)</p>
<p>Thanks!<br>--Eric</p>
</body>
</html>

1
xwords4/android/XWords4-sms/res/values-large/.gitignore vendored
View file

@ -1 +0,0 @@
styles.xml

4
xwords4/android/XWords4-sms/res/values/.gitignore vendored
View file

@ -1,4 +0,0 @@
common_rsrc.xml
git_string.xml
strings.xml
styles.xml

5
xwords4/android/XWords4-sms/res/values/app_name.xml
View file

@ -1,5 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="app_version">4.4 beta 52</string>
</resources>

1
xwords4/android/XWords4-sms/res/xml/.gitignore vendored
View file

@ -1 +0,0 @@

342
xwords4/android/XWords4-sms/res/xml/xwprefs.xml
View file

@ -1,342 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
>
<PreferenceScreen android:title="@string/prefs_defaults"
android:summary="@string/prefs_defaults_summary"
>
<PreferenceScreen android:title="@string/prefs_names"
android:summary="@string/prefs_names_summary"
>
<org.eehouse.android.xw4sms.XWEditTextPreference
android:key="@string/key_player1_name"
android:title="@string/pref_player1_name"
android:capitalize="words"
android:defaultValue=""
/>
<org.eehouse.android.xw4sms.XWEditTextPreference
android:key="@string/key_player2_name"
android:title="@string/pref_player2_name"
android:capitalize="words"
android:defaultValue="ignored"
android:summary="@string/tell_unused"
android:enabled="false"
/>
<org.eehouse.android.xw4sms.XWEditTextPreference
android:key="@string/key_player3_name"
android:title="@string/pref_player3_name"
android:capitalize="words"
android:defaultValue=""
android:summary="@string/tell_unused"
android:enabled="false"
/>
<org.eehouse.android.xw4sms.XWEditTextPreference
android:key="@string/key_player4_name"
android:title="@string/pref_player4_name"
android:capitalize="words"
android:defaultValue=""
android:summary="@string/tell_unused"
android:enabled="false"
/>
</PreferenceScreen>
<PreferenceScreen android:title="@string/prefs_dicts"
android:summary="@string/prefs_dicts_summary"
>
<org.eehouse.android.xw4sms.DictListPreference
android:key="@string/key_default_dict"
android:title="@string/default_dict"
android:defaultValue="CollegeEng_2to8"
/>
<org.eehouse.android.xw4sms.DictListPreference
android:key="@string/key_default_robodict"
android:title="@string/default_robodict"
android:defaultValue="Top5000"
/>
</PreferenceScreen>
<CheckBoxPreference android:key="@string/key_init_hintsallowed"
android:title="@string/hints_allowed"
android:summary="@string/hints_allowed_sum"
android:defaultValue="true"
/>
<CheckBoxPreference android:key="@string/key_init_nethintsallowed"
android:title="@string/nethints_allowed"
android:summary="@string/nethints_allowed_sum"
android:defaultValue="true"
/>
<CheckBoxPreference android:key="@string/key_init_autojuggle"
android:title="@string/init_autojuggle"
android:summary="@string/init_autojuggle_sum"
android:defaultValue="false"
/>
<org.eehouse.android.xw4sms.XWListPreference
android:key="@string/key_default_phonies"
android:title="@string/default_phonies"
android:entries="@array/phony_names"
android:entryValues="@array/phony_names"
android:defaultValue="@string/phonies_warn"
/>
<CheckBoxPreference android:key="@string/key_default_timerenabled"
android:title="@string/use_timer"
android:defaultValue="false"
/>
<org.eehouse.android.xw4sms.XWEditTextPreference
android:key="@string/key_initial_player_minutes"
android:title="@string/initial_player_minutes"
android:defaultValue="25"
android:numeric="decimal"
/>
<org.eehouse.android.xw4sms.XWListPreference
android:key="@string/key_board_size"
android:title="@string/board_size"
android:entries="@array/board_sizes"
android:entryValues="@array/board_sizes"
android:defaultValue="15x15"
/>
</PreferenceScreen>
<PreferenceScreen android:title="@string/prefs_appearance"
android:summary="@string/prefs_appearance_summary"
>
<org.eehouse.android.xw4sms.XWListPreference
android:key="@string/key_summary_field"
android:title="@string/summary_field"
android:entries="@array/game_summary_values"
android:entryValues="@array/game_summary_values"
android:defaultValue="@string/game_summary_field_opponents"
/>
<CheckBoxPreference android:key="@string/key_hide_intro"
android:title="@string/hide_intro"
android:summary="@string/hide_intro_summary"
android:defaultValue="false"
/>
<CheckBoxPreference android:key="@string/key_hide_title"
android:title="@string/hide_title"
android:summary="@string/hide_title_summary"
android:defaultValue="true"
/>
<CheckBoxPreference android:key="@string/key_show_arrow"
android:title="@string/show_arrow"
android:summary="@string/show_arrow_summary"
android:defaultValue="true"
/>
<CheckBoxPreference android:key="@string/key_keep_screenon"
android:title="@string/keep_screenon"
android:summary="@string/keep_screenon_summary"
android:defaultValue="false"
/>
<PreferenceScreen android:title="@string/prefs_colors"
android:summary="@string/prefs_colors_summary"
>
<org.eehouse.android.xw4sms.EditColorPreference
android:key="@string/key_player0"
android:title="@string/player0"
android:defaultValue="0x000000"
/>
<org.eehouse.android.xw4sms.EditColorPreference
android:key="@string/key_player1"
android:title="@string/player1"
android:defaultValue="0xFF0000"
/>
<org.eehouse.android.xw4sms.EditColorPreference
android:key="@string/key_player2"
android:title="@string/player2"
android:defaultValue="0x0000FF"
/>
<org.eehouse.android.xw4sms.EditColorPreference
android:key="@string/key_player3"
android:title="@string/player3"
android:defaultValue="0x008F00"
/>
<org.eehouse.android.xw4sms.EditColorPreference
android:key="@string/key_bonus_l2x"
android:title="@string/bonus_l2x"
android:defaultValue="0xAFAF00"
/>
<org.eehouse.android.xw4sms.EditColorPreference
android:key="@string/key_bonus_l3x"
android:title="@string/bonus_l3x"
android:defaultValue="0x00AFAF"
/>
<org.eehouse.android.xw4sms.EditColorPreference
android:key="@string/key_bonus_w2x"
android:title="@string/bonus_w2x"
android:defaultValue="0xAF00AF"
/>
<org.eehouse.android.xw4sms.EditColorPreference
android:key="@string/key_bonus_w3x"
android:title="@string/bonus_w3x"
android:defaultValue="0xAFAFAF"
/>
<org.eehouse.android.xw4sms.EditColorPreference
android:key="@string/key_clr_crosshairs"
android:title="@string/clr_crosshairs"
android:defaultValue="0x7070FF"
/>
<org.eehouse.android.xw4sms.EditColorPreference
android:key="@string/key_clr_bonushint"
android:title="@string/key_bonushint"
android:defaultValue="0x7F7F7F"
/>
<org.eehouse.android.xw4sms.EditColorPreference
android:key="@string/key_tile_back"
android:title="@string/tile_back"
android:defaultValue="0xFFFF99"
/>
<org.eehouse.android.xw4sms.EditColorPreference
android:key="@string/key_empty"
android:title="@string/empty"
android:defaultValue="0xFFFFFF"
/>
<org.eehouse.android.xw4sms.EditColorPreference
android:key="@string/key_background"
android:title="@string/background"
android:defaultValue="0xFFFFFF"
/>
</PreferenceScreen>
</PreferenceScreen>
<PreferenceScreen android:title="@string/prefs_behavior"
android:summary="@string/prefs_behavior_summary"
>
<CheckBoxPreference android:key="@string/key_explain_robot"
android:title="@string/explain_robot"
android:summary="@string/explain_robot_summary"
android:defaultValue="true"
/>
<CheckBoxPreference android:key="@string/key_skip_confirm"
android:title="@string/skip_confirm_turn"
android:summary="@string/skip_confirm_turn_summary"
android:defaultValue="false"
/>
<CheckBoxPreference android:key="@string/key_sort_tiles"
android:title="@string/title_sort_tiles"
android:summary="@string/summary_sort_tiles"
android:defaultValue="true"
/>
<CheckBoxPreference android:key="@string/key_ringer_zoom"
android:title="@string/ringer_zoom"
android:summary="@string/ringer_zoom_summary"
android:defaultValue="false"
/>
<CheckBoxPreference android:key="@string/key_hide_crosshairs"
android:title="@string/hide_crosshairs"
android:summary="@string/hide_crosshairs_summary"
android:defaultValue="false"
/>
<CheckBoxPreference android:key="@string/key_peek_other"
android:title="@string/peek_other"
android:summary="@string/peek_other_summary"
android:defaultValue="false"
/>
</PreferenceScreen>
<PreferenceScreen android:title="@string/network_behavior"
android:summary="@string/network_behavior_summary"
android:key="pref_key"
>
<org.eehouse.android.xw4sms.SMSCheckBoxPreference
android:key="@string/key_enable_sms"
android:title="@string/enable_sms"
android:summary="@string/enable_sms_summary"
android:defaultValue="false"
/>
<org.eehouse.android.xw4sms.PollListPreference
android:key="@string/key_connect_frequency"
android:title="@string/connect_frequency"
android:entries="@array/connect_frequencies"
android:entryValues="@array/connect_frequencies_values"
android:defaultValue="900"
/>
<CheckBoxPreference android:key="@string/key_notify_sound"
android:title="@string/notify_sound"
android:summary="@string/notify_other_summary"
android:defaultValue="true"
/>
<CheckBoxPreference android:key="@string/key_notify_vibrate"
android:title="@string/notify_vibrate"
android:summary="@string/notify_other_summary"
android:defaultValue="false"
/>
</PreferenceScreen>
<PreferenceScreen android:title="@string/advanced"
android:summary="@string/advanced_summary"
>
<EditTextPreference android:title="@string/git_rev_title"
android:summary="@string/git_rev"
android:enabled="false"
/>
<CheckBoxPreference android:key="@string/key_logging_on"
android:title="@string/logging_on"
android:defaultValue="false"
/>
<CheckBoxPreference android:key="@string/key_enable_debug"
android:title="Enable debug features"
android:summary="Menuitems etc."
android:defaultValue="false"
/>
<CheckBoxPreference android:key="@string/key_show_sms"
android:title="Show SMS sends, receives"
android:defaultValue="false"
/>
<org.eehouse.android.xw4sms.XWEditTextPreference
android:key="@string/key_relay_host"
android:title="@string/relay_host"
android:defaultValue="@string/default_host"
/>
<org.eehouse.android.xw4sms.XWEditTextPreference
android:key="@string/key_relay_port"
android:title="@string/relay_port"
android:defaultValue="10997"
android:numeric="decimal"
/>
<org.eehouse.android.xw4sms.XWEditTextPreference
android:key="@string/key_proxy_port"
android:title="@string/proxy_port"
android:defaultValue="10998"
android:numeric="decimal"
/>
<org.eehouse.android.xw4sms.XWEditTextPreference
android:key="@string/key_redir_host"
android:title="@string/redir_host"
android:defaultValue="@string/default_host"
/>
<org.eehouse.android.xw4sms.XWEditTextPreference
android:key="@string/key_dict_host"
android:title="@string/dict_host"
android:defaultValue="@string/dict_url"
/>
<org.eehouse.android.xw4sms.XWEditTextPreference
android:key="@string/key_update_url"
android:title="@string/expl_update_url"
android:defaultValue="@string/default_update_url"
/>
<CheckBoxPreference android:key="@string/key_update_prerel"
android:title="Update between releases"
android:summary="Get intermediate builds"
android:defaultValue="false"
/>
</PreferenceScreen>
</PreferenceScreen>

64
xwords4/android/XWords4-sms/src/org/eehouse/android/xw4sms/.gitignore vendored
View file

@ -1,64 +0,0 @@
BoardActivity.java
BoardDims.java
BoardView.java
BTInviteActivity.java
BTReceiver.java
BTService.java
ChatActivity.java
CommsTransport.java
DbgUtils.java
DBHelper.java
DBUtils.java
DictBrowseActivity.java
DictImportActivity.java
DictLangCache.java
DictListPreference.java
DictsActivity.java
DictUtils.java
DispatchNotify.java
DlgDelegate.java
EditColorPreference.java
FirstRunDialog.java
GameConfig.java
GameListAdapter.java
GameNamer.java
GamesList.java
GameUtils.java
GitVersion.java
InviteActivity.java
LookupActivity.java
MountEventReceiver.java
MultiMsgSink.java
NetLaunchInfo.java
NetStateCache.java
NetUtils.java
NewGameActivity.java
PollListPreference.java
PrefsActivity.java
RefreshNamesTask.java
RelayGameActivity.java
RelayMsgSink.java
RelayReceiver.java
RelayService.java
SMSInviteActivity.java
SMSListItem.java
SMSReceiver.java
SMSService.java
StatusReceiver.java
Toolbar.java
Utils.java
XWActivity.java
XWConstants.java
XWEditTextPreference.java
XWListActivity.java
XWListAdapter.java
XWListItem.java
XWListPreference.java
MultiService.java
ConnStatusHandler.java
SMSCheckBoxPreference.java
XWPrefs.java
UpdateCheckReceiver.java
ExpiringDelegate.java
ExpiringLinearLayout.java
ExpiringTextView.java

79
xwords4/android/XWords4-sms/src/org/eehouse/android/xw4sms/XWApp.java
View file

@ -1,79 +0,0 @@
/* -*- compile-command: "cd ../../../../../; ant debug install"; -*- */
/*
* Copyright 2010 - 2011 by Eric House (xwords@eehouse.org). All
* rights reserved.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
* published by the Free Software Foundation; either version 2 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
package org.eehouse.android.xw4sms;
import android.app.Application;
import android.content.Context;
import android.os.Build;
import java.util.UUID;
import org.eehouse.android.xw4sms.jni.XwJNI;
public class XWApp extends Application {
public static final boolean DEBUG_LOCKS = false;
public static final boolean BTSUPPORTED = false;
public static final boolean SMSSUPPORTED = true;
public static final String SMS_PUBLIC_HEADER = "-XW4s";
private static UUID s_UUID = null;
private static Boolean s_onEmulator = null;
@Override
public void onCreate()
{
super.onCreate();
// This one line should always get logged even if logging is
// off -- because logging is on by default until logEnable is
// called.
DbgUtils.logf( "XWApp.onCreate(); git_rev=%s",
getString( R.string.git_rev ) );
DbgUtils.logEnable( this );
ConnStatusHandler.loadState( this );
RelayReceiver.RestartTimer( this );
UpdateCheckReceiver.restartTimer( this );
BTService.startService( this );
SMSService.checkForInvites( this );
}
public static UUID getAppUUID()
{
if ( null == s_UUID ) {
s_UUID = UUID.fromString( XwJNI.comms_getUUID() );
}
return s_UUID;
}
public static String getAppName( Context context )
{
return context.getString( R.string.app_name );
}
public static boolean onEmulator()
{
if ( null == s_onEmulator ) {
s_onEmulator = new Boolean( "google_sdk".equals(Build.MODEL) );
}
return s_onEmulator;
}
}

17
xwords4/android/XWords4-sms/src/org/eehouse/android/xw4sms/jni/.gitignore vendored
View file

@ -1,17 +0,0 @@
BoardHandler.java
CommonPrefs.java
CommsAddrRec.java
CurGameInfo.java
DictInfo.java
DrawCtx.java
DrawScoreInfo.java
GameSummary.java
JNIThread.java
JNIUtilsImpl.java
JNIUtils.java
LocalPlayer.java
SyncedDraw.java
TransportProcs.java
UtilCtxtImpl.java
UtilCtxt.java
XwJNI.java

15
xwords4/android/XWords4/.gitignore vendored
View file

@ -1,8 +1,19 @@
*.apk *.apk
.DS_Store
.gradle
/.idea/libraries
/.idea/workspace.xml
/build
/captures
/libs-debug
/libs-release
/local.properties
/obj-debug
/obj-release
ant_out.txt ant_out.txt
local.properties
bin bin
gen gen
proguard.cfg
obj obj
proguard.cfg
res/drawable*/*gen.png res/drawable*/*gen.png
.idea/

44
xwords4/android/XWords4/AndroidManifest.xml
View file

@ -22,14 +22,14 @@
to come from a domain that you own or have control over. --> to come from a domain that you own or have control over. -->
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="org.eehouse.android.xw4" package="org.eehouse.android.xw4"
android:versionCode="80" android:versionCode="99"
android:versionName="@string/app_version" android:versionName="@string/app_version"
> >
<!-- BE SURE TO MODIFY project.project AND the variable TARGET in <!-- BE SURE TO MODIFY project.project AND the variable TARGET in
../scripts/setup_local_props.sh if targetSdkVersion changes!!! ../scripts/setup_local_props.sh if targetSdkVersion changes!!!
--> -->
<uses-sdk android:minSdkVersion="7" android:targetSdkVersion="14" /> <uses-sdk android:minSdkVersion="7" android:targetSdkVersion="19" />
<supports-screens android:resizeable="true" <supports-screens android:resizeable="true"
android:smallScreens="true" android:smallScreens="true"
@ -45,8 +45,10 @@
<uses-permission android:name="android.permission.VIBRATE" /> <uses-permission android:name="android.permission.VIBRATE" />
<uses-permission android:name="android.permission.RECEIVE_SMS" /> <uses-permission android:name="android.permission.RECEIVE_SMS" />
<uses-permission android:name="android.permission.SEND_SMS" /> <uses-permission android:name="android.permission.SEND_SMS" />
<uses-permission android:name="android.permission.READ_SMS" /> <uses-permission android:name="android.permission.BLUETOOTH" />
<uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
<uses-permission android:name="android.permission.READ_CONTACTS" /> <uses-permission android:name="android.permission.READ_CONTACTS" />
<uses-permission android:name="android.permission.READ_PHONE_STATE"/>
<uses-feature android:name="android.hardware.telephony" <uses-feature android:name="android.hardware.telephony"
android:required = "false" android:required = "false"
@ -96,19 +98,24 @@
android:configChanges="keyboardHidden|orientation|screenSize" android:configChanges="keyboardHidden|orientation|screenSize"
/> />
<activity android:name="NewGameActivity" <activity android:name="BTInviteActivity"
android:theme="@android:style/Theme.NoTitleBar" android:label="@string/bt_invite_title"
android:configChanges="keyboardHidden|orientation|screenSize" android:configChanges="keyboardHidden|orientation|screenSize"
/> />
<activity android:name="SMSInviteActivity" <activity android:name="SMSInviteActivity"
android:theme="@android:style/Theme.Dialog" android:label="@string/sms_invite_title"
android:configChanges="keyboardHidden|orientation|screenSize" android:configChanges="keyboardHidden|orientation|screenSize"
android:screenOrientation="sensor" android:screenOrientation="sensor"
/> />
<activity android:name="RelayInviteActivity"
android:label="@string/relay_invite_title"
android:configChanges="keyboardHidden|orientation|screenSize"
/>
<activity android:name="GameConfigActivity" <activity android:name="GameConfigActivity"
android:screenOrientation="sensor" android:screenOrientation="sensor"
android:configChanges="keyboardHidden|orientation|screenSize" android:configChanges="keyboardHidden|orientation|screenSize"
android:windowSoftInputMode="stateAlwaysHidden"
> >
<intent-filter> <intent-filter>
<action android:name="android.intent.action.EDIT" /> <action android:name="android.intent.action.EDIT" />
@ -123,18 +130,21 @@
<activity android:name="BoardActivity" <activity android:name="BoardActivity"
android:screenOrientation="portrait" android:screenOrientation="portrait"
android:configChanges="keyboardHidden" android:configChanges="keyboardHidden|orientation|screenSize"
android:windowSoftInputMode="stateAlwaysHidden|adjustPan"
/> />
<activity android:name="StudyListActivity" <activity android:name="StudyListActivity"
android:configChanges="keyboardHidden|orientation|screenSize" android:configChanges="keyboardHidden|orientation|screenSize"
/> />
<receiver android:name="RelayReceiver"> <receiver android:name="OnBootReceiver">
<intent-filter> <intent-filter>
<action android:name="android.intent.action.BOOT_COMPLETED"/> <action android:name="android.intent.action.BOOT_COMPLETED"/>
</intent-filter> </intent-filter>
</receiver> </receiver>
<receiver android:name="RelayReceiver"/>
<receiver android:name="NagTurnReceiver"/>
<receiver android:name="UpdateCheckReceiver"> <receiver android:name="UpdateCheckReceiver">
<intent-filter> <intent-filter>
@ -188,9 +198,6 @@
</intent-filter> </intent-filter>
</activity> </activity>
<activity android:name="RelayGameActivity"
android:configChanges="keyboardHidden|orientation|screenSize"
/>
<activity android:name="DictBrowseActivity" <activity android:name="DictBrowseActivity"
android:configChanges="keyboardHidden|orientation|screenSize" android:configChanges="keyboardHidden|orientation|screenSize"
/> />
@ -217,15 +224,22 @@
</intent-filter> </intent-filter>
</receiver> </receiver>
<receiver android:name="SMSReceiver" > <receiver android:name="BTReceiver">
<intent-filter android:priority="999" > <intent-filter>
<action android:name="android.provider.Telephony.SMS_RECEIVED" /> <action android:name="android.bluetooth.device.action.ACL_CONNECTED" />
</intent-filter> </intent-filter>
<intent-filter>
<action android:name="android.bluetooth.adapter.action.STATE_CHANGED" />
</intent-filter>
</receiver>
<service android:name="BTService"/>
<receiver android:name="SMSReceiver" >
<intent-filter> <intent-filter>
<action android:name="android.intent.action.DATA_SMS_RECEIVED" /> <action android:name="android.intent.action.DATA_SMS_RECEIVED" />
<data android:scheme="sms" /> <data android:scheme="sms" />
<data android:port="3344" /> <data android:port="@string/nbs_port" />
<data android:host="*" /> <data android:host="*" />
</intent-filter> </intent-filter>

1
xwords4/android/XWords4/app/.gitignore vendored Normal file
View file

@ -0,0 +1 @@
/build

235
xwords4/android/XWords4/app/build.gradle Normal file
View file

@ -0,0 +1,235 @@
def VARIANT_NAME = 'xw4'
def INITIAL_CLIENT_VERS = 6
def CHAT_ENABLED = true
def THUMBNAIL_ENABLED = true
def LIBS_DEBUG = 'libs-debug'
def LIBS_RELEASE = 'libs-release'
def VERSION_CODE_BASE = 1
def VARIANTS = [ "Xw4", "Xw4dbg" ]
def BUILDS = [ "Debug", "Release" ]
apply plugin: 'com.android.application'
dependencies {
compile files('../libs/gcm.jar')
}
android {
compileSdkVersion 22
buildToolsVersion "22.0.1"
defaultConfig {
minSdkVersion 7
targetSdkVersion 22
}
// Rename all output artifacts to include version information
// applicationVariants.all { variant ->
// renameArtifact(variant)
// variant.buildConfigField "String", "FIELD_NAME", "\"my String\""
// }
flavorDimensions "variant"//, "abi"
productFlavors {
xw4 {
dimension "variant"
applicationId "org.eehouse.android.xw4"
}
xw4dbg {
dimension "variant"
applicationId "org.eehouse.android.xw4dbg"
}
// WARNING: "all" breaks things. Seems to be a keyword. Need
// to figure out how to express include-all-abis
// all {
// dimension "abi"
// versionCode 0 + VERSION_CODE_BASE
// }
// armeabi {
// dimension "abi"
// versionCode 1 + VERSION_CODE_BASE
// }
// x86 {
// dimension "abi"
// versionCode 2 + VERSION_CODE_BASE
// }
// armeabiv7a {
// dimension "abi"
// versionCode 3 + VERSION_CODE_BASE
// }
}
signingConfigs {
release {
storeFile file(System.getenv("HOME") + "/.keystore")
keyAlias "mykey"
// These two lines make gradle believe that the signingConfigs
// section is complete. Without them, tasks like installRelease
// will not be available!
storePassword "notReal"
keyPassword "notReal"
}
}
buildTypes {
release {
signingConfig signingConfigs.release
debuggable false
minifyEnabled true
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
}
debug {
debuggable true
// This doesn't work on marshmallow: duplicate permission error
// applicationIdSuffix ".debug"
}
}
sourceSets {
// Use symlinks instead of setting non-conventional
// directories here. AS doesn't respect what's set here: it'll
// compile, but post-install app launch and source-level
// debugging don't work.
release {
jniLibs.srcDir "../$LIBS_RELEASE"
}
debug {
jniLibs.srcDir "../$LIBS_DEBUG"
}
}
lintOptions {
abortOnError false
}
def gitrev = "git describe --tags".execute().text
applicationVariants.all { variant ->
variant.outputs.each { output ->
output.outputFile =
new File(output.outputFile.parent,
output.outputFile.name.replace(".apk", "-${gitrev}.apk"))
}
}
}
dependencies {
compile fileTree(dir: 'libs', include: ['*.jar'])
}
task genVers(type: Exec) {
workingDir '../'
commandLine '../scripts/genvers.sh', '--variant', VARIANT_NAME,
'--client-vers', INITIAL_CLIENT_VERS, '--chat-enabled', CHAT_ENABLED,
'--thumbnail-enabled', THUMBNAIL_ENABLED,
'--vers-outfile', "assets/gitvers.txt"
}
task mkImages(type: Exec) {
workingDir '../'
commandLine '../scripts/mkimages.sh'
}
task copyStrings(type: Exec) {
workingDir '../'
commandLine '../scripts/copy-strings.py'
}
task ndkSetup(type: Exec) {
workingDir '../'
commandLine "../scripts/ndksetup.sh"
}
task genGcmid(type: Exec) {
workingDir '../'
commandLine '../scripts/gen_gcmid.sh',
'-o', "src/org/eehouse/android/$VARIANT_NAME/GCMConsts.java",
'-v', "$VARIANT_NAME"
}
task myPreBuild(dependsOn: ['genVers', 'ndkSetup', 'mkImages', 'copyStrings', 'mkXml', 'genGcmid']) {
}
preBuild.dependsOn myPreBuild
task ndkBuildDebug(type: Exec) {
workingDir '../'
commandLine '../scripts/ndkbuild.sh', '-j3', "CHAT_ENABLED=$CHAT_ENABLED",
"THUMBNAIL_ENABLED=$THUMBNAIL_ENABLED", 'BUILD_TARGET=debug',
"INITIAL_CLIENT_VERS=$INITIAL_CLIENT_VERS", "VARIANT=$VARIANT_NAME",
"NDK_LIBS_OUT=$LIBS_DEBUG", 'NDK_OUT=./obj-debug'
}
task ndkBuildRelease(type: Exec) {
workingDir '../'
commandLine '../scripts/ndkbuild.sh', '-j3', "CHAT_ENABLED=$CHAT_ENABLED",
"THUMBNAIL_ENABLED=$THUMBNAIL_ENABLED", 'BUILD_TARGET=release',
"INITIAL_CLIENT_VERS=$INITIAL_CLIENT_VERS", "VARIANT=$VARIANT_NAME",
"NDK_LIBS_OUT=$LIBS_RELEASE", 'NDK_OUT=./obj-release'
}
task mkXml(type: Exec) {
workingDir '../'
commandLine '../scripts/mk_xml.py', '-o',
"src/org/eehouse/android/$VARIANT_NAME/loc/LocIDsData.java",
'-t', "debug", '-v', "$VARIANT_NAME"
}
afterEvaluate {
VARIANTS.each { VARIANT ->
String compileTask = "compile${VARIANT}ReleaseNdk"
tasks.getByName(compileTask).dependsOn ndkBuildRelease
compileTask = "compile${VARIANT}DebugNdk"
tasks.getByName(compileTask).dependsOn ndkBuildDebug
}
}
task askForPassword << {
def password = System.getenv("ANDROID_KEY_PASS")
if (null == password || 0 == password.length()) {
if ( null != System.console() ) {
password = new String(System.console()
.readPassword("ANDROID_KEY_PASS not set; "
+ "Keystore password: "))
} else {
password = null
println( "ANDROID_KEY_PASS not set and no console; " )
println( "sign it yerself later. (Or you might try" )
println( " running gradlew with the --no-daemon flag)" )
}
}
if ( null != password ) {
android.signingConfigs.release.storePassword = password
android.signingConfigs.release.keyPassword = password
}
}
tasks.whenTaskAdded { theTask ->
if (theTask.name.equals("packageRelease")) {
theTask.dependsOn "askForPassword"
}
}
// def getVersionName() {
// try {
// def stdout = new ByteArrayOutputStream()
// exec {
// commandLine 'git', 'describe', '--dirty'
// standardOutput = stdout
// }
// return stdout.toString().trim()
// }
// catch (ignored) {
// return null;
// }
// }
// def renameArtifact(variant) {
// variant.outputs.each { output ->
// def name = String.format( "XWords4-%s-%s.apk", variant.name,
// getVersionName() )
// output.outputFile = new File( (String)output.outputFile.parent,
// (String)name )
// }
// }

34
xwords4/android/XWords4/app/proguard-rules.pro vendored Normal file
View file

@ -0,0 +1,34 @@
# Add project specific ProGuard rules here.
# By default, the flags in this file are appended to flags specified
# in /home/eehouse/android/android-sdk-linux/tools/proguard/proguard-android.txt
# You can edit the include path and order by changing the proguardFiles
# directive in build.gradle.
#
# For more details, see
# http://developer.android.com/guide/developing/tools/proguard.html
# Add any project specific keep options here:
# If your project uses WebView with JS, uncomment the following
# and specify the fully qualified class name to the JavaScript interface
# class:
#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
# public *;
#}
# Keep everything. Useful maybe for confirming that proguard's causing
# a problem?
# -keep class ** { *; }
# Don't turn this on until it's clear that proguard isn't messing
# anything else up. It'll make crash reports useless.
-dontobfuscate
# Uncomment this if obfuscation is enabled (by removing the line
# above), and save the mapping.txt file or confirm it can be rebuilt
# from a tag.
# -keepattributes SourceFile,LineNumberTable
# Prevents crash when jni code calls setInt on various jin.* classes
-keep public class org.eehouse.android.xw4.jni.** { public *; }

1
xwords4/android/XWords4/app/src/main/AndroidManifest.xml Symbolic link
View file

@ -0,0 +1 @@
../../../AndroidManifest.xml

1
xwords4/android/XWords4/app/src/main/assets Symbolic link
View file

@ -0,0 +1 @@
../../../assets/

1
xwords4/android/XWords4/app/src/main/java Symbolic link
View file

@ -0,0 +1 @@
../../../src/

1
xwords4/android/XWords4/app/src/main/res Symbolic link
View file

@ -0,0 +1 @@
../../../res

1
xwords4/android/XWords4/assets/.gitignore vendored Normal file
View file

@ -0,0 +1 @@
/gitvers.txt

54
xwords4/android/XWords4/assets/changes.html Normal file
View file

@ -0,0 +1,54 @@
<html>
<head>
<script>
showSurvey = function() {
var div = document.getElementById('survey');
div.style.display = 'inline';
};
</script>
<style type="text/css">
body {font-size: smaller;}
#survey { display: none; }
h2,h3 { text-align: center; }
</style>
</head>
<body>
<h2>Crosswords 4.4.105 release</h2>
<p>This release fixes a problem with rematches not preserving game
settings like "Allow hints."</p>
<div id="survey">
<p>Please <a href="https://www.surveymonkey.com/s/GX3XLHR">take
this survey</a> to help determine what gets done next in
Crosswords.</p>
</div>
<h3>New with this release</h3>
<ul>
<li>When creating a game to rematch, preserve the original's
settings for hints, board size, timer and phonies</li>
<li>Fix tiles left of tray divider sometimes being included in hints</li>
<li>Unless "View tiles out-of-turn" is enabled, show summary of
last move when scoreboard entry is tapped</li>
</ul>
<p>(The full changelog
is <a href="http://xwords.sf.net/and_changes.php">here</a>.)</p>
<h3>Next up</h3>
<ul>
<li>Take advantage of Marshmallow's new permissions model (where
the app only asks for them when it needs them.)
</ul>
<p>Please let me know
(email <a href="mailto:xwords@eehouse.org">xwords@eehouse.org</a>)
what&apos;s broken and what features you&apos;d most like to
see. And if you do get a crash, please let your device report it
to Google so I can see it!</p>
<p>Thanks!<br>--Eric</p>
</body>
</html>

34
xwords4/android/XWords4/build.gradle Normal file
View file

@ -0,0 +1,34 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.
buildscript {
repositories {
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:1.3.0'
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
}
}
allprojects {
repositories {
jcenter()
}
}
task clean(type: Delete) {
delete rootProject.buildDir
}
subprojects {
afterEvaluate {project ->
if (project.hasProperty("android")) {
android {
compileSdkVersion 19
buildToolsVersion '22.0.1'
}
}
}
}

17
xwords4/android/XWords4/build.xml
View file

@ -1,6 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project name="XWords4" default="release"> <project name="XWords4" default="release">
<!-- eeh: allow ant files to refer e.g. to ${env.HOME} -->
<property environment="env" />
<!-- The local.properties file is created and updated by the 'android' tool. <!-- The local.properties file is created and updated by the 'android' tool.
It contains the path to the SDK. It should *NOT* be checked into It contains the path to the SDK. It should *NOT* be checked into
Version Control Systems. --> Version Control Systems. -->
@ -52,22 +55,20 @@
<!-- extension targets. Uncomment the ones where you want to do custom work <!-- extension targets. Uncomment the ones where you want to do custom work
in between standard targets --> in between standard targets -->
<property name="INITIAL_CLIENT_VERS" value="4"/> <property name="INITIAL_CLIENT_VERS" value="8"/>
<property name="VARIANT_NAME" value="xw4"/>
<property name="APP_NAME" value="Crosswords"/>
<target name="-pre-clean"> <target name="-pre-clean">
<antcall target="my-pre-clean" /> <antcall target="my-pre-clean" />
</target> </target>
<target name="-pre-build"> <target name="-pre-build">
<antcall target="my-pre-build"> <antcall target="my-pre-build" />
<param name="VARIANT_NAME" value="xw4"/>
<param name="APP_NAME" value="Crosswords"/>
</antcall>
</target> </target>
<target name="-pre-compile"> <target name="-pre-compile">
<antcall target="my-pre-compile"> <antcall target="my-pre-compile" />
<param name="VARIANT_NAME" value="xw4"/>
</antcall>
</target> </target>
<!-- <!--

18
xwords4/android/XWords4/gradle.properties Normal file
View file

@ -0,0 +1,18 @@
# Project-wide Gradle settings.
# IDE (e.g. Android Studio) users:
# Gradle settings configured through the IDE *will override*
# any settings specified in this file.
# For more details on how to configure your build environment visit
# http://www.gradle.org/docs/current/userguide/build_environment.html
# Specifies the JVM arguments used for the daemon process.
# The setting is particularly useful for tweaking memory settings.
# Default value: -Xmx10248m -XX:MaxPermSize=256m
# org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
# When configured, Gradle will run in incubating parallel mode.
# This option should only be used with decoupled projects. More details, visit
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
# org.gradle.parallel=true

BIN
xwords4/android/XWords4/gradle/wrapper/gradle-wrapper.jar vendored Normal file
View file

Binary file not shown.

6
xwords4/android/XWords4/gradle/wrapper/gradle-wrapper.properties vendored Normal file
View file

@ -0,0 +1,6 @@
#Mon Nov 09 19:22:17 PST 2015
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-2.4-all.zip

164
xwords4/android/XWords4/gradlew vendored Executable file
View file

@ -0,0 +1,164 @@
#!/usr/bin/env bash
##############################################################################
##
## Gradle start up script for UN*X
##
##############################################################################
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
DEFAULT_JVM_OPTS=""
APP_NAME="Gradle"
APP_BASE_NAME=`basename "$0"`
# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD="maximum"
warn ( ) {
echo "$*"
}
die ( ) {
echo
echo "$*"
echo
exit 1
}
# OS specific support (must be 'true' or 'false').
cygwin=false
msys=false
darwin=false
case "`uname`" in
CYGWIN* )
cygwin=true
;;
Darwin* )
darwin=true
;;
MINGW* )
msys=true
;;
esac
# For Cygwin, ensure paths are in UNIX format before anything is touched.
if $cygwin ; then
[ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
fi
# Attempt to set APP_HOME
# Resolve links: $0 may be a link
PRG="$0"
# Need this for relative symlinks.
while [ -h "$PRG" ] ; do
ls=`ls -ld "$PRG"`
link=`expr "$ls" : '.*-> \(.*\)$'`
if expr "$link" : '/.*' > /dev/null; then
PRG="$link"
else
PRG=`dirname "$PRG"`"/$link"
fi
done
SAVED="`pwd`"
cd "`dirname \"$PRG\"`/" >&-
APP_HOME="`pwd -P`"
cd "$SAVED" >&-
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
# Determine the Java command to use to start the JVM.
if [ -n "$JAVA_HOME" ] ; then
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
# IBM's JDK on AIX uses strange locations for the executables
JAVACMD="$JAVA_HOME/jre/sh/java"
else
JAVACMD="$JAVA_HOME/bin/java"
fi
if [ ! -x "$JAVACMD" ] ; then
die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
Please set the JAVA_HOME variable in your environment to match the
location of your Java installation."
fi
else
JAVACMD="java"
which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
Please set the JAVA_HOME variable in your environment to match the
location of your Java installation."
fi
# Increase the maximum file descriptors if we can.
if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
MAX_FD_LIMIT=`ulimit -H -n`
if [ $? -eq 0 ] ; then
if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
MAX_FD="$MAX_FD_LIMIT"
fi
ulimit -n $MAX_FD
if [ $? -ne 0 ] ; then
warn "Could not set maximum file descriptor limit: $MAX_FD"
fi
else
warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
fi
fi
# For Darwin, add options to specify how the application appears in the dock
if $darwin; then
GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
fi
# For Cygwin, switch paths to Windows format before running java
if $cygwin ; then
APP_HOME=`cygpath --path --mixed "$APP_HOME"`
CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
# We build the pattern for arguments to be converted via cygpath
ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
SEP=""
for dir in $ROOTDIRSRAW ; do
ROOTDIRS="$ROOTDIRS$SEP$dir"
SEP="|"
done
OURCYGPATTERN="(^($ROOTDIRS))"
# Add a user-defined pattern to the cygpath arguments
if [ "$GRADLE_CYGPATTERN" != "" ] ; then
OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
fi
# Now convert the arguments - kludge to limit ourselves to /bin/sh
i=0
for arg in "$@" ; do
CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option
if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition
eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
else
eval `echo args$i`="\"$arg\""
fi
i=$((i+1))
done
case $i in
(0) set -- ;;
(1) set -- "$args0" ;;
(2) set -- "$args0" "$args1" ;;
(3) set -- "$args0" "$args1" "$args2" ;;
(4) set -- "$args0" "$args1" "$args2" "$args3" ;;
(5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
(6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
(7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
(8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
(9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
esac
fi
# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
function splitJvmOpts() {
JVM_OPTS=("$@")
}
eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"

90
xwords4/android/XWords4/gradlew.bat vendored Normal file
View file

@ -0,0 +1,90 @@
@if "%DEBUG%" == "" @echo off
@rem ##########################################################################
@rem
@rem Gradle startup script for Windows
@rem
@rem ##########################################################################
@rem Set local scope for the variables with windows NT shell
if "%OS%"=="Windows_NT" setlocal
@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
set DEFAULT_JVM_OPTS=
set DIRNAME=%~dp0
if "%DIRNAME%" == "" set DIRNAME=.
set APP_BASE_NAME=%~n0
set APP_HOME=%DIRNAME%
@rem Find java.exe
if defined JAVA_HOME goto findJavaFromJavaHome
set JAVA_EXE=java.exe
%JAVA_EXE% -version >NUL 2>&1
if "%ERRORLEVEL%" == "0" goto init
echo.
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
echo.
echo Please set the JAVA_HOME variable in your environment to match the
echo location of your Java installation.
goto fail
:findJavaFromJavaHome
set JAVA_HOME=%JAVA_HOME:"=%
set JAVA_EXE=%JAVA_HOME%/bin/java.exe
if exist "%JAVA_EXE%" goto init
echo.
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
echo.
echo Please set the JAVA_HOME variable in your environment to match the
echo location of your Java installation.
goto fail
:init
@rem Get command-line arguments, handling Windowz variants
if not "%OS%" == "Windows_NT" goto win9xME_args
if "%@eval[2+2]" == "4" goto 4NT_args
:win9xME_args
@rem Slurp the command line arguments.
set CMD_LINE_ARGS=
set _SKIP=2
:win9xME_args_slurp
if "x%~1" == "x" goto execute
set CMD_LINE_ARGS=%*
goto execute
:4NT_args
@rem Get arguments from the 4NT Shell from JP Software
set CMD_LINE_ARGS=%$
:execute
@rem Setup the command line
set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
@rem Execute Gradle
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
:end
@rem End local scope for the variables with windows NT shell
if "%ERRORLEVEL%"=="0" goto mainEnd
:fail
rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
rem the _cmd.exe /c_ return code!
if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
exit /b 1
:mainEnd
if "%OS%"=="Windows_NT" endlocal
:omega

11
xwords4/android/XWords4/img_src/content_new.svg
View file

@ -1,11 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="120"
height="120" xml:space="preserve">
<g
id="g12"
transform="matrix(1.25,0,0,-1.25,0,120)">
<g transform='translate(83.05,50.93)' id='g1336'>
<path style='fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none' d='M 0,0 -32.12,0 -32.12,32.12 -37.98,32.12 -37.98,0 -70.1,0 -70.1,-5.861 -37.98,-5.861 -37.98,-37.98 -32.12,-37.98 -32.12,-5.861 0,-5.861 0,0 z' id='path1338'/>
</g></g>
</svg>
Side by side

Before

Width:  |  Height:  |  Size: 650 B

245
xwords4/android/XWords4/img_src/content_new_net.svg Normal file
View file

@ -0,0 +1,245 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Generator: Adobe Illustrator 16.0.4, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
version="1.1"
id="Capa_1"
x="0px"
y="0px"
width="120"
height="120"
viewBox="0 0 120 120"
xml:space="preserve"
inkscape:version="0.48.4 r9939"
sodipodi:docname="content_new_net.svg"><metadata
id="metadata3234"><rdf:RDF><cc:Work
rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title /></cc:Work></rdf:RDF></metadata><defs
id="defs3232" /><sodipodi:namedview
pagecolor="#36ffff"
bordercolor="#666666"
borderopacity="1"
objecttolerance="10"
gridtolerance="10"
guidetolerance="10"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:window-width="1453"
inkscape:window-height="1057"
id="namedview3230"
showgrid="false"
inkscape:zoom="6.8571429"
inkscape:cx="40.031592"
inkscape:cy="59.0625"
inkscape:window-x="1760"
inkscape:window-y="61"
inkscape:window-maximized="0"
inkscape:current-layer="Capa_1"
showborder="true"
fit-margin-top="0"
fit-margin-left="0"
fit-margin-right="0"
fit-margin-bottom="0" /><path
inkscape:connector-curvature="0"
d="m 57.93546,38.858345 c -0.82566,-0.131364 -0.844479,-2.401482 -0.844479,-2.401482 0,0 2.425901,-2.401555 2.954634,-5.630934 1.422277,0 2.30081,-3.433258 0.878309,-4.641205 0.05943,-1.271574 1.828237,-9.981859 -7.126699,-9.981859 -8.954935,0 -7.186068,8.710285 -7.126847,9.981859 -1.422429,1.207947 -0.544043,4.641205 0.87831,4.641205 0.528658,3.229379 2.954633,5.630934 2.954633,5.630934 0,0 -0.01881,2.270118 -0.844405,2.401482 -2.65935,0.423135 -12.589977,4.803182 -12.589977,9.606218 h 16.728286 16.728289 c 0,-4.803036 -9.930629,-9.183083 -12.590054,-9.606218 z"
id="path4374" /><path
d="M 71.001029,-2.3030774e-7 H 36.876959 C 34.034015,-2.3030774e-7 31.707174,2.0569816 31.707174,4.5745098 V 63.151073 c 0,2.517528 2.326841,4.576445 5.169785,4.576445 h 34.12407 c 2.842943,0 5.169784,-2.056981 5.169784,-4.574509 V 4.5745098 C 76.170813,2.0569816 73.843972,-2.3030774e-7 71.001029,-2.3030774e-7 z M 48.480542,3.2973626 h 10.916904 c 0.345526,0 0.625446,0.2476895 0.625446,0.5553655 0,0.3057413 -0.27992,0.5534309 -0.625446,0.5534309 H 48.480542 c -0.345528,0 -0.625448,-0.2476896 -0.625448,-0.5534309 0,-0.307676 0.27992,-0.5553655 0.625448,-0.5553655 z m 5.45845,62.1429004 c -1.428032,0 -2.58489,-1.023657 -2.58489,-2.287254 0,-1.263603 1.156858,-2.287254 2.58489,-2.287254 1.428033,0 2.584894,1.023651 2.584894,2.287254 0,1.263597 -1.156861,2.287254 -2.584894,2.287254 z M 72.573396,59.261577 H 35.304591 V 7.254585 h 37.268805 v 52.006992 z"
id="path3198"
inkscape:connector-curvature="0" /><g
id="g3200"
transform="matrix(1.8893863,0,0,1.6718332,1.854167,-1.1800553e-7)" /><g
id="g3202"
transform="matrix(1.8893863,0,0,1.6718332,1.854167,-1.1800553e-7)" /><g
id="g3204"
transform="matrix(1.8893863,0,0,1.6718332,1.854167,-1.1800553e-7)" /><g
id="g3206"
transform="matrix(1.8893863,0,0,1.6718332,1.854167,-1.1800553e-7)" /><g
id="g3208"
transform="matrix(1.8893863,0,0,1.6718332,1.854167,-1.1800553e-7)" /><g
id="g3210"
transform="matrix(1.8893863,0,0,1.6718332,1.854167,-1.1800553e-7)" /><g
id="g3212"
transform="matrix(1.8893863,0,0,1.6718332,1.854167,-1.1800553e-7)" /><g
id="g3214"
transform="matrix(1.8893863,0,0,1.6718332,1.854167,-1.1800553e-7)" /><g
id="g3216"
transform="matrix(1.8893863,0,0,1.6718332,1.854167,-1.1800553e-7)" /><g
id="g3218"
transform="matrix(1.8893863,0,0,1.6718332,1.854167,-1.1800553e-7)" /><g
id="g3220"
transform="matrix(1.8893863,0,0,1.6718332,1.854167,-1.1800553e-7)" /><g
id="g3222"
transform="matrix(1.8893863,0,0,1.6718332,1.854167,-1.1800553e-7)" /><g
id="g3224"
transform="matrix(1.8893863,0,0,1.6718332,1.854167,-1.1800553e-7)" /><g
id="g3226"
transform="matrix(1.8893863,0,0,1.6718332,1.854167,-1.1800553e-7)" /><g
id="g3228"
transform="matrix(1.8893863,0,0,1.6718332,1.854167,-1.1800553e-7)" /><g
transform="matrix(2.4897914,0,0,2.203105,6.6125603,12.820461)"
id="g3316" /><g
transform="matrix(2.4897914,0,0,2.203105,6.6125603,12.820461)"
id="g3318" /><g
transform="matrix(2.4897914,0,0,2.203105,6.6125603,12.820461)"
id="g3320" /><g
transform="matrix(2.4897914,0,0,2.203105,6.6125603,12.820461)"
id="g3322" /><g
transform="matrix(2.4897914,0,0,2.203105,6.6125603,12.820461)"
id="g3324" /><g
transform="matrix(2.4897914,0,0,2.203105,6.6125603,12.820461)"
id="g3326" /><g
transform="matrix(2.4897914,0,0,2.203105,6.6125603,12.820461)"
id="g3328" /><g
transform="matrix(2.4897914,0,0,2.203105,6.6125603,12.820461)"
id="g3330" /><g
transform="matrix(2.4897914,0,0,2.203105,6.6125603,12.820461)"
id="g3332" /><g
transform="matrix(2.4897914,0,0,2.203105,6.6125603,12.820461)"
id="g3334" /><g
transform="matrix(2.4897914,0,0,2.203105,6.6125603,12.820461)"
id="g3336" /><g
transform="matrix(2.4897914,0,0,2.203105,6.6125603,12.820461)"
id="g3338" /><g
transform="matrix(2.4897914,0,0,2.203105,6.6125603,12.820461)"
id="g3340" /><g
transform="matrix(2.4897914,0,0,2.203105,6.6125603,12.820461)"
id="g3342" /><g
transform="matrix(2.4897914,0,0,2.203105,6.6125603,12.820461)"
id="g3344" /><g
transform="matrix(2.4897914,0,0,2.203105,21.163624,15.187248)"
id="g3316-8" /><g
transform="matrix(2.4897914,0,0,2.203105,21.163624,15.187248)"
id="g3318-8" /><g
transform="matrix(2.4897914,0,0,2.203105,21.163624,15.187248)"
id="g3320-6" /><g
transform="matrix(2.4897914,0,0,2.203105,21.163624,15.187248)"
id="g3322-3" /><g
transform="matrix(2.4897914,0,0,2.203105,21.163624,15.187248)"
id="g3324-3" /><g
transform="matrix(2.4897914,0,0,2.203105,21.163624,15.187248)"
id="g3326-2" /><g
transform="matrix(2.4897914,0,0,2.203105,21.163624,15.187248)"
id="g3328-4" /><g
transform="matrix(2.4897914,0,0,2.203105,21.163624,15.187248)"
id="g3330-8" /><g
transform="matrix(2.4897914,0,0,2.203105,21.163624,15.187248)"
id="g3332-7" /><g
transform="matrix(2.4897914,0,0,2.203105,21.163624,15.187248)"
id="g3334-4" /><g
transform="matrix(2.4897914,0,0,2.203105,21.163624,15.187248)"
id="g3336-6" /><g
transform="matrix(2.4897914,0,0,2.203105,21.163624,15.187248)"
id="g3338-3" /><g
transform="matrix(2.4897914,0,0,2.203105,21.163624,15.187248)"
id="g3340-3" /><g
transform="matrix(2.4897914,0,0,2.203105,21.163624,15.187248)"
id="g3342-8" /><g
transform="matrix(2.4897914,0,0,2.203105,21.163624,15.187248)"
id="g3344-0" /><path
inkscape:connector-curvature="0"
d="m 25.946489,61.538692 c -0.825668,-0.131364 -0.844497,-2.401483 -0.844497,-2.401483 0,0 2.425912,-2.401555 2.954641,-5.630935 1.422276,0 2.30081,-3.433256 0.878306,-4.641205 0.05936,-1.271574 1.828239,-9.981857 -7.126684,-9.981857 -8.954943,0 -7.186077,8.710283 -7.126855,9.981857 -1.42243,1.207949 -0.544044,4.641205 0.878308,4.641205 0.528659,3.22938 2.954634,5.630935 2.954634,5.630935 0,0 -0.01881,2.270119 -0.844406,2.401483 -2.659348,0.423131 -12.5899764,4.803183 -12.5899764,9.606215 H 21.808255 38.53653 c 0,-4.803032 -9.930632,-9.183084 -12.590041,-9.606215 z"
id="path4374-2" /><path
d="M 39.012046,22.680345 H 4.887978 c -2.8429423,0 -5.169782,2.056983 -5.169782,4.574511 V 85.83142 c 0,2.517526 2.3268397,4.576442 5.169782,4.576442 h 34.124068 c 2.842942,0 5.169787,-2.056979 5.169787,-4.574504 V 27.254856 c 0,-2.517528 -2.326845,-4.574511 -5.169787,-4.574511 z m -22.520483,3.297364 h 10.916902 c 0.345522,0 0.625448,0.247689 0.625448,0.555365 0,0.305741 -0.279926,0.553431 -0.625448,0.553431 H 16.491563 c -0.345527,0 -0.625448,-0.24769 -0.625448,-0.553431 0,-0.307676 0.279921,-0.555365 0.625448,-0.555365 z m 5.458448,62.1429 c -1.42803,0 -2.584889,-1.023656 -2.584889,-2.287251 0,-1.263604 1.156859,-2.28726 2.584889,-2.28726 1.428038,0 2.5849,1.023656 2.5849,2.28726 0,1.263595 -1.156862,2.287251 -2.5849,2.287251 z M 40.584416,81.941927 H 3.315613 V 29.93493 h 37.268803 v 52.006997 z"
id="path3198-0"
inkscape:connector-curvature="0" /><g
id="g3200-5"
transform="matrix(1.8893863,0,0,1.6718332,36.20463,15.838175)" /><g
id="g3202-7"
transform="matrix(1.8893863,0,0,1.6718332,36.20463,15.838175)" /><g
id="g3204-5"
transform="matrix(1.8893863,0,0,1.6718332,36.20463,15.838175)" /><g
id="g3206-2"
transform="matrix(1.8893863,0,0,1.6718332,36.20463,15.838175)" /><g
id="g3208-4"
transform="matrix(1.8893863,0,0,1.6718332,36.20463,15.838175)" /><g
id="g3210-6"
transform="matrix(1.8893863,0,0,1.6718332,36.20463,15.838175)" /><g
id="g3212-4"
transform="matrix(1.8893863,0,0,1.6718332,36.20463,15.838175)" /><g
id="g3214-2"
transform="matrix(1.8893863,0,0,1.6718332,36.20463,15.838175)" /><g
id="g3216-7"
transform="matrix(1.8893863,0,0,1.6718332,36.20463,15.838175)" /><g
id="g3218-6"
transform="matrix(1.8893863,0,0,1.6718332,36.20463,15.838175)" /><g
id="g3220-0"
transform="matrix(1.8893863,0,0,1.6718332,36.20463,15.838175)" /><g
id="g3222-7"
transform="matrix(1.8893863,0,0,1.6718332,36.20463,15.838175)" /><g
id="g3224-8"
transform="matrix(1.8893863,0,0,1.6718332,36.20463,15.838175)" /><g
id="g3226-0"
transform="matrix(1.8893863,0,0,1.6718332,36.20463,15.838175)" /><g
id="g3228-4"
transform="matrix(1.8893863,0,0,1.6718332,36.20463,15.838175)" /><g
transform="matrix(2.4897914,0,0,2.203105,40.963023,28.658636)"
id="g3316-7" /><g
transform="matrix(2.4897914,0,0,2.203105,40.963023,28.658636)"
id="g3318-2" /><g
transform="matrix(2.4897914,0,0,2.203105,40.963023,28.658636)"
id="g3320-9" /><g
transform="matrix(2.4897914,0,0,2.203105,40.963023,28.658636)"
id="g3322-0" /><g
transform="matrix(2.4897914,0,0,2.203105,40.963023,28.658636)"
id="g3324-1" /><g
transform="matrix(2.4897914,0,0,2.203105,40.963023,28.658636)"
id="g3326-23" /><g
transform="matrix(2.4897914,0,0,2.203105,40.963023,28.658636)"
id="g3328-9" /><g
transform="matrix(2.4897914,0,0,2.203105,40.963023,28.658636)"
id="g3330-9" /><g
transform="matrix(2.4897914,0,0,2.203105,40.963023,28.658636)"
id="g3332-8" /><g
transform="matrix(2.4897914,0,0,2.203105,40.963023,28.658636)"
id="g3334-3" /><g
transform="matrix(2.4897914,0,0,2.203105,40.963023,28.658636)"
id="g3336-0" /><g
transform="matrix(2.4897914,0,0,2.203105,40.963023,28.658636)"
id="g3338-4" /><g
transform="matrix(2.4897914,0,0,2.203105,40.963023,28.658636)"
id="g3340-7" /><g
transform="matrix(2.4897914,0,0,2.203105,40.963023,28.658636)"
id="g3342-5" /><g
transform="matrix(2.4897914,0,0,2.203105,40.963023,28.658636)"
id="g3344-4" /><g
transform="matrix(2.4897914,0,0,2.203105,55.514087,31.025423)"
id="g3316-8-2" /><g
transform="matrix(2.4897914,0,0,2.203105,55.514087,31.025423)"
id="g3318-8-2" /><g
transform="matrix(2.4897914,0,0,2.203105,55.514087,31.025423)"
id="g3320-6-2" /><g
transform="matrix(2.4897914,0,0,2.203105,55.514087,31.025423)"
id="g3322-3-6" /><g
transform="matrix(2.4897914,0,0,2.203105,55.514087,31.025423)"
id="g3324-3-8" /><g
transform="matrix(2.4897914,0,0,2.203105,55.514087,31.025423)"
id="g3326-2-8" /><g
transform="matrix(2.4897914,0,0,2.203105,55.514087,31.025423)"
id="g3328-4-3" /><g
transform="matrix(2.4897914,0,0,2.203105,55.514087,31.025423)"
id="g3330-8-2" /><g
transform="matrix(2.4897914,0,0,2.203105,55.514087,31.025423)"
id="g3332-7-8" /><g
transform="matrix(2.4897914,0,0,2.203105,55.514087,31.025423)"
id="g3334-4-9" /><g
transform="matrix(2.4897914,0,0,2.203105,55.514087,31.025423)"
id="g3336-6-3" /><g
transform="matrix(2.4897914,0,0,2.203105,55.514087,31.025423)"
id="g3338-3-5" /><g
transform="matrix(2.4897914,0,0,2.203105,55.514087,31.025423)"
id="g3340-3-9" /><g
transform="matrix(2.4897914,0,0,2.203105,55.514087,31.025423)"
id="g3342-8-5" /><g
transform="matrix(2.4897914,0,0,2.203105,55.514087,31.025423)"
id="g3344-0-0" /><path
inkscape:connector-curvature="0"
id="path1390"
d="m 88.625344,78.3375 0,-16.625 -5.2,0 0,16.625 -16.375,0 0,5.2025 16.375,0 0,16.6225 5.2,0 0,-16.6225 16.387496,0 0,-5.2025 -16.387496,0 z"
style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" /></svg>
Side by side

After

Width:  |  Height:  |  Size: 13 KiB

Some files were not shown because too many files have changed in this diff Show more