Updated libraries, most notably Jabit to develop-SNAPSHOT
Also, finally added proper icon Known issue: the client seems to sever all connections after some time, I'll need to look into this. This might happen when 8 connections are reached for the first time.
This commit is contained in:
parent
f705e13d0b
commit
709e333e78
@ -1,25 +1,25 @@
|
||||
apply plugin: 'idea'
|
||||
apply plugin: 'com.android.application'
|
||||
|
||||
ext {
|
||||
appName = "Abit"
|
||||
}
|
||||
if (project.hasProperty("project.configs")
|
||||
&& new File(project.property("project.configs") + appName + ".gradle").exists()) {
|
||||
apply from: project.property("project.configs") + appName + ".gradle";
|
||||
}
|
||||
|
||||
android {
|
||||
compileSdkVersion 23
|
||||
buildToolsVersion "23.0.3"
|
||||
compileSdkVersion 24
|
||||
buildToolsVersion "24.0.1"
|
||||
|
||||
defaultConfig {
|
||||
applicationId "ch.dissem.apps.abit"
|
||||
applicationId "ch.dissem.apps." + appName.toLowerCase()
|
||||
minSdkVersion 19
|
||||
targetSdkVersion 23
|
||||
targetSdkVersion 24
|
||||
versionCode 7
|
||||
versionName "1.0-beta7"
|
||||
}
|
||||
signingConfigs {
|
||||
release {
|
||||
storeFile file(keyStoreFile)
|
||||
storePassword keyStorePassword
|
||||
keyAlias signingKeyAlias
|
||||
keyPassword signingKeyPassword
|
||||
}
|
||||
}
|
||||
buildTypes {
|
||||
release {
|
||||
minifyEnabled false
|
||||
@ -29,12 +29,12 @@ android {
|
||||
}
|
||||
}
|
||||
|
||||
ext.jabitVersion = '1.1.0-SNAPSHOT'
|
||||
ext.jabitVersion = 'develop-SNAPSHOT'
|
||||
dependencies {
|
||||
compile fileTree(dir: 'libs', include: ['*.jar'])
|
||||
compile 'com.android.support:appcompat-v7:23.3.0'
|
||||
compile 'com.android.support:support-v4:23.3.0'
|
||||
compile 'com.android.support:design:23.3.0'
|
||||
compile 'com.android.support:appcompat-v7:24.1.1'
|
||||
compile 'com.android.support:support-v4:24.1.1'
|
||||
compile 'com.android.support:design:24.1.1'
|
||||
|
||||
compile "ch.dissem.jabit:jabit-core:$jabitVersion"
|
||||
compile "ch.dissem.jabit:jabit-networking:$jabitVersion"
|
||||
|
||||
@ -0,0 +1,2 @@
|
||||
ALTER TABLE POW ADD COLUMN expiration_time BIGINT;
|
||||
ALTER TABLE POW ADD COLUMN message_id BIGINT;
|
||||
@ -0,0 +1,4 @@
|
||||
ALTER TABLE Message ADD COLUMN ack_data BINARY(32);
|
||||
ALTER TABLE Message ADD COLUMN ttl BIGINT NOT NULL DEFAULT 0;
|
||||
ALTER TABLE Message ADD COLUMN retries INT NOT NULL DEFAULT 0;
|
||||
ALTER TABLE Message ADD COLUMN next_try BIGINT;
|
||||
BIN
app/src/main/ic_launcher-web.png
Normal file
BIN
app/src/main/ic_launcher-web.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 25 KiB |
@ -36,7 +36,7 @@ import ch.dissem.bitmessage.extensions.pow.ProofOfWorkRequest;
|
||||
import ch.dissem.bitmessage.ports.ProofOfWorkEngine;
|
||||
|
||||
import static ch.dissem.bitmessage.extensions.pow.ProofOfWorkRequest.Request.CALCULATE;
|
||||
import static ch.dissem.bitmessage.utils.Singleton.security;
|
||||
import static ch.dissem.bitmessage.utils.Singleton.cryptography;
|
||||
|
||||
/**
|
||||
* @author Christian Basler
|
||||
@ -78,7 +78,7 @@ public class ServerPowEngine implements ProofOfWorkEngine, InternalContext
|
||||
(request);
|
||||
cryptoMsg.signAndEncrypt(
|
||||
identity,
|
||||
security().createPublicKey(identity.getPublicDecryptionKey())
|
||||
cryptography().createPublicKey(identity.getPublicDecryptionKey())
|
||||
);
|
||||
context.getNetworkHandler().send(
|
||||
Preferences.getTrustedNode(ctx), Preferences.getTrustedNodePort(ctx),
|
||||
|
||||
@ -22,17 +22,6 @@ import android.database.Cursor;
|
||||
import android.database.DatabaseUtils;
|
||||
import android.database.sqlite.SQLiteConstraintException;
|
||||
import android.database.sqlite.SQLiteDatabase;
|
||||
import android.support.v4.database.DatabaseUtilsCompat;
|
||||
|
||||
import ch.dissem.apps.abit.R;
|
||||
import ch.dissem.bitmessage.InternalContext;
|
||||
import ch.dissem.bitmessage.entity.BitmessageAddress;
|
||||
import ch.dissem.bitmessage.entity.Plaintext;
|
||||
import ch.dissem.bitmessage.entity.valueobject.InventoryVector;
|
||||
import ch.dissem.bitmessage.entity.valueobject.Label;
|
||||
import ch.dissem.bitmessage.ports.MessageRepository;
|
||||
import ch.dissem.bitmessage.utils.Encode;
|
||||
import ch.dissem.bitmessage.utils.Strings;
|
||||
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
@ -43,12 +32,19 @@ import java.util.Collection;
|
||||
import java.util.LinkedList;
|
||||
import java.util.List;
|
||||
|
||||
import static ch.dissem.apps.abit.repository.SqlHelper.join;
|
||||
import ch.dissem.apps.abit.R;
|
||||
import ch.dissem.bitmessage.entity.BitmessageAddress;
|
||||
import ch.dissem.bitmessage.entity.Plaintext;
|
||||
import ch.dissem.bitmessage.entity.valueobject.InventoryVector;
|
||||
import ch.dissem.bitmessage.entity.valueobject.Label;
|
||||
import ch.dissem.bitmessage.ports.AbstractMessageRepository;
|
||||
import ch.dissem.bitmessage.ports.MessageRepository;
|
||||
import ch.dissem.bitmessage.utils.Encode;
|
||||
|
||||
/**
|
||||
* {@link MessageRepository} implementation using the Android SQL API.
|
||||
*/
|
||||
public class AndroidMessageRepository implements MessageRepository, InternalContext.ContextHolder {
|
||||
public class AndroidMessageRepository extends AbstractMessageRepository {
|
||||
private static final Logger LOG = LoggerFactory.getLogger(AndroidMessageRepository.class);
|
||||
|
||||
private static final String TABLE_NAME = "Message";
|
||||
@ -58,9 +54,13 @@ public class AndroidMessageRepository implements MessageRepository, InternalCont
|
||||
private static final String COLUMN_SENDER = "sender";
|
||||
private static final String COLUMN_RECIPIENT = "recipient";
|
||||
private static final String COLUMN_DATA = "data";
|
||||
private static final String COLUMN_ACK_DATA = "ack_data";
|
||||
private static final String COLUMN_SENT = "sent";
|
||||
private static final String COLUMN_RECEIVED = "received";
|
||||
private static final String COLUMN_STATUS = "status";
|
||||
private static final String COLUMN_TTL = "ttl";
|
||||
private static final String COLUMN_RETRIES = "retries";
|
||||
private static final String COLUMN_NEXT_TRY = "next_try";
|
||||
private static final String COLUMN_INITIAL_HASH = "initial_hash";
|
||||
|
||||
private static final String JOIN_TABLE_NAME = "Message_Label";
|
||||
@ -74,27 +74,11 @@ public class AndroidMessageRepository implements MessageRepository, InternalCont
|
||||
private static final String LBL_COLUMN_COLOR = "color";
|
||||
private static final String LBL_COLUMN_ORDER = "ord";
|
||||
private final SqlHelper sql;
|
||||
private final Context ctx;
|
||||
private InternalContext bmc;
|
||||
private final Context context;
|
||||
|
||||
public AndroidMessageRepository(SqlHelper sql, Context ctx) {
|
||||
this.sql = sql;
|
||||
this.ctx = ctx;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setContext(InternalContext context) {
|
||||
bmc = context;
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<Label> getLabels() {
|
||||
return findLabels(null);
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<Label> getLabels(Label.Type... types) {
|
||||
return findLabels("type IN (" + join(types) + ")");
|
||||
this.context = ctx;
|
||||
}
|
||||
|
||||
public List<Label> findLabels(String where) {
|
||||
@ -134,22 +118,22 @@ public class AndroidMessageRepository implements MessageRepository, InternalCont
|
||||
} else {
|
||||
switch (type) {
|
||||
case INBOX:
|
||||
text = ctx.getString(R.string.inbox);
|
||||
text = context.getString(R.string.inbox);
|
||||
break;
|
||||
case DRAFT:
|
||||
text = ctx.getString(R.string.draft);
|
||||
text = context.getString(R.string.draft);
|
||||
break;
|
||||
case SENT:
|
||||
text = ctx.getString(R.string.sent);
|
||||
text = context.getString(R.string.sent);
|
||||
break;
|
||||
case UNREAD:
|
||||
text = ctx.getString(R.string.unread);
|
||||
text = context.getString(R.string.unread);
|
||||
break;
|
||||
case TRASH:
|
||||
text = ctx.getString(R.string.trash);
|
||||
text = context.getString(R.string.trash);
|
||||
break;
|
||||
case BROADCAST:
|
||||
text = ctx.getString(R.string.broadcasts);
|
||||
text = context.getString(R.string.broadcasts);
|
||||
break;
|
||||
default:
|
||||
text = c.getString(c.getColumnIndex(LBL_COLUMN_LABEL));
|
||||
@ -179,47 +163,7 @@ public class AndroidMessageRepository implements MessageRepository, InternalCont
|
||||
);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Plaintext getMessage(byte[] initialHash) {
|
||||
List<Plaintext> results = find("initial_hash=X'" + Strings.hex(initialHash) + "'");
|
||||
switch (results.size()) {
|
||||
case 0:
|
||||
return null;
|
||||
case 1:
|
||||
return results.get(0);
|
||||
default:
|
||||
throw new RuntimeException("This shouldn't happen, found " + results.size() +
|
||||
" messages, one or none was expected");
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<Plaintext> findMessages(Label label) {
|
||||
if (label != null) {
|
||||
return find("id IN (SELECT message_id FROM Message_Label WHERE label_id=" + label
|
||||
.getId() + ")");
|
||||
} else {
|
||||
return find("id NOT IN (SELECT message_id FROM Message_Label)");
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<Plaintext> findMessages(Plaintext.Status status, BitmessageAddress recipient) {
|
||||
return find("status='" + status.name() + "' AND recipient='" + recipient.getAddress() +
|
||||
"'");
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<Plaintext> findMessages(BitmessageAddress sender) {
|
||||
return find("sender=" + sender.getAddress());
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<Plaintext> findMessages(Plaintext.Status status) {
|
||||
return find("status='" + status.name() + "'");
|
||||
}
|
||||
|
||||
private List<Plaintext> find(String where) {
|
||||
protected List<Plaintext> find(String where) {
|
||||
List<Plaintext> result = new LinkedList<>();
|
||||
|
||||
// Define a projection that specifies which columns from the database
|
||||
@ -231,9 +175,13 @@ public class AndroidMessageRepository implements MessageRepository, InternalCont
|
||||
COLUMN_SENDER,
|
||||
COLUMN_RECIPIENT,
|
||||
COLUMN_DATA,
|
||||
COLUMN_ACK_DATA,
|
||||
COLUMN_SENT,
|
||||
COLUMN_RECEIVED,
|
||||
COLUMN_STATUS
|
||||
COLUMN_STATUS,
|
||||
COLUMN_TTL,
|
||||
COLUMN_RETRIES,
|
||||
COLUMN_NEXT_TRY
|
||||
};
|
||||
|
||||
SQLiteDatabase db = sql.getReadableDatabase();
|
||||
@ -254,14 +202,21 @@ public class AndroidMessageRepository implements MessageRepository, InternalCont
|
||||
long id = c.getLong(c.getColumnIndex(COLUMN_ID));
|
||||
builder.id(id);
|
||||
builder.IV(new InventoryVector(iv));
|
||||
builder.from(bmc.getAddressRepository().getAddress(c.getString(c.getColumnIndex
|
||||
builder.from(ctx.getAddressRepository().getAddress(c.getString(c.getColumnIndex
|
||||
(COLUMN_SENDER))));
|
||||
builder.to(bmc.getAddressRepository().getAddress(c.getString(c.getColumnIndex
|
||||
builder.to(ctx.getAddressRepository().getAddress(c.getString(c.getColumnIndex
|
||||
(COLUMN_RECIPIENT))));
|
||||
builder.ackData(c.getBlob(c.getColumnIndex(COLUMN_ACK_DATA)));
|
||||
builder.sent(c.getLong(c.getColumnIndex(COLUMN_SENT)));
|
||||
builder.received(c.getLong(c.getColumnIndex(COLUMN_RECEIVED)));
|
||||
builder.status(Plaintext.Status.valueOf(c.getString(c.getColumnIndex
|
||||
(COLUMN_STATUS))));
|
||||
builder.ttl(c.getLong(c.getColumnIndex(COLUMN_TTL)));
|
||||
builder.retries(c.getInt(c.getColumnIndex(COLUMN_RETRIES)));
|
||||
int nextTryColumn = c.getColumnIndex(COLUMN_NEXT_TRY);
|
||||
if (!c.isNull(nextTryColumn)) {
|
||||
builder.nextTry(c.getLong(nextTryColumn));
|
||||
}
|
||||
builder.labels(findLabels(id));
|
||||
result.add(builder.build());
|
||||
c.moveToNext();
|
||||
@ -284,13 +239,13 @@ public class AndroidMessageRepository implements MessageRepository, InternalCont
|
||||
|
||||
// save from address if necessary
|
||||
if (message.getId() == null) {
|
||||
BitmessageAddress savedAddress = bmc.getAddressRepository().getAddress(message
|
||||
BitmessageAddress savedAddress = ctx.getAddressRepository().getAddress(message
|
||||
.getFrom().getAddress());
|
||||
if (savedAddress == null || savedAddress.getPrivateKey() == null) {
|
||||
if (savedAddress != null && savedAddress.getAlias() != null) {
|
||||
message.getFrom().setAlias(savedAddress.getAlias());
|
||||
}
|
||||
bmc.getAddressRepository().save(message.getFrom());
|
||||
ctx.getAddressRepository().save(message.getFrom());
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -35,7 +35,7 @@ import ch.dissem.bitmessage.ports.ProofOfWorkRepository;
|
||||
import ch.dissem.bitmessage.utils.Encode;
|
||||
import ch.dissem.bitmessage.utils.Strings;
|
||||
|
||||
import static ch.dissem.bitmessage.utils.Singleton.security;
|
||||
import static ch.dissem.bitmessage.utils.Singleton.cryptography;
|
||||
|
||||
/**
|
||||
* @author Christian Basler
|
||||
@ -49,6 +49,8 @@ public class AndroidProofOfWorkRepository implements ProofOfWorkRepository {
|
||||
private static final String COLUMN_VERSION = "version";
|
||||
private static final String COLUMN_NONCE_TRIALS_PER_BYTE = "nonce_trials_per_byte";
|
||||
private static final String COLUMN_EXTRA_BYTES = "extra_bytes";
|
||||
private static final String COLUMN_EXPIRATION_TIME = "expiration_time";
|
||||
private static final String COLUMN_MESSAGE_ID = "message_id";
|
||||
|
||||
private final SqlHelper sql;
|
||||
|
||||
@ -114,16 +116,20 @@ public class AndroidProofOfWorkRepository implements ProofOfWorkRepository {
|
||||
}
|
||||
|
||||
@Override
|
||||
public void putObject(ObjectMessage object, long nonceTrialsPerByte, long extraBytes) {
|
||||
public void putObject(Item item) {
|
||||
try {
|
||||
SQLiteDatabase db = sql.getWritableDatabase();
|
||||
// Create a new map of values, where column names are the keys
|
||||
ContentValues values = new ContentValues();
|
||||
values.put(COLUMN_INITIAL_HASH, security().getInitialHash(object));
|
||||
values.put(COLUMN_DATA, Encode.bytes(object));
|
||||
values.put(COLUMN_VERSION, object.getVersion());
|
||||
values.put(COLUMN_NONCE_TRIALS_PER_BYTE, nonceTrialsPerByte);
|
||||
values.put(COLUMN_EXTRA_BYTES, extraBytes);
|
||||
values.put(COLUMN_INITIAL_HASH, cryptography().getInitialHash(item.object));
|
||||
values.put(COLUMN_DATA, Encode.bytes(item.object));
|
||||
values.put(COLUMN_VERSION, item.object.getVersion());
|
||||
values.put(COLUMN_NONCE_TRIALS_PER_BYTE, item.nonceTrialsPerByte);
|
||||
values.put(COLUMN_EXTRA_BYTES, item.extraBytes);
|
||||
if (item.message != null) {
|
||||
values.put(COLUMN_EXPIRATION_TIME, item.expirationTime);
|
||||
values.put(COLUMN_MESSAGE_ID, (Long) item.message.getId());
|
||||
}
|
||||
|
||||
db.insertOrThrow(TABLE_NAME, null, values);
|
||||
} catch (SQLiteConstraintException e) {
|
||||
@ -133,6 +139,11 @@ public class AndroidProofOfWorkRepository implements ProofOfWorkRepository {
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void putObject(ObjectMessage object, long nonceTrialsPerByte, long extraBytes) {
|
||||
putObject(new Item(object, nonceTrialsPerByte, extraBytes));
|
||||
}
|
||||
|
||||
@Override
|
||||
public void removeObject(byte[] initialHash) {
|
||||
SQLiteDatabase db = sql.getWritableDatabase();
|
||||
|
||||
@ -26,7 +26,7 @@ import ch.dissem.apps.abit.util.Assets;
|
||||
*/
|
||||
public class SqlHelper extends SQLiteOpenHelper {
|
||||
// If you change the database schema, you must increment the database version.
|
||||
public static final int DATABASE_VERSION = 3;
|
||||
public static final int DATABASE_VERSION = 4;
|
||||
public static final String DATABASE_NAME = "jabit.db";
|
||||
|
||||
protected final Context ctx;
|
||||
@ -53,6 +53,9 @@ public class SqlHelper extends SQLiteOpenHelper {
|
||||
executeMigration(db, "V2.1__Create_table_POW");
|
||||
case 2:
|
||||
executeMigration(db, "V3.0__Update_table_address");
|
||||
case 3:
|
||||
executeMigration(db, "V3.1__Update_table_POW");
|
||||
executeMigration(db, "V3.2__Update_table_message");
|
||||
default:
|
||||
// Nothing to do. Let's assume we won't upgrade from a version that's newer than DATABASE_VERSION.
|
||||
}
|
||||
|
||||
@ -44,7 +44,7 @@ import static ch.dissem.apps.abit.synchronization.Authenticator.ACCOUNT_SYNC;
|
||||
import static ch.dissem.apps.abit.synchronization.StubProvider.AUTHORITY;
|
||||
import static ch.dissem.bitmessage.extensions.pow.ProofOfWorkRequest.Request.CALCULATE;
|
||||
import static ch.dissem.bitmessage.extensions.pow.ProofOfWorkRequest.Request.COMPLETE;
|
||||
import static ch.dissem.bitmessage.utils.Singleton.security;
|
||||
import static ch.dissem.bitmessage.utils.Singleton.cryptography;
|
||||
|
||||
/**
|
||||
* Sync Adapter to synchronize with the Bitmessage network - fetches
|
||||
@ -107,13 +107,13 @@ public class SyncAdapter extends AbstractThreadedSyncAdapter {
|
||||
try {
|
||||
BitmessageAddress identity = Singleton.getIdentity(getContext());
|
||||
byte[] privateKey = identity.getPrivateKey().getPrivateEncryptionKey();
|
||||
byte[] signingKey = security().createPublicKey(identity.getPublicDecryptionKey());
|
||||
byte[] signingKey = cryptography().createPublicKey(identity.getPublicDecryptionKey());
|
||||
ProofOfWorkRequest.Reader reader = new ProofOfWorkRequest.Reader(identity);
|
||||
ProofOfWorkRepository powRepo = Singleton.getProofOfWorkRepository(getContext());
|
||||
List<byte[]> items = powRepo.getItems();
|
||||
for (byte[] initialHash : items) {
|
||||
ProofOfWorkRepository.Item item = powRepo.getItem(initialHash);
|
||||
byte[] target = security().getProofOfWorkTarget(item.object, item
|
||||
byte[] target = cryptography().getProofOfWorkTarget(item.object, item
|
||||
.nonceTrialsPerByte, item.extraBytes);
|
||||
CryptoCustomMessage<ProofOfWorkRequest> cryptoMsg = new CryptoCustomMessage<>(
|
||||
new ProofOfWorkRequest(identity, initialHash, CALCULATE, target));
|
||||
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 3.3 KiB After Width: | Height: | Size: 2.2 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 2.2 KiB After Width: | Height: | Size: 1.4 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 4.7 KiB After Width: | Height: | Size: 3.0 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 7.5 KiB After Width: | Height: | Size: 5.1 KiB |
BIN
app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
Normal file
BIN
app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 7.3 KiB |
@ -9,7 +9,7 @@ buildscript {
|
||||
jcenter()
|
||||
}
|
||||
dependencies {
|
||||
classpath 'com.android.tools.build:gradle:2.0.0'
|
||||
classpath 'com.android.tools.build:gradle:2.1.2'
|
||||
|
||||
// NOTE: Do not place your application dependencies here; they belong
|
||||
// in the individual module build.gradle files
|
||||
|
||||
@ -10,7 +10,7 @@
|
||||
# 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
|
||||
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
|
||||
@ -20,10 +20,18 @@
|
||||
|
||||
|
||||
|
||||
# Signing and encryption settings
|
||||
# Don't change those parameters - override those properties in the
|
||||
# gradle.properties file in your home directory instead
|
||||
keyStoreFile=
|
||||
keyStorePassword=
|
||||
signingKeyAlias=
|
||||
signingKeyPassword=
|
||||
# Create a directory containing the signing configs and keystores
|
||||
project.configs=
|
||||
# The signing config should be called 'Abit.gradle' and look like this:
|
||||
# android {
|
||||
# signingConfigs {
|
||||
# release {
|
||||
# storeFile file("C:/Path/To/Keystores/abit.jks")
|
||||
# storePassword "****************"
|
||||
# keyAlias "Abit"
|
||||
# keyPassword "****************"
|
||||
# }
|
||||
# }
|
||||
# }
|
||||
|
||||
BIN
gradle/wrapper/gradle-wrapper.jar
vendored
BIN
gradle/wrapper/gradle-wrapper.jar
vendored
Binary file not shown.
4
gradle/wrapper/gradle-wrapper.properties
vendored
4
gradle/wrapper/gradle-wrapper.properties
vendored
@ -1,6 +1,6 @@
|
||||
#Mon Apr 11 14:09:13 CEST 2016
|
||||
#Fri Aug 12 22:10:25 CEST 2016
|
||||
distributionBase=GRADLE_USER_HOME
|
||||
distributionPath=wrapper/dists
|
||||
zipStoreBase=GRADLE_USER_HOME
|
||||
zipStorePath=wrapper/dists
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-all.zip
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip
|
||||
|
||||
52
gradlew
vendored
52
gradlew
vendored
@ -6,12 +6,30 @@
|
||||
##
|
||||
##############################################################################
|
||||
|
||||
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
|
||||
DEFAULT_JVM_OPTS=""
|
||||
# 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\"`/" >/dev/null
|
||||
APP_HOME="`pwd -P`"
|
||||
cd "$SAVED" >/dev/null
|
||||
|
||||
APP_NAME="Gradle"
|
||||
APP_BASE_NAME=`basename "$0"`
|
||||
|
||||
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
|
||||
DEFAULT_JVM_OPTS=""
|
||||
|
||||
# Use the maximum available, or set MAX_FD != -1 to use that value.
|
||||
MAX_FD="maximum"
|
||||
|
||||
@ -30,6 +48,7 @@ die ( ) {
|
||||
cygwin=false
|
||||
msys=false
|
||||
darwin=false
|
||||
nonstop=false
|
||||
case "`uname`" in
|
||||
CYGWIN* )
|
||||
cygwin=true
|
||||
@ -40,31 +59,11 @@ case "`uname`" in
|
||||
MINGW* )
|
||||
msys=true
|
||||
;;
|
||||
NONSTOP* )
|
||||
nonstop=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.
|
||||
@ -90,7 +89,7 @@ location of your Java installation."
|
||||
fi
|
||||
|
||||
# Increase the maximum file descriptors if we can.
|
||||
if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
|
||||
if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
|
||||
MAX_FD_LIMIT=`ulimit -H -n`
|
||||
if [ $? -eq 0 ] ; then
|
||||
if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
|
||||
@ -114,6 +113,7 @@ fi
|
||||
if $cygwin ; then
|
||||
APP_HOME=`cygpath --path --mixed "$APP_HOME"`
|
||||
CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
|
||||
JAVACMD=`cygpath --unix "$JAVACMD"`
|
||||
|
||||
# We build the pattern for arguments to be converted via cygpath
|
||||
ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
|
||||
|
||||
8
gradlew.bat
vendored
8
gradlew.bat
vendored
@ -8,14 +8,14 @@
|
||||
@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 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=
|
||||
|
||||
@rem Find java.exe
|
||||
if defined JAVA_HOME goto findJavaFromJavaHome
|
||||
|
||||
@ -46,7 +46,7 @@ echo location of your Java installation.
|
||||
goto fail
|
||||
|
||||
:init
|
||||
@rem Get command-line arguments, handling Windowz variants
|
||||
@rem Get command-line arguments, handling Windows variants
|
||||
|
||||
if not "%OS%" == "Windows_NT" goto win9xME_args
|
||||
if "%@eval[2+2]" == "4" goto 4NT_args
|
||||
|
||||
404
store/icon.svg
404
store/icon.svg
@ -7,20 +7,356 @@
|
||||
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:xlink="http://www.w3.org/1999/xlink"
|
||||
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
|
||||
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
|
||||
width="512"
|
||||
height="512"
|
||||
viewBox="0 0 512.00001 512.00001"
|
||||
width="256"
|
||||
height="256"
|
||||
viewBox="0 0 256 256"
|
||||
id="svg2"
|
||||
version="1.1"
|
||||
inkscape:version="0.91 r13725"
|
||||
sodipodi:docname="icon.svg"
|
||||
inkscape:export-filename="C:\Users\chrig\Documents\Projekte\Abit\store\icon.png"
|
||||
inkscape:export-xdpi="90"
|
||||
inkscape:export-ydpi="90">
|
||||
sodipodi:docname="icon.svg">
|
||||
<defs
|
||||
id="defs4" />
|
||||
id="defs4">
|
||||
<linearGradient
|
||||
inkscape:collect="always"
|
||||
id="linearGradient4475">
|
||||
<stop
|
||||
style="stop-color:#000000;stop-opacity:1;"
|
||||
offset="0"
|
||||
id="stop4477" />
|
||||
<stop
|
||||
style="stop-color:#000000;stop-opacity:0;"
|
||||
offset="1"
|
||||
id="stop4479" />
|
||||
</linearGradient>
|
||||
<filter
|
||||
id="filter4284"
|
||||
inkscape:label="z-depth1"
|
||||
style="color-interpolation-filters:sRGB">
|
||||
<feFlood
|
||||
id="feFlood4286"
|
||||
result="flood"
|
||||
flood-color="rgb(0,0,0)"
|
||||
flood-opacity="0.12" />
|
||||
<feComposite
|
||||
id="feComposite4288"
|
||||
result="composite1"
|
||||
operator="in"
|
||||
in2="SourceGraphic"
|
||||
in="flood" />
|
||||
<feGaussianBlur
|
||||
id="feGaussianBlur4290"
|
||||
result="blur"
|
||||
stdDeviation="1.5" />
|
||||
<feOffset
|
||||
id="feOffset4292"
|
||||
result="offset"
|
||||
dy="1"
|
||||
dx="0" />
|
||||
<feComposite
|
||||
id="feComposite4294"
|
||||
result="fbSourceGraphic"
|
||||
operator="over"
|
||||
in2="offset"
|
||||
in="SourceGraphic" />
|
||||
<feColorMatrix
|
||||
id="feColorMatrix4332"
|
||||
values="0 0 0 -1 0 0 0 0 -1 0 0 0 0 -1 0 0 0 0 1 0"
|
||||
in="fbSourceGraphic"
|
||||
result="fbSourceGraphicAlpha" />
|
||||
<feFlood
|
||||
in="fbSourceGraphic"
|
||||
result="flood"
|
||||
flood-color="rgb(0,0,0)"
|
||||
flood-opacity="0.24"
|
||||
id="feFlood4334" />
|
||||
<feComposite
|
||||
result="composite1"
|
||||
operator="in"
|
||||
in="flood"
|
||||
in2="fbSourceGraphic"
|
||||
id="feComposite4336" />
|
||||
<feGaussianBlur
|
||||
result="blur"
|
||||
stdDeviation="1"
|
||||
id="feGaussianBlur4338" />
|
||||
<feOffset
|
||||
result="offset"
|
||||
dy="1"
|
||||
dx="0"
|
||||
id="feOffset4340" />
|
||||
<feComposite
|
||||
result="composite2"
|
||||
operator="over"
|
||||
in="fbSourceGraphic"
|
||||
in2="offset"
|
||||
id="feComposite4342" />
|
||||
</filter>
|
||||
<filter
|
||||
id="filter4346"
|
||||
inkscape:label="z-depth2"
|
||||
style="color-interpolation-filters:sRGB">
|
||||
<feFlood
|
||||
id="feFlood4348"
|
||||
result="flood"
|
||||
flood-color="rgb(0,0,0)"
|
||||
flood-opacity="0.16" />
|
||||
<feComposite
|
||||
id="feComposite4350"
|
||||
result="composite1"
|
||||
operator="in"
|
||||
in2="SourceGraphic"
|
||||
in="flood" />
|
||||
<feGaussianBlur
|
||||
id="feGaussianBlur4352"
|
||||
result="blur"
|
||||
stdDeviation="3" />
|
||||
<feOffset
|
||||
id="feOffset4354"
|
||||
result="offset"
|
||||
dy="3"
|
||||
dx="0" />
|
||||
<feComposite
|
||||
id="feComposite4356"
|
||||
result="fbSourceGraphic"
|
||||
operator="over"
|
||||
in2="offset"
|
||||
in="SourceGraphic" />
|
||||
<feColorMatrix
|
||||
id="feColorMatrix4358"
|
||||
values="0 0 0 -1 0 0 0 0 -1 0 0 0 0 -1 0 0 0 0 1 0"
|
||||
in="fbSourceGraphic"
|
||||
result="fbSourceGraphicAlpha" />
|
||||
<feFlood
|
||||
in="fbSourceGraphic"
|
||||
result="flood"
|
||||
flood-color="rgb(0,0,0)"
|
||||
flood-opacity="0.23"
|
||||
id="feFlood4360" />
|
||||
<feComposite
|
||||
result="composite1"
|
||||
operator="in"
|
||||
in="flood"
|
||||
in2="fbSourceGraphic"
|
||||
id="feComposite4362" />
|
||||
<feGaussianBlur
|
||||
result="blur"
|
||||
stdDeviation="3"
|
||||
id="feGaussianBlur4364" />
|
||||
<feOffset
|
||||
result="offset"
|
||||
dy="3"
|
||||
dx="0"
|
||||
id="feOffset4366" />
|
||||
<feComposite
|
||||
result="composite2"
|
||||
operator="over"
|
||||
in="fbSourceGraphic"
|
||||
in2="offset"
|
||||
id="feComposite4368" />
|
||||
</filter>
|
||||
<filter
|
||||
id="filter4375"
|
||||
inkscape:label="z-depth3"
|
||||
style="color-interpolation-filters:sRGB">
|
||||
<feFlood
|
||||
id="feFlood4377"
|
||||
result="flood"
|
||||
flood-color="rgb(0,0,0)"
|
||||
flood-opacity="0.19" />
|
||||
<feComposite
|
||||
id="feComposite4379"
|
||||
result="composite1"
|
||||
operator="in"
|
||||
in2="SourceGraphic"
|
||||
in="flood" />
|
||||
<feGaussianBlur
|
||||
id="feGaussianBlur4381"
|
||||
result="blur"
|
||||
stdDeviation="10" />
|
||||
<feOffset
|
||||
id="feOffset4383"
|
||||
result="offset"
|
||||
dy="10"
|
||||
dx="0" />
|
||||
<feComposite
|
||||
id="feComposite4385"
|
||||
result="fbSourceGraphic"
|
||||
operator="over"
|
||||
in2="offset"
|
||||
in="SourceGraphic" />
|
||||
<feColorMatrix
|
||||
id="feColorMatrix4387"
|
||||
values="0 0 0 -1 0 0 0 0 -1 0 0 0 0 -1 0 0 0 0 1 0"
|
||||
in="fbSourceGraphic"
|
||||
result="fbSourceGraphicAlpha" />
|
||||
<feFlood
|
||||
in="fbSourceGraphic"
|
||||
result="flood"
|
||||
flood-color="rgb(0,0,0)"
|
||||
flood-opacity="0.23"
|
||||
id="feFlood4389" />
|
||||
<feComposite
|
||||
result="composite1"
|
||||
operator="in"
|
||||
in="flood"
|
||||
in2="fbSourceGraphic"
|
||||
id="feComposite4391" />
|
||||
<feGaussianBlur
|
||||
result="blur"
|
||||
stdDeviation="3"
|
||||
id="feGaussianBlur4393" />
|
||||
<feOffset
|
||||
result="offset"
|
||||
dy="6"
|
||||
dx="0"
|
||||
id="feOffset4395" />
|
||||
<feComposite
|
||||
result="composite2"
|
||||
operator="over"
|
||||
in="fbSourceGraphic"
|
||||
in2="offset"
|
||||
id="feComposite4397" />
|
||||
</filter>
|
||||
<filter
|
||||
id="filter4419"
|
||||
inkscape:label="z-depth4"
|
||||
style="color-interpolation-filters:sRGB">
|
||||
<feFlood
|
||||
id="feFlood4421"
|
||||
result="flood"
|
||||
flood-color="rgb(0,0,0)"
|
||||
flood-opacity="0.25" />
|
||||
<feComposite
|
||||
id="feComposite4423"
|
||||
result="composite1"
|
||||
operator="in"
|
||||
in2="SourceGraphic"
|
||||
in="flood" />
|
||||
<feGaussianBlur
|
||||
id="feGaussianBlur4425"
|
||||
result="blur"
|
||||
stdDeviation="14" />
|
||||
<feOffset
|
||||
id="feOffset4427"
|
||||
result="offset"
|
||||
dy="14"
|
||||
dx="0" />
|
||||
<feComposite
|
||||
id="feComposite4429"
|
||||
result="fbSourceGraphic"
|
||||
operator="over"
|
||||
in2="offset"
|
||||
in="SourceGraphic" />
|
||||
<feColorMatrix
|
||||
id="feColorMatrix4431"
|
||||
values="0 0 0 -1 0 0 0 0 -1 0 0 0 0 -1 0 0 0 0 1 0"
|
||||
in="fbSourceGraphic"
|
||||
result="fbSourceGraphicAlpha" />
|
||||
<feFlood
|
||||
in="fbSourceGraphic"
|
||||
result="flood"
|
||||
flood-color="rgb(0,0,0)"
|
||||
flood-opacity="0.22"
|
||||
id="feFlood4433" />
|
||||
<feComposite
|
||||
result="composite1"
|
||||
operator="in"
|
||||
in="flood"
|
||||
in2="fbSourceGraphic"
|
||||
id="feComposite4435" />
|
||||
<feGaussianBlur
|
||||
result="blur"
|
||||
stdDeviation="5"
|
||||
id="feGaussianBlur4437" />
|
||||
<feOffset
|
||||
result="offset"
|
||||
dy="10"
|
||||
dx="0"
|
||||
id="feOffset4439" />
|
||||
<feComposite
|
||||
result="composite2"
|
||||
operator="over"
|
||||
in="fbSourceGraphic"
|
||||
in2="offset"
|
||||
id="feComposite4441" />
|
||||
</filter>
|
||||
<filter
|
||||
id="filter4449"
|
||||
inkscape:label="z-depth5"
|
||||
style="color-interpolation-filters:sRGB">
|
||||
<feFlood
|
||||
id="feFlood4451"
|
||||
result="flood"
|
||||
flood-color="rgb(0,0,0)"
|
||||
flood-opacity="0.3" />
|
||||
<feComposite
|
||||
id="feComposite4453"
|
||||
result="composite1"
|
||||
operator="in"
|
||||
in2="SourceGraphic"
|
||||
in="flood" />
|
||||
<feGaussianBlur
|
||||
id="feGaussianBlur4455"
|
||||
result="blur"
|
||||
stdDeviation="19" />
|
||||
<feOffset
|
||||
id="feOffset4457"
|
||||
result="offset"
|
||||
dy="19"
|
||||
dx="0" />
|
||||
<feComposite
|
||||
id="feComposite4459"
|
||||
result="fbSourceGraphic"
|
||||
operator="over"
|
||||
in2="offset"
|
||||
in="SourceGraphic" />
|
||||
<feColorMatrix
|
||||
id="feColorMatrix4461"
|
||||
values="0 0 0 -1 0 0 0 0 -1 0 0 0 0 -1 0 0 0 0 1 0"
|
||||
in="fbSourceGraphic"
|
||||
result="fbSourceGraphicAlpha" />
|
||||
<feFlood
|
||||
in="fbSourceGraphic"
|
||||
result="flood"
|
||||
flood-color="rgb(0,0,0)"
|
||||
flood-opacity="0.22"
|
||||
id="feFlood4463" />
|
||||
<feComposite
|
||||
result="composite1"
|
||||
operator="in"
|
||||
in="flood"
|
||||
in2="fbSourceGraphic"
|
||||
id="feComposite4465" />
|
||||
<feGaussianBlur
|
||||
result="blur"
|
||||
stdDeviation="6"
|
||||
id="feGaussianBlur4467" />
|
||||
<feOffset
|
||||
result="offset"
|
||||
dy="15"
|
||||
dx="0"
|
||||
id="feOffset4469" />
|
||||
<feComposite
|
||||
result="composite2"
|
||||
operator="over"
|
||||
in="fbSourceGraphic"
|
||||
in2="offset"
|
||||
id="feComposite4471" />
|
||||
</filter>
|
||||
<linearGradient
|
||||
inkscape:collect="always"
|
||||
xlink:href="#linearGradient4475"
|
||||
id="linearGradient4481"
|
||||
x1="-96.75"
|
||||
y1="-92.613281"
|
||||
x2="224"
|
||||
y2="228.13672"
|
||||
gradientUnits="userSpaceOnUse"
|
||||
gradientTransform="translate(-7,822.68216)" />
|
||||
</defs>
|
||||
<sodipodi:namedview
|
||||
id="base"
|
||||
pagecolor="#ffffff"
|
||||
@ -28,9 +364,9 @@
|
||||
borderopacity="1.0"
|
||||
inkscape:pageopacity="0.0"
|
||||
inkscape:pageshadow="2"
|
||||
inkscape:zoom="0.35"
|
||||
inkscape:cx="-602.14286"
|
||||
inkscape:cy="520"
|
||||
inkscape:zoom="1"
|
||||
inkscape:cx="228.5498"
|
||||
inkscape:cy="137.07133"
|
||||
inkscape:document-units="px"
|
||||
inkscape:current-layer="layer1"
|
||||
showgrid="false"
|
||||
@ -48,7 +384,7 @@
|
||||
<dc:format>image/svg+xml</dc:format>
|
||||
<dc:type
|
||||
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
|
||||
<dc:title />
|
||||
<dc:title></dc:title>
|
||||
</cc:Work>
|
||||
</rdf:RDF>
|
||||
</metadata>
|
||||
@ -56,23 +392,33 @@
|
||||
inkscape:label="Ebene 1"
|
||||
inkscape:groupmode="layer"
|
||||
id="layer1"
|
||||
transform="translate(0,-540.36216)">
|
||||
transform="translate(0,-796.36216)">
|
||||
<g
|
||||
id="g4508"
|
||||
inkscape:export-filename="C:\Users\chrig\Abit2.png"
|
||||
inkscape:export-xdpi="602.35297"
|
||||
inkscape:export-ydpi="602.35297">
|
||||
<path
|
||||
sodipodi:type="star"
|
||||
style="opacity:1;fill:#ffcc00;fill-opacity:1;stroke:none;stroke-width:4;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
|
||||
id="path3343"
|
||||
sodipodi:sides="7"
|
||||
sodipodi:cx="254.65251"
|
||||
sodipodi:cy="795.56248"
|
||||
sodipodi:r1="231.12856"
|
||||
sodipodi:r2="76.300064"
|
||||
sodipodi:arg1="-1.4219063"
|
||||
sodipodi:arg2="-0.97310738"
|
||||
inkscape:flatsided="false"
|
||||
inkscape:rounded="1.39"
|
||||
inkscape:randomized="0"
|
||||
d="m 288.93824,566.99107 c 227.8089,34.17135 -181.77145,35.86897 8.65088,165.49887 190.42233,129.6299 41.82424,-252.04738 157.14453,-52.63373 C 570.05394,879.26986 313.35752,560.1055 330.73516,789.8066 348.1128,1019.5077 553.87073,665.35713 469.86388,879.85055 385.85704,1094.344 475.34218,694.65489 306.58941,851.45756 137.83665,1008.2602 543.01068,948.319 322.93556,1016.3743 102.86045,1084.4295 471.14302,905.18976 243.33412,871.01841 15.525224,836.84705 315.01104,1116.2521 124.58871,986.62222 -65.833623,856.99233 303.92209,1033.1731 188.60181,833.75941 73.281523,634.34576 41.560203,1042.6994 24.182553,812.99831 6.804904,583.29722 99.600168,982.23077 183.60702,767.73737 267.61388,553.24396 -71.427781,783.04756 97.324978,626.24488 266.07773,469.4422 12.035822,790.72346 232.11094,722.66821 452.18606,654.61296 61.129346,532.81973 288.93824,566.99107 Z"
|
||||
inkscape:transform-center-x="-12.36068"
|
||||
inkscape:transform-center-y="-11.435089" />
|
||||
sodipodi:nodetypes="sssssssss"
|
||||
style="fill:#819ba8;fill-opacity:1;filter:url(#filter4346)"
|
||||
inkscape:connector-curvature="0"
|
||||
d="m 230.00001,827.68211 -204.000009,0 c -14.1525,0 -25.5,11.3475 -25.5,25.5 l 0,152.99999 c -5.523e-5,14.0833 11.4167,25.5001 25.5,25.5001 l 204.000009,0 c 14.0833,0 25.50005,-11.4168 25.49999,-25.5001 l 0,-152.99999 c 0,-14.1525 -11.47499,-25.5 -25.49999,-25.5 z"
|
||||
id="path4226" />
|
||||
<path
|
||||
id="path4435"
|
||||
d="m 26,827.68216 c -14.1525,0 -25.5,11.3475 -25.5,25.5 l 0,1.21289 127.5,79.6875 127.5,-79.6875 0,-1.21289 c 0,-14.1525 -11.475,-25.5 -25.5,-25.5 l -204,0 z"
|
||||
style="fill:#607d8b;fill-opacity:1;filter:url(#filter4346)"
|
||||
inkscape:connector-curvature="0" />
|
||||
<path
|
||||
id="path4456"
|
||||
d="M 84.9375,845.9556 C 99.46494,905.00376 49.357218,869.16386 30,929.84622 c 0,2.61651 1.051586,4.98591 2.755859,6.71094 0.04073,0.0412 52.392395,52.39156 95.126951,95.12504 l 102.11719,0 c 10.99514,0 20.36483,-6.9593 23.94531,-16.7129 C 197.53224,958.55338 85.073657,846.08936 84.9375,845.9556 Z"
|
||||
style="opacity:0.70099996;fill:url(#linearGradient4481);fill-opacity:1"
|
||||
inkscape:connector-curvature="0" />
|
||||
<path
|
||||
style="fill:#ffc107;fill-opacity:1;filter:url(#filter4346)"
|
||||
inkscape:connector-curvature="0"
|
||||
d="m 68.204082,915.51889 a 9.5510204,9.5510204 0 0 0 9.55102,-9.55102 c 0,-5.30081 -4.297959,-9.55102 -9.55102,-9.55102 a 9.5510204,9.5510204 0 0 0 -9.551021,9.55102 9.5510204,9.5510204 0 0 0 9.551021,9.55102 M 96.85714,872.5393 a 9.5510204,9.5510204 0 0 1 9.55102,9.55102 l 0,47.7551 a 9.5510204,9.5510204 0 0 1 -9.55102,9.55102 l -57.30612,0 A 9.5510204,9.5510204 0 0 1 30,929.84542 l 0,-47.7551 c 0,-5.30081 4.297959,-9.55102 9.55102,-9.55102 l 4.775511,0 0,-9.55102 a 23.877551,23.877551 0 0 1 23.877551,-23.87755 23.877551,23.877551 0 0 1 23.877551,23.87755 l 0,9.55102 4.775507,0 M 68.204082,848.66175 a 14.326531,14.326531 0 0 0 -14.326531,14.32653 l 0,9.55102 28.653061,0 0,-9.55102 a 14.326531,14.326531 0 0 0 -14.32653,-14.32653 z"
|
||||
id="path4160" />
|
||||
</g>
|
||||
</g>
|
||||
</svg>
|
||||
|
||||
|
Before Width: | Height: | Size: 3.2 KiB After Width: | Height: | Size: 13 KiB |
Loading…
Reference in New Issue
Block a user