mirror of
https://github.com/moparisthebest/open-keychain
synced 2024-11-27 11:12:15 -05:00
New first time screen
This commit is contained in:
Dominik Schürmann
parent
d3c54d5f12
commit
c1c831e52b
@ -81,9 +81,14 @@
|
|||||||
</intent-filter>
|
</intent-filter>
|
||||||
</activity>
|
</activity>
|
||||||
<activity
|
<activity
|
||||||
android:name=".ui.WizardActivity"
|
android:name=".ui.FirstTimeActivity"
|
||||||
android:configChanges="orientation|screenSize|keyboardHidden|keyboard"
|
android:configChanges="orientation|screenSize|keyboardHidden|keyboard"
|
||||||
android:label="@string/title_wizard"
|
android:label="@string/app_name"
|
||||||
|
android:windowSoftInputMode="stateHidden" />
|
||||||
|
<activity
|
||||||
|
android:name=".ui.CreateKeyActivity"
|
||||||
|
android:configChanges="orientation|screenSize|keyboardHidden|keyboard"
|
||||||
|
android:label="@string/title_create_key"
|
||||||
android:windowSoftInputMode="stateHidden" />
|
android:windowSoftInputMode="stateHidden" />
|
||||||
<activity
|
<activity
|
||||||
android:name=".ui.EditKeyActivityOld"
|
android:name=".ui.EditKeyActivityOld"
|
||||||
|
|||||||
@ -68,6 +68,7 @@ public final class Constants {
|
|||||||
public static final String FORCE_V3_SIGNATURES = "forceV3Signatures";
|
public static final String FORCE_V3_SIGNATURES = "forceV3Signatures";
|
||||||
public static final String KEY_SERVERS = "keyServers";
|
public static final String KEY_SERVERS = "keyServers";
|
||||||
public static final String KEY_SERVERS_DEFAULT_VERSION = "keyServersDefaultVersion";
|
public static final String KEY_SERVERS_DEFAULT_VERSION = "keyServersDefaultVersion";
|
||||||
|
public static final String FIRST_TIME = "firstTime";
|
||||||
}
|
}
|
||||||
|
|
||||||
public static final class Defaults {
|
public static final class Defaults {
|
||||||
|
|||||||
@ -139,6 +139,16 @@ public class Preferences {
|
|||||||
editor.commit();
|
editor.commit();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public boolean getFirstTime() {
|
||||||
|
return mSharedPreferences.getBoolean(Constants.Pref.FIRST_TIME, true);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setFirstTime(boolean value) {
|
||||||
|
SharedPreferences.Editor editor = mSharedPreferences.edit();
|
||||||
|
editor.putBoolean(Constants.Pref.FIRST_TIME, value);
|
||||||
|
editor.commit();
|
||||||
|
}
|
||||||
|
|
||||||
public String[] getKeyServers() {
|
public String[] getKeyServers() {
|
||||||
String rawData = mSharedPreferences.getString(Constants.Pref.KEY_SERVERS,
|
String rawData = mSharedPreferences.getString(Constants.Pref.KEY_SERVERS,
|
||||||
Constants.Defaults.KEY_SERVERS);
|
Constants.Defaults.KEY_SERVERS);
|
||||||
|
|||||||
@ -0,0 +1,134 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (C) 2014 Dominik Schürmann <dominik@dominikschuermann.de>
|
||||||
|
*
|
||||||
|
* 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 3 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, see <http://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
|
|
||||||
|
package org.sufficientlysecure.keychain.ui;
|
||||||
|
|
||||||
|
import android.content.Context;
|
||||||
|
import android.os.Bundle;
|
||||||
|
import android.support.v7.app.ActionBarActivity;
|
||||||
|
import android.text.Editable;
|
||||||
|
import android.text.TextWatcher;
|
||||||
|
import android.util.Patterns;
|
||||||
|
import android.view.View;
|
||||||
|
import android.widget.ArrayAdapter;
|
||||||
|
import android.widget.AutoCompleteTextView;
|
||||||
|
import android.widget.Button;
|
||||||
|
import android.widget.EditText;
|
||||||
|
|
||||||
|
import org.sufficientlysecure.keychain.R;
|
||||||
|
import org.sufficientlysecure.keychain.helper.ContactHelper;
|
||||||
|
|
||||||
|
import java.util.regex.Matcher;
|
||||||
|
|
||||||
|
public class CreateKeyActivity extends ActionBarActivity {
|
||||||
|
|
||||||
|
AutoCompleteTextView nameEdit;
|
||||||
|
AutoCompleteTextView emailEdit;
|
||||||
|
EditText passphraseEdit;
|
||||||
|
Button createButton;
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected void onCreate(Bundle savedInstanceState) {
|
||||||
|
super.onCreate(savedInstanceState);
|
||||||
|
|
||||||
|
setContentView(R.layout.create_key_activity);
|
||||||
|
|
||||||
|
nameEdit = (AutoCompleteTextView) findViewById(R.id.name);
|
||||||
|
emailEdit = (AutoCompleteTextView) findViewById(R.id.email);
|
||||||
|
passphraseEdit = (EditText) findViewById(R.id.passphrase);
|
||||||
|
createButton = (Button) findViewById(R.id.create_key_button);
|
||||||
|
|
||||||
|
emailEdit.setThreshold(1); // Start working from first character
|
||||||
|
emailEdit.setAdapter(
|
||||||
|
new ArrayAdapter<String>
|
||||||
|
(this, android.R.layout.simple_spinner_dropdown_item,
|
||||||
|
ContactHelper.getPossibleUserEmails(this)
|
||||||
|
)
|
||||||
|
);
|
||||||
|
emailEdit.addTextChangedListener(new TextWatcher() {
|
||||||
|
@Override
|
||||||
|
public void beforeTextChanged(CharSequence charSequence, int i, int i2, int i3) {
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onTextChanged(CharSequence charSequence, int i, int i2, int i3) {
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void afterTextChanged(Editable editable) {
|
||||||
|
String email = editable.toString();
|
||||||
|
if (email.length() > 0) {
|
||||||
|
Matcher emailMatcher = Patterns.EMAIL_ADDRESS.matcher(email);
|
||||||
|
if (emailMatcher.matches()) {
|
||||||
|
emailEdit.setCompoundDrawablesWithIntrinsicBounds(0, 0,
|
||||||
|
R.drawable.uid_mail_ok, 0);
|
||||||
|
} else {
|
||||||
|
emailEdit.setCompoundDrawablesWithIntrinsicBounds(0, 0,
|
||||||
|
R.drawable.uid_mail_bad, 0);
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
// remove drawable if email is empty
|
||||||
|
emailEdit.setCompoundDrawablesWithIntrinsicBounds(0, 0, 0, 0);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
});
|
||||||
|
nameEdit.setThreshold(1); // Start working from first character
|
||||||
|
nameEdit.setAdapter(
|
||||||
|
new ArrayAdapter<String>
|
||||||
|
(this, android.R.layout.simple_spinner_dropdown_item,
|
||||||
|
ContactHelper.getPossibleUserNames(this)
|
||||||
|
)
|
||||||
|
);
|
||||||
|
|
||||||
|
createButton.setOnClickListener(new View.OnClickListener() {
|
||||||
|
@Override
|
||||||
|
public void onClick(View v) {
|
||||||
|
createKey();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
private void createKey() {
|
||||||
|
if (isEditTextNotEmpty(this, nameEdit)
|
||||||
|
&& isEditTextNotEmpty(this, emailEdit)
|
||||||
|
&& isEditTextNotEmpty(this, passphraseEdit)) {
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Checks if text of given EditText is not empty. If it is empty an error is
|
||||||
|
* set and the EditText gets the focus.
|
||||||
|
*
|
||||||
|
* @param context
|
||||||
|
* @param editText
|
||||||
|
* @return true if EditText is not empty
|
||||||
|
*/
|
||||||
|
private static boolean isEditTextNotEmpty(Context context, EditText editText) {
|
||||||
|
boolean output = true;
|
||||||
|
if (editText.getText().toString().length() == 0) {
|
||||||
|
editText.setError("empty!");
|
||||||
|
editText.requestFocus();
|
||||||
|
output = false;
|
||||||
|
} else {
|
||||||
|
editText.setError(null);
|
||||||
|
}
|
||||||
|
|
||||||
|
return output;
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -0,0 +1,74 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (C) 2014 Dominik Schürmann <dominik@dominikschuermann.de>
|
||||||
|
*
|
||||||
|
* 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 3 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, see <http://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
|
|
||||||
|
package org.sufficientlysecure.keychain.ui;
|
||||||
|
|
||||||
|
import android.content.Intent;
|
||||||
|
import android.os.Bundle;
|
||||||
|
import android.support.v7.app.ActionBarActivity;
|
||||||
|
import android.view.View;
|
||||||
|
import android.view.Window;
|
||||||
|
import android.widget.Button;
|
||||||
|
|
||||||
|
import org.sufficientlysecure.keychain.R;
|
||||||
|
|
||||||
|
public class FirstTimeActivity extends ActionBarActivity {
|
||||||
|
|
||||||
|
Button mCreateKey;
|
||||||
|
Button mImportKey;
|
||||||
|
Button mSkipSetup;
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected void onCreate(Bundle savedInstanceState) {
|
||||||
|
super.onCreate(savedInstanceState);
|
||||||
|
|
||||||
|
supportRequestWindowFeature(Window.FEATURE_NO_TITLE);
|
||||||
|
|
||||||
|
setContentView(R.layout.first_time_activity);
|
||||||
|
|
||||||
|
mCreateKey = (Button) findViewById(R.id.first_time_create_key);
|
||||||
|
mImportKey = (Button) findViewById(R.id.first_time_import_key);
|
||||||
|
mSkipSetup = (Button) findViewById(R.id.first_time_cancel);
|
||||||
|
|
||||||
|
mSkipSetup.setOnClickListener(new View.OnClickListener() {
|
||||||
|
@Override
|
||||||
|
public void onClick(View v) {
|
||||||
|
Intent intent = new Intent(FirstTimeActivity.this, KeyListActivity.class);
|
||||||
|
startActivity(intent);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
mImportKey.setOnClickListener(new View.OnClickListener() {
|
||||||
|
@Override
|
||||||
|
public void onClick(View v) {
|
||||||
|
Intent intent = new Intent(FirstTimeActivity.this, ImportKeysActivity.class);
|
||||||
|
intent.setAction(ImportKeysActivity.ACTION_IMPORT_KEY_FROM_FILE_AND_RETURN);
|
||||||
|
startActivity(intent);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
mCreateKey.setOnClickListener(new View.OnClickListener() {
|
||||||
|
@Override
|
||||||
|
public void onClick(View v) {
|
||||||
|
Intent intent = new Intent(FirstTimeActivity.this, CreateKeyActivity.class);
|
||||||
|
startActivity(intent);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
@ -32,6 +32,7 @@ import org.sufficientlysecure.keychain.Constants;
|
|||||||
import org.sufficientlysecure.keychain.Constants.choice.algorithm;
|
import org.sufficientlysecure.keychain.Constants.choice.algorithm;
|
||||||
import org.sufficientlysecure.keychain.R;
|
import org.sufficientlysecure.keychain.R;
|
||||||
import org.sufficientlysecure.keychain.helper.ExportHelper;
|
import org.sufficientlysecure.keychain.helper.ExportHelper;
|
||||||
|
import org.sufficientlysecure.keychain.helper.Preferences;
|
||||||
import org.sufficientlysecure.keychain.provider.KeychainContract;
|
import org.sufficientlysecure.keychain.provider.KeychainContract;
|
||||||
import org.sufficientlysecure.keychain.provider.KeychainDatabase;
|
import org.sufficientlysecure.keychain.provider.KeychainDatabase;
|
||||||
import org.sufficientlysecure.keychain.service.KeychainIntentService;
|
import org.sufficientlysecure.keychain.service.KeychainIntentService;
|
||||||
@ -50,6 +51,15 @@ public class KeyListActivity extends DrawerActivity {
|
|||||||
public void onCreate(Bundle savedInstanceState) {
|
public void onCreate(Bundle savedInstanceState) {
|
||||||
super.onCreate(savedInstanceState);
|
super.onCreate(savedInstanceState);
|
||||||
|
|
||||||
|
Preferences prefs = Preferences.getPreferences(this);
|
||||||
|
if (prefs.getFirstTime()) {
|
||||||
|
prefs.setFirstTime(false);
|
||||||
|
Intent intent = new Intent(this, FirstTimeActivity.class);
|
||||||
|
startActivity(intent);
|
||||||
|
finish();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
mExportHelper = new ExportHelper(this);
|
mExportHelper = new ExportHelper(this);
|
||||||
|
|
||||||
setContentView(R.layout.key_list_activity);
|
setContentView(R.layout.key_list_activity);
|
||||||
@ -63,9 +73,10 @@ public class KeyListActivity extends DrawerActivity {
|
|||||||
super.onCreateOptionsMenu(menu);
|
super.onCreateOptionsMenu(menu);
|
||||||
getMenuInflater().inflate(R.menu.key_list, menu);
|
getMenuInflater().inflate(R.menu.key_list, menu);
|
||||||
|
|
||||||
if(Constants.DEBUG) {
|
if (Constants.DEBUG) {
|
||||||
menu.findItem(R.id.menu_key_list_debug_read).setVisible(true);
|
menu.findItem(R.id.menu_key_list_debug_read).setVisible(true);
|
||||||
menu.findItem(R.id.menu_key_list_debug_write).setVisible(true);
|
menu.findItem(R.id.menu_key_list_debug_write).setVisible(true);
|
||||||
|
menu.findItem(R.id.menu_key_list_debug_first_time).setVisible(true);
|
||||||
}
|
}
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
@ -95,7 +106,7 @@ public class KeyListActivity extends DrawerActivity {
|
|||||||
KeychainDatabase.debugRead(this);
|
KeychainDatabase.debugRead(this);
|
||||||
AppMsg.makeText(this, "Restored from backup", AppMsg.STYLE_CONFIRM).show();
|
AppMsg.makeText(this, "Restored from backup", AppMsg.STYLE_CONFIRM).show();
|
||||||
getContentResolver().notifyChange(KeychainContract.KeyRings.CONTENT_URI, null);
|
getContentResolver().notifyChange(KeychainContract.KeyRings.CONTENT_URI, null);
|
||||||
} catch(IOException e) {
|
} catch (IOException e) {
|
||||||
Log.e(Constants.TAG, "IO Error", e);
|
Log.e(Constants.TAG, "IO Error", e);
|
||||||
AppMsg.makeText(this, "IO Error: " + e.getMessage(), AppMsg.STYLE_ALERT).show();
|
AppMsg.makeText(this, "IO Error: " + e.getMessage(), AppMsg.STYLE_ALERT).show();
|
||||||
}
|
}
|
||||||
@ -105,12 +116,18 @@ public class KeyListActivity extends DrawerActivity {
|
|||||||
try {
|
try {
|
||||||
KeychainDatabase.debugWrite(this);
|
KeychainDatabase.debugWrite(this);
|
||||||
AppMsg.makeText(this, "Backup successful", AppMsg.STYLE_CONFIRM).show();
|
AppMsg.makeText(this, "Backup successful", AppMsg.STYLE_CONFIRM).show();
|
||||||
} catch(IOException e) {
|
} catch (IOException e) {
|
||||||
Log.e(Constants.TAG, "IO Error", e);
|
Log.e(Constants.TAG, "IO Error", e);
|
||||||
AppMsg.makeText(this, "IO Error: " + e.getMessage(), AppMsg.STYLE_ALERT).show();
|
AppMsg.makeText(this, "IO Error: " + e.getMessage(), AppMsg.STYLE_ALERT).show();
|
||||||
}
|
}
|
||||||
return true;
|
return true;
|
||||||
|
|
||||||
|
case R.id.menu_key_list_debug_first_time:
|
||||||
|
Intent intent = new Intent(this, FirstTimeActivity.class);
|
||||||
|
startActivity(intent);
|
||||||
|
finish();
|
||||||
|
return true;
|
||||||
|
|
||||||
default:
|
default:
|
||||||
return super.onOptionsItemSelected(item);
|
return super.onOptionsItemSelected(item);
|
||||||
}
|
}
|
||||||
@ -122,11 +139,8 @@ public class KeyListActivity extends DrawerActivity {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private void createKey() {
|
private void createKey() {
|
||||||
Intent intent = new Intent(this, WizardActivity.class);
|
Intent intent = new Intent(this, CreateKeyActivity.class);
|
||||||
// intent.setAction(EditKeyActivity.ACTION_CREATE_KEY);
|
startActivity(intent);
|
||||||
// intent.putExtra(EditKeyActivity.EXTRA_GENERATE_DEFAULT_KEYS, true);
|
|
||||||
// intent.putExtra(EditKeyActivity.EXTRA_USER_IDS, ""); // show user id view
|
|
||||||
startActivityForResult(intent, 0);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private void createKeyExpert() {
|
private void createKeyExpert() {
|
||||||
|
|||||||
@ -1,466 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright (C) 2014 Dominik Schürmann <dominik@dominikschuermann.de>
|
|
||||||
*
|
|
||||||
* 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 3 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, see <http://www.gnu.org/licenses/>.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package org.sufficientlysecure.keychain.ui;
|
|
||||||
|
|
||||||
import android.app.Activity;
|
|
||||||
import android.content.ActivityNotFoundException;
|
|
||||||
import android.content.Context;
|
|
||||||
import android.content.Intent;
|
|
||||||
import android.net.Uri;
|
|
||||||
import android.os.AsyncTask;
|
|
||||||
import android.os.Bundle;
|
|
||||||
import android.support.v4.app.Fragment;
|
|
||||||
import android.support.v4.app.FragmentManager;
|
|
||||||
import android.support.v4.app.FragmentTransaction;
|
|
||||||
import android.support.v7.app.ActionBarActivity;
|
|
||||||
import android.text.Editable;
|
|
||||||
import android.text.TextWatcher;
|
|
||||||
import android.util.Patterns;
|
|
||||||
import android.view.LayoutInflater;
|
|
||||||
import android.view.View;
|
|
||||||
import android.view.ViewGroup;
|
|
||||||
import android.view.inputmethod.InputMethodManager;
|
|
||||||
import android.widget.ArrayAdapter;
|
|
||||||
import android.widget.AutoCompleteTextView;
|
|
||||||
import android.widget.Button;
|
|
||||||
import android.widget.EditText;
|
|
||||||
import android.widget.ImageView;
|
|
||||||
import android.widget.LinearLayout;
|
|
||||||
import android.widget.ProgressBar;
|
|
||||||
import android.widget.RadioGroup;
|
|
||||||
import android.widget.TextView;
|
|
||||||
|
|
||||||
import org.sufficientlysecure.htmltextview.HtmlTextView;
|
|
||||||
import org.sufficientlysecure.keychain.Constants;
|
|
||||||
import org.sufficientlysecure.keychain.R;
|
|
||||||
import org.sufficientlysecure.keychain.helper.ContactHelper;
|
|
||||||
import org.sufficientlysecure.keychain.util.Log;
|
|
||||||
|
|
||||||
import java.util.regex.Matcher;
|
|
||||||
|
|
||||||
|
|
||||||
public class WizardActivity extends ActionBarActivity {
|
|
||||||
|
|
||||||
private State mCurrentState;
|
|
||||||
|
|
||||||
// values for mCurrentScreen
|
|
||||||
private enum State {
|
|
||||||
START, CREATE_KEY, IMPORT_KEY, K9
|
|
||||||
}
|
|
||||||
|
|
||||||
public static final int REQUEST_CODE_IMPORT = 0x00007703;
|
|
||||||
|
|
||||||
Button mBackButton;
|
|
||||||
Button mNextButton;
|
|
||||||
StartFragment mStartFragment;
|
|
||||||
CreateKeyFragment mCreateKeyFragment;
|
|
||||||
K9Fragment mK9Fragment;
|
|
||||||
|
|
||||||
private static final String K9_PACKAGE = "com.fsck.k9";
|
|
||||||
// private static final String K9_MARKET_INTENT_URI_BASE = "market://details?id=%s";
|
|
||||||
// private static final Intent K9_MARKET_INTENT = new Intent(Intent.ACTION_VIEW, Uri.parse(
|
|
||||||
// String.format(K9_MARKET_INTENT_URI_BASE, K9_PACKAGE)));
|
|
||||||
private static final Intent K9_MARKET_INTENT = new Intent(Intent.ACTION_VIEW, Uri.parse("https://github.com/k9mail/k-9/releases/tag/4.904"));
|
|
||||||
|
|
||||||
LinearLayout mProgressLayout;
|
|
||||||
View mProgressLine;
|
|
||||||
ProgressBar mProgressBar;
|
|
||||||
ImageView mProgressImage;
|
|
||||||
TextView mProgressText;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Checks if text of given EditText is not empty. If it is empty an error is
|
|
||||||
* set and the EditText gets the focus.
|
|
||||||
*
|
|
||||||
* @param context
|
|
||||||
* @param editText
|
|
||||||
* @return true if EditText is not empty
|
|
||||||
*/
|
|
||||||
private static boolean isEditTextNotEmpty(Context context, EditText editText) {
|
|
||||||
boolean output = true;
|
|
||||||
if (editText.getText().toString().length() == 0) {
|
|
||||||
editText.setError("empty!");
|
|
||||||
editText.requestFocus();
|
|
||||||
output = false;
|
|
||||||
} else {
|
|
||||||
editText.setError(null);
|
|
||||||
}
|
|
||||||
|
|
||||||
return output;
|
|
||||||
}
|
|
||||||
|
|
||||||
public static class StartFragment extends Fragment {
|
|
||||||
public static StartFragment newInstance() {
|
|
||||||
StartFragment myFragment = new StartFragment();
|
|
||||||
|
|
||||||
Bundle args = new Bundle();
|
|
||||||
myFragment.setArguments(args);
|
|
||||||
|
|
||||||
return myFragment;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public View onCreateView(LayoutInflater inflater, ViewGroup container,
|
|
||||||
Bundle savedInstanceState) {
|
|
||||||
return inflater.inflate(R.layout.wizard_start_fragment,
|
|
||||||
container, false);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public static class CreateKeyFragment extends Fragment {
|
|
||||||
public static CreateKeyFragment newInstance() {
|
|
||||||
CreateKeyFragment myFragment = new CreateKeyFragment();
|
|
||||||
|
|
||||||
Bundle args = new Bundle();
|
|
||||||
myFragment.setArguments(args);
|
|
||||||
|
|
||||||
return myFragment;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public View onCreateView(LayoutInflater inflater, ViewGroup container,
|
|
||||||
Bundle savedInstanceState) {
|
|
||||||
View view = inflater.inflate(R.layout.wizard_create_key_fragment,
|
|
||||||
container, false);
|
|
||||||
|
|
||||||
final AutoCompleteTextView emailView = (AutoCompleteTextView) view.findViewById(R.id.email);
|
|
||||||
emailView.setThreshold(1); // Start working from first character
|
|
||||||
emailView.setAdapter(
|
|
||||||
new ArrayAdapter<String>
|
|
||||||
(getActivity(), android.R.layout.simple_spinner_dropdown_item,
|
|
||||||
ContactHelper.getPossibleUserEmails(getActivity())
|
|
||||||
)
|
|
||||||
);
|
|
||||||
emailView.addTextChangedListener(new TextWatcher() {
|
|
||||||
@Override
|
|
||||||
public void beforeTextChanged(CharSequence charSequence, int i, int i2, int i3) {
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onTextChanged(CharSequence charSequence, int i, int i2, int i3) {
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void afterTextChanged(Editable editable) {
|
|
||||||
String email = editable.toString();
|
|
||||||
if (email.length() > 0) {
|
|
||||||
Matcher emailMatcher = Patterns.EMAIL_ADDRESS.matcher(email);
|
|
||||||
if (emailMatcher.matches()) {
|
|
||||||
emailView.setCompoundDrawablesWithIntrinsicBounds(0, 0,
|
|
||||||
R.drawable.uid_mail_ok, 0);
|
|
||||||
} else {
|
|
||||||
emailView.setCompoundDrawablesWithIntrinsicBounds(0, 0,
|
|
||||||
R.drawable.uid_mail_bad, 0);
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
// remove drawable if email is empty
|
|
||||||
emailView.setCompoundDrawablesWithIntrinsicBounds(0, 0, 0, 0);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
});
|
|
||||||
final AutoCompleteTextView nameView = (AutoCompleteTextView) view.findViewById(R.id.name);
|
|
||||||
nameView.setThreshold(1); // Start working from first character
|
|
||||||
nameView.setAdapter(
|
|
||||||
new ArrayAdapter<String>
|
|
||||||
(getActivity(), android.R.layout.simple_spinner_dropdown_item,
|
|
||||||
ContactHelper.getPossibleUserNames(getActivity())
|
|
||||||
)
|
|
||||||
);
|
|
||||||
return view;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public static class K9Fragment extends Fragment {
|
|
||||||
public static K9Fragment newInstance() {
|
|
||||||
K9Fragment myFragment = new K9Fragment();
|
|
||||||
|
|
||||||
Bundle args = new Bundle();
|
|
||||||
myFragment.setArguments(args);
|
|
||||||
|
|
||||||
return myFragment;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public View onCreateView(LayoutInflater inflater, ViewGroup container,
|
|
||||||
Bundle savedInstanceState) {
|
|
||||||
View v = inflater.inflate(R.layout.wizard_k9_fragment,
|
|
||||||
container, false);
|
|
||||||
|
|
||||||
HtmlTextView text = (HtmlTextView) v
|
|
||||||
.findViewById(R.id.wizard_k9_text);
|
|
||||||
text.setHtmlFromString("Install K9. It's good for you! Here is a screenhot how to enable OK in K9: (TODO)", true);
|
|
||||||
|
|
||||||
return v;
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Loads new fragment
|
|
||||||
*
|
|
||||||
* @param fragment
|
|
||||||
*/
|
|
||||||
private void loadFragment(Fragment fragment) {
|
|
||||||
FragmentManager fragmentManager = getSupportFragmentManager();
|
|
||||||
FragmentTransaction fragmentTransaction = fragmentManager
|
|
||||||
.beginTransaction();
|
|
||||||
fragmentTransaction.replace(R.id.wizard_container,
|
|
||||||
fragment);
|
|
||||||
fragmentTransaction.commit();
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Instantiate View and initialize fragments for this Activity
|
|
||||||
*/
|
|
||||||
@Override
|
|
||||||
protected void onCreate(Bundle savedInstanceState) {
|
|
||||||
super.onCreate(savedInstanceState);
|
|
||||||
|
|
||||||
setContentView(R.layout.wizard_activity);
|
|
||||||
mBackButton = (Button) findViewById(R.id.wizard_back);
|
|
||||||
mNextButton = (Button) findViewById(R.id.wizard_next);
|
|
||||||
|
|
||||||
// progress layout
|
|
||||||
mProgressLayout = (LinearLayout) findViewById(R.id.wizard_progress);
|
|
||||||
mProgressLine = findViewById(R.id.wizard_progress_line);
|
|
||||||
mProgressBar = (ProgressBar) findViewById(R.id.wizard_progress_progressbar);
|
|
||||||
mProgressImage = (ImageView) findViewById(R.id.wizard_progress_image);
|
|
||||||
mProgressText = (TextView) findViewById(R.id.wizard_progress_text);
|
|
||||||
|
|
||||||
changeToState(State.START);
|
|
||||||
}
|
|
||||||
|
|
||||||
private enum ProgressState {
|
|
||||||
WORKING, ENABLED, DISABLED, ERROR
|
|
||||||
}
|
|
||||||
|
|
||||||
private void showProgress(ProgressState state, String text) {
|
|
||||||
switch (state) {
|
|
||||||
case WORKING:
|
|
||||||
mProgressBar.setVisibility(View.VISIBLE);
|
|
||||||
mProgressImage.setVisibility(View.GONE);
|
|
||||||
break;
|
|
||||||
case ENABLED:
|
|
||||||
mProgressBar.setVisibility(View.GONE);
|
|
||||||
mProgressImage.setVisibility(View.VISIBLE);
|
|
||||||
// mProgressImage.setImageDrawable(getResources().getDrawable(
|
|
||||||
// R.drawable.status_enabled));
|
|
||||||
break;
|
|
||||||
case DISABLED:
|
|
||||||
mProgressBar.setVisibility(View.GONE);
|
|
||||||
mProgressImage.setVisibility(View.VISIBLE);
|
|
||||||
// mProgressImage.setImageDrawable(getResources().getDrawable(
|
|
||||||
// R.drawable.status_disabled));
|
|
||||||
break;
|
|
||||||
case ERROR:
|
|
||||||
mProgressBar.setVisibility(View.GONE);
|
|
||||||
mProgressImage.setVisibility(View.VISIBLE);
|
|
||||||
// mProgressImage.setImageDrawable(getResources().getDrawable(
|
|
||||||
// R.drawable.status_fail));
|
|
||||||
break;
|
|
||||||
|
|
||||||
default:
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
mProgressText.setText(text);
|
|
||||||
|
|
||||||
mProgressLine.setVisibility(View.VISIBLE);
|
|
||||||
mProgressLayout.setVisibility(View.VISIBLE);
|
|
||||||
}
|
|
||||||
|
|
||||||
private void hideProgress() {
|
|
||||||
mProgressLine.setVisibility(View.GONE);
|
|
||||||
mProgressLayout.setVisibility(View.GONE);
|
|
||||||
}
|
|
||||||
|
|
||||||
public void nextOnClick(View view) {
|
|
||||||
// close keyboard
|
|
||||||
if (getCurrentFocus() != null) {
|
|
||||||
InputMethodManager inputManager = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
|
|
||||||
inputManager.hideSoftInputFromWindow(getCurrentFocus()
|
|
||||||
.getWindowToken(), InputMethodManager.HIDE_NOT_ALWAYS);
|
|
||||||
}
|
|
||||||
|
|
||||||
switch (mCurrentState) {
|
|
||||||
case START: {
|
|
||||||
RadioGroup radioGroup = (RadioGroup) findViewById(R.id.wizard_start_radio_group);
|
|
||||||
int selectedId = radioGroup.getCheckedRadioButtonId();
|
|
||||||
switch (selectedId) {
|
|
||||||
case R.id.wizard_start_new_key: {
|
|
||||||
changeToState(State.CREATE_KEY);
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
case R.id.wizard_start_import: {
|
|
||||||
changeToState(State.IMPORT_KEY);
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
case R.id.wizard_start_skip: {
|
|
||||||
finish();
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
mBackButton.setText(R.string.btn_back);
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
case CREATE_KEY:
|
|
||||||
EditText nameEdit = (EditText) findViewById(R.id.name);
|
|
||||||
EditText emailEdit = (EditText) findViewById(R.id.email);
|
|
||||||
EditText passphraseEdit = (EditText) findViewById(R.id.passphrase);
|
|
||||||
|
|
||||||
if (isEditTextNotEmpty(this, nameEdit)
|
|
||||||
&& isEditTextNotEmpty(this, emailEdit)
|
|
||||||
&& isEditTextNotEmpty(this, passphraseEdit)) {
|
|
||||||
|
|
||||||
// SaveKeyringParcel newKey = new SaveKeyringParcel();
|
|
||||||
// newKey.mAddUserIds.add(nameEdit.getText().toString() + " <"
|
|
||||||
// + emailEdit.getText().toString() + ">");
|
|
||||||
|
|
||||||
|
|
||||||
AsyncTask<String, Boolean, Boolean> generateTask = new AsyncTask<String, Boolean, Boolean>() {
|
|
||||||
|
|
||||||
@Override
|
|
||||||
protected void onPreExecute() {
|
|
||||||
super.onPreExecute();
|
|
||||||
|
|
||||||
showProgress(ProgressState.WORKING, "generating key...");
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
protected Boolean doInBackground(String... params) {
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
protected void onPostExecute(Boolean result) {
|
|
||||||
super.onPostExecute(result);
|
|
||||||
|
|
||||||
if (result) {
|
|
||||||
showProgress(ProgressState.ENABLED, "key generated successfully!");
|
|
||||||
|
|
||||||
changeToState(State.K9);
|
|
||||||
} else {
|
|
||||||
showProgress(ProgressState.ERROR, "error in key gen");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
};
|
|
||||||
|
|
||||||
generateTask.execute("");
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
case K9: {
|
|
||||||
RadioGroup radioGroup = (RadioGroup) findViewById(R.id.wizard_k9_radio_group);
|
|
||||||
int selectedId = radioGroup.getCheckedRadioButtonId();
|
|
||||||
switch (selectedId) {
|
|
||||||
case R.id.wizard_k9_install: {
|
|
||||||
try {
|
|
||||||
startActivity(K9_MARKET_INTENT);
|
|
||||||
} catch (ActivityNotFoundException e) {
|
|
||||||
Log.e(Constants.TAG, "Activity not found for: " + K9_MARKET_INTENT);
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
case R.id.wizard_k9_skip: {
|
|
||||||
finish();
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
finish();
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
default:
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
protected void onActivityResult(int requestCode, int resultCode, Intent data) {
|
|
||||||
super.onActivityResult(requestCode, resultCode, data);
|
|
||||||
switch (requestCode) {
|
|
||||||
case REQUEST_CODE_IMPORT: {
|
|
||||||
if (resultCode == Activity.RESULT_OK) {
|
|
||||||
// imported now...
|
|
||||||
changeToState(State.K9);
|
|
||||||
} else {
|
|
||||||
// back to start
|
|
||||||
changeToState(State.START);
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
default: {
|
|
||||||
super.onActivityResult(requestCode, resultCode, data);
|
|
||||||
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public void backOnClick(View view) {
|
|
||||||
switch (mCurrentState) {
|
|
||||||
case START:
|
|
||||||
finish();
|
|
||||||
break;
|
|
||||||
case CREATE_KEY:
|
|
||||||
changeToState(State.START);
|
|
||||||
break;
|
|
||||||
case IMPORT_KEY:
|
|
||||||
changeToState(State.START);
|
|
||||||
break;
|
|
||||||
default:
|
|
||||||
changeToState(State.START);
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private void changeToState(State state) {
|
|
||||||
switch (state) {
|
|
||||||
case START: {
|
|
||||||
mCurrentState = State.START;
|
|
||||||
mStartFragment = StartFragment.newInstance();
|
|
||||||
loadFragment(mStartFragment);
|
|
||||||
mBackButton.setText(android.R.string.cancel);
|
|
||||||
mNextButton.setText(R.string.btn_next);
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
case CREATE_KEY: {
|
|
||||||
mCurrentState = State.CREATE_KEY;
|
|
||||||
mCreateKeyFragment = CreateKeyFragment.newInstance();
|
|
||||||
loadFragment(mCreateKeyFragment);
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
case IMPORT_KEY: {
|
|
||||||
mCurrentState = State.IMPORT_KEY;
|
|
||||||
Intent intent = new Intent(this, ImportKeysActivity.class);
|
|
||||||
intent.setAction(ImportKeysActivity.ACTION_IMPORT_KEY_FROM_FILE_AND_RETURN);
|
|
||||||
startActivityForResult(intent, REQUEST_CODE_IMPORT);
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
case K9: {
|
|
||||||
mCurrentState = State.K9;
|
|
||||||
mBackButton.setEnabled(false); // don't go back to import/create key
|
|
||||||
mK9Fragment = K9Fragment.newInstance();
|
|
||||||
loadFragment(mK9Fragment);
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
BIN
OpenKeychain/src/main/res/drawable/first_time_1.png
Normal file
BIN
OpenKeychain/src/main/res/drawable/first_time_1.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 43 KiB |
@ -2,6 +2,7 @@
|
|||||||
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
|
android:padding="8dp"
|
||||||
android:orientation="vertical">
|
android:orientation="vertical">
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
@ -38,4 +39,16 @@
|
|||||||
android:layout_gravity="center_horizontal" />
|
android:layout_gravity="center_horizontal" />
|
||||||
|
|
||||||
|
|
||||||
|
<Button
|
||||||
|
android:id="@+id/create_key_button"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_weight="1"
|
||||||
|
android:layout_gravity="center_horizontal"
|
||||||
|
android:layout_margin="8dp"
|
||||||
|
android:text="@string/first_time_create_key"
|
||||||
|
android:background="@drawable/button_edgy"
|
||||||
|
android:drawableLeft="@drawable/ic_action_new_account" />
|
||||||
|
|
||||||
|
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
89
OpenKeychain/src/main/res/layout/first_time_activity.xml
Normal file
89
OpenKeychain/src/main/res/layout/first_time_activity.xml
Normal file
@ -0,0 +1,89 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:paddingTop="16dp"
|
||||||
|
android:paddingBottom="8dp">
|
||||||
|
|
||||||
|
<LinearLayout
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="match_parent"
|
||||||
|
android:orientation="vertical">
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_marginLeft="8dp"
|
||||||
|
android:textAppearance="?android:attr/textAppearanceLarge"
|
||||||
|
android:text="@string/app_name"
|
||||||
|
android:drawableLeft="@drawable/ic_launcher"
|
||||||
|
android:drawablePadding="16dp"
|
||||||
|
android:gravity="center"
|
||||||
|
android:layout_gravity="center_horizontal" />
|
||||||
|
|
||||||
|
<ImageView
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_marginLeft="64dp"
|
||||||
|
android:layout_marginRight="64dp"
|
||||||
|
android:layout_marginTop="16dp"
|
||||||
|
android:layout_marginBottom="16dp"
|
||||||
|
android:layout_height="256dp"
|
||||||
|
android:src="@drawable/first_time_1" />
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_marginLeft="64dp"
|
||||||
|
android:layout_marginRight="64dp"
|
||||||
|
android:textAppearance="?android:attr/textAppearanceMedium"
|
||||||
|
android:text="@string/first_time_text1"
|
||||||
|
android:layout_gravity="center_horizontal"
|
||||||
|
android:gravity="center_horizontal" />
|
||||||
|
|
||||||
|
|
||||||
|
</LinearLayout>
|
||||||
|
|
||||||
|
<Button
|
||||||
|
android:id="@+id/first_time_cancel"
|
||||||
|
android:layout_alignParentBottom="true"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_marginBottom="8dp"
|
||||||
|
android:layout_marginLeft="8dp"
|
||||||
|
android:layout_marginRight="8dp"
|
||||||
|
android:text="@string/first_time_skip"
|
||||||
|
android:background="@drawable/button_edgy" />
|
||||||
|
|
||||||
|
<LinearLayout
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_above="@id/first_time_cancel"
|
||||||
|
android:orientation="horizontal">
|
||||||
|
|
||||||
|
<Button
|
||||||
|
android:id="@+id/first_time_create_key"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_gravity="center_horizontal"
|
||||||
|
android:layout_weight="1"
|
||||||
|
android:layout_marginLeft="8dp"
|
||||||
|
android:layout_marginRight="8dp"
|
||||||
|
android:text="@string/first_time_create_key"
|
||||||
|
android:background="@drawable/button_edgy"
|
||||||
|
android:drawableLeft="@drawable/ic_action_new_account" />
|
||||||
|
|
||||||
|
<Button
|
||||||
|
android:id="@+id/first_time_import_key"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_weight="1"
|
||||||
|
android:layout_gravity="center_horizontal"
|
||||||
|
android:layout_marginLeft="8dp"
|
||||||
|
android:layout_marginRight="8dp"
|
||||||
|
android:text="@string/first_time_import_key"
|
||||||
|
android:background="@drawable/button_edgy"
|
||||||
|
android:drawableLeft="@drawable/ic_action_download" />
|
||||||
|
</LinearLayout>
|
||||||
|
|
||||||
|
|
||||||
|
</RelativeLayout>
|
||||||
@ -1,98 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="match_parent">
|
|
||||||
|
|
||||||
<LinearLayout
|
|
||||||
android:id="@+id/wizard_buttons"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_alignParentBottom="true"
|
|
||||||
android:orientation="horizontal">
|
|
||||||
|
|
||||||
<Button
|
|
||||||
android:id="@+id/wizard_back"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_weight="1"
|
|
||||||
android:onClick="backOnClick"
|
|
||||||
android:text="cancel"
|
|
||||||
style="@style/SelectableItem" />
|
|
||||||
|
|
||||||
<View
|
|
||||||
android:layout_width="1dip"
|
|
||||||
android:layout_height="match_parent"
|
|
||||||
android:layout_marginBottom="4dip"
|
|
||||||
android:layout_marginTop="4dip"
|
|
||||||
android:background="?android:attr/listDivider" />
|
|
||||||
|
|
||||||
<Button
|
|
||||||
android:id="@+id/wizard_next"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_weight="1"
|
|
||||||
android:onClick="nextOnClick"
|
|
||||||
android:text="next"
|
|
||||||
style="@style/SelectableItem" />
|
|
||||||
</LinearLayout>
|
|
||||||
|
|
||||||
<View
|
|
||||||
android:id="@+id/wizard_progress_line"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="1dip"
|
|
||||||
android:layout_above="@+id/wizard_buttons"
|
|
||||||
android:layout_marginLeft="4dip"
|
|
||||||
android:layout_marginRight="4dip"
|
|
||||||
android:background="?android:attr/listDivider"
|
|
||||||
android:visibility="gone" />
|
|
||||||
|
|
||||||
<LinearLayout
|
|
||||||
android:id="@+id/wizard_progress"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_above="@+id/wizard_progress_line"
|
|
||||||
android:visibility="gone">
|
|
||||||
|
|
||||||
<ProgressBar
|
|
||||||
android:id="@+id/wizard_progress_progressbar"
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="wrap_content" />
|
|
||||||
|
|
||||||
<ImageView
|
|
||||||
android:id="@+id/wizard_progress_image"
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:src="@drawable/icon_light_refresh" />
|
|
||||||
|
|
||||||
<TextView
|
|
||||||
android:id="@+id/wizard_progress_text"
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_gravity="center_vertical"
|
|
||||||
android:text="asd"
|
|
||||||
android:textAppearance="?android:attr/textAppearanceMedium" />
|
|
||||||
</LinearLayout>
|
|
||||||
|
|
||||||
<View
|
|
||||||
android:id="@+id/wizard_line2"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="1dip"
|
|
||||||
android:layout_above="@+id/wizard_progress"
|
|
||||||
android:layout_marginLeft="4dip"
|
|
||||||
android:layout_marginRight="4dip"
|
|
||||||
android:background="?android:attr/listDivider" />
|
|
||||||
|
|
||||||
<ScrollView
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="match_parent"
|
|
||||||
android:layout_above="@+id/wizard_line2">
|
|
||||||
|
|
||||||
<LinearLayout
|
|
||||||
android:id="@+id/wizard_container"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:orientation="vertical"
|
|
||||||
android:padding="16dp" />
|
|
||||||
</ScrollView>
|
|
||||||
|
|
||||||
</RelativeLayout>
|
|
||||||
@ -1,43 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:orientation="vertical" >
|
|
||||||
|
|
||||||
<org.sufficientlysecure.htmltextview.HtmlTextView
|
|
||||||
android:id="@+id/wizard_k9_text"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:paddingBottom="4dp"
|
|
||||||
android:text="Text..."
|
|
||||||
android:textAppearance="?android:attr/textAppearanceMedium" />
|
|
||||||
|
|
||||||
<RadioGroup
|
|
||||||
android:id="@+id/wizard_k9_radio_group"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content">
|
|
||||||
|
|
||||||
<RadioButton
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="?android:attr/listPreferredItemHeight"
|
|
||||||
android:checked="true"
|
|
||||||
android:textAppearance="?android:attr/textAppearanceMedium"
|
|
||||||
style="@style/SelectableItem"
|
|
||||||
android:text="install K9"
|
|
||||||
android:id="@+id/wizard_k9_install" />
|
|
||||||
|
|
||||||
<View
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="1dip"
|
|
||||||
android:background="?android:attr/listDivider" />
|
|
||||||
|
|
||||||
<RadioButton
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="?android:attr/listPreferredItemHeight"
|
|
||||||
android:textAppearance="?android:attr/textAppearanceMedium"
|
|
||||||
style="@style/SelectableItem"
|
|
||||||
android:text="skip install"
|
|
||||||
android:id="@+id/wizard_k9_skip" />
|
|
||||||
</RadioGroup>
|
|
||||||
|
|
||||||
</LinearLayout>
|
|
||||||
@ -1,63 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:orientation="vertical">
|
|
||||||
|
|
||||||
<TextView
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:paddingBottom="4dp"
|
|
||||||
android:text="Welcome to OpenKeychain"
|
|
||||||
android:textAppearance="?android:attr/textAppearanceMedium" />
|
|
||||||
|
|
||||||
<TextView
|
|
||||||
style="@style/SectionHeader"
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="0dp"
|
|
||||||
android:layout_marginTop="14dp"
|
|
||||||
android:text="What you wanna do today?"
|
|
||||||
android:layout_weight="1" />
|
|
||||||
|
|
||||||
<RadioGroup
|
|
||||||
android:id="@+id/wizard_start_radio_group"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content">
|
|
||||||
|
|
||||||
<RadioButton
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="?android:attr/listPreferredItemHeight"
|
|
||||||
android:checked="true"
|
|
||||||
android:textAppearance="?android:attr/textAppearanceMedium"
|
|
||||||
style="@style/SelectableItem"
|
|
||||||
android:text="new key"
|
|
||||||
android:id="@+id/wizard_start_new_key" />
|
|
||||||
|
|
||||||
<View
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="1dip"
|
|
||||||
android:background="?android:attr/listDivider" />
|
|
||||||
|
|
||||||
<RadioButton
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="?android:attr/listPreferredItemHeight"
|
|
||||||
android:textAppearance="?android:attr/textAppearanceMedium"
|
|
||||||
style="@style/SelectableItem"
|
|
||||||
android:text="import existing key"
|
|
||||||
android:id="@+id/wizard_start_import" />
|
|
||||||
|
|
||||||
<View
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="1dip"
|
|
||||||
android:background="?android:attr/listDivider" />
|
|
||||||
|
|
||||||
<RadioButton
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="?android:attr/listPreferredItemHeight"
|
|
||||||
android:textAppearance="?android:attr/textAppearanceMedium"
|
|
||||||
style="@style/SelectableItem"
|
|
||||||
android:text="skip wizard"
|
|
||||||
android:id="@+id/wizard_start_skip" />
|
|
||||||
</RadioGroup>
|
|
||||||
|
|
||||||
</LinearLayout>
|
|
||||||
@ -43,4 +43,10 @@
|
|||||||
android:title="Debug / DB backup"
|
android:title="Debug / DB backup"
|
||||||
android:visible="false" />
|
android:visible="false" />
|
||||||
|
|
||||||
|
<item
|
||||||
|
android:id="@+id/menu_key_list_debug_first_time"
|
||||||
|
app:showAsAction="never"
|
||||||
|
android:title="Debug / Show first time screen"
|
||||||
|
android:visible="false" />
|
||||||
|
|
||||||
</menu>
|
</menu>
|
||||||
|
|||||||
@ -9,7 +9,6 @@
|
|||||||
<string name="title_authentication">Passphrase</string>
|
<string name="title_authentication">Passphrase</string>
|
||||||
<string name="title_create_key">Create Key</string>
|
<string name="title_create_key">Create Key</string>
|
||||||
<string name="title_edit_key">Edit Key</string>
|
<string name="title_edit_key">Edit Key</string>
|
||||||
<string name="title_wizard">Welcome to OpenKeychain</string>
|
|
||||||
<string name="title_preferences">Preferences</string>
|
<string name="title_preferences">Preferences</string>
|
||||||
<string name="title_api_registered_apps">Apps</string>
|
<string name="title_api_registered_apps">Apps</string>
|
||||||
<string name="title_key_server_preference">Keyserver Preference</string>
|
<string name="title_key_server_preference">Keyserver Preference</string>
|
||||||
@ -704,4 +703,10 @@
|
|||||||
<string name="info_no_manual_account_creation">Do not create OpenKeychain-Accounts manually.\nFor more information, see Help.</string>
|
<string name="info_no_manual_account_creation">Do not create OpenKeychain-Accounts manually.\nFor more information, see Help.</string>
|
||||||
<string name="contact_show_key">Show key (%s)</string>
|
<string name="contact_show_key">Show key (%s)</string>
|
||||||
|
|
||||||
|
<!-- First Time -->
|
||||||
|
<string name="first_time_text1">Take back your privacy with OpenKeychain!</string>
|
||||||
|
<string name="first_time_create_key">Create Key</string>
|
||||||
|
<string name="first_time_import_key">Import Key</string>
|
||||||
|
<string name="first_time_skip">Skip Setup</string>
|
||||||
|
|
||||||
</resources>
|
</resources>
|
||||||
|
|||||||
BIN
Resources/gnupg-infographic/first_time_1.png
Normal file
BIN
Resources/gnupg-infographic/first_time_1.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 43 KiB |
351
Resources/gnupg-infographic/first_time_1.svg
Normal file
351
Resources/gnupg-infographic/first_time_1.svg
Normal file
@ -0,0 +1,351 @@
|
|||||||
|
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||||
|
<!-- Created with Inkscape (http://www.inkscape.org/) -->
|
||||||
|
|
||||||
|
<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"
|
||||||
|
width="512"
|
||||||
|
height="512"
|
||||||
|
id="svg4325"
|
||||||
|
version="1.1"
|
||||||
|
inkscape:version="0.48.3.1 r9886"
|
||||||
|
sodipodi:docname="ok_start.svg">
|
||||||
|
<defs
|
||||||
|
id="defs4327" />
|
||||||
|
<sodipodi:namedview
|
||||||
|
id="base"
|
||||||
|
pagecolor="#ffffff"
|
||||||
|
bordercolor="#666666"
|
||||||
|
borderopacity="1.0"
|
||||||
|
inkscape:pageopacity="0.0"
|
||||||
|
inkscape:pageshadow="2"
|
||||||
|
inkscape:zoom="1.979899"
|
||||||
|
inkscape:cx="405.16912"
|
||||||
|
inkscape:cy="246.12576"
|
||||||
|
inkscape:document-units="px"
|
||||||
|
inkscape:current-layer="layer1"
|
||||||
|
showgrid="false"
|
||||||
|
inkscape:window-width="2558"
|
||||||
|
inkscape:window-height="1419"
|
||||||
|
inkscape:window-x="0"
|
||||||
|
inkscape:window-y="19"
|
||||||
|
inkscape:window-maximized="1" />
|
||||||
|
<metadata
|
||||||
|
id="metadata4330">
|
||||||
|
<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></dc:title>
|
||||||
|
</cc:Work>
|
||||||
|
</rdf:RDF>
|
||||||
|
</metadata>
|
||||||
|
<g
|
||||||
|
inkscape:label="Layer 1"
|
||||||
|
inkscape:groupmode="layer"
|
||||||
|
id="layer1"
|
||||||
|
transform="translate(0,-540.36218)">
|
||||||
|
<path
|
||||||
|
sodipodi:type="arc"
|
||||||
|
style="opacity:0.59999999999999998;fill:#9933cc;fill-opacity:1;stroke:none;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
|
||||||
|
id="path4501"
|
||||||
|
sodipodi:cx="227.53687"
|
||||||
|
sodipodi:cy="246.58241"
|
||||||
|
sodipodi:rx="225.51656"
|
||||||
|
sodipodi:ry="225.51656"
|
||||||
|
d="m 453.05342,246.58241 a 225.51656,225.51656 0 1 1 -451.0331106,0 225.51656,225.51656 0 1 1 451.0331106,0 z"
|
||||||
|
transform="translate(28.463135,549.77977)" />
|
||||||
|
<path
|
||||||
|
sodipodi:type="star"
|
||||||
|
style="color:#000000;fill:#ffffff;fill-opacity:0.16256157;fill-rule:nonzero;stroke:none;stroke-width:1.76498926;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
|
||||||
|
id="path7021"
|
||||||
|
sodipodi:sides="25"
|
||||||
|
sodipodi:cx="237.45834"
|
||||||
|
sodipodi:cy="671.60583"
|
||||||
|
sodipodi:r1="60.973591"
|
||||||
|
sodipodi:r2="37.364418"
|
||||||
|
sodipodi:arg1="0.87061839"
|
||||||
|
sodipodi:arg2="0.99902889"
|
||||||
|
inkscape:flatsided="false"
|
||||||
|
inkscape:rounded="0"
|
||||||
|
inkscape:randomized="0"
|
||||||
|
d="m 276.74691,718.23402 -19.06996,-15.20673 6.23968,23.51249 -14.68908,-19.47149 0.19632,24.32554 -9.38523,-22.51278 -5.85936,23.61014 -3.49167,-24.13951 -11.54688,21.41122 2.62127,-24.24948 -16.50886,17.86696 8.56952,-22.83575 -20.43354,13.20005 13.97931,-19.98717 -23.0743,7.70373 18.51073,-15.88272 -24.26522,1.72335 21.87906,-10.7803 -23.93146,-4.3653 23.87263,-5.00052 -22.094,-10.17967 24.36621,1.09346 -18.8683,-15.35441 23.32877,7.11874 -14.45703,-19.56438 20.8255,12.69672 -9.13738,-22.54504 17.01368,17.47692 -3.24358,-24.10913 12.13283,21.15898 2.85402,-24.15834 6.48963,23.51155 8.77228,-22.6896 0.43867,24.38679 14.13936,-19.79518 -5.63987,23.72973 18.61801,-15.65696 -11.36402,21.58163 21.92682,-10.53495 -16.37414,18.07749 23.85789,-4.75101 -20.35541,13.43747 24.28988,1.33147 -23.05767,7.95313 23.19564,7.33029 -24.31112,1.96905 20.64393,12.86851 -24.03703,-4.13873 16.7951,17.59816 -22.2526,-9.98648 z"
|
||||||
|
transform="matrix(2.3346891,0,0,2.3346891,-297.98143,-788.87687)"
|
||||||
|
inkscape:transform-center-x="0.48070196"
|
||||||
|
inkscape:transform-center-y="0.080663394" />
|
||||||
|
<rect
|
||||||
|
ry="14.623538"
|
||||||
|
rx="14.623538"
|
||||||
|
y="778.16095"
|
||||||
|
x="189.31395"
|
||||||
|
height="91.847595"
|
||||||
|
width="133.37183"
|
||||||
|
id="rect3529"
|
||||||
|
style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#4b4f2f;stroke-width:4.12070131;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
|
||||||
|
<path
|
||||||
|
inkscape:connector-curvature="0"
|
||||||
|
style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#4b4f2f;stroke-width:4.12070131;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
|
||||||
|
d="m 254.33815,626.00818 c -27.93766,0 -50.4195,22.48185 -50.4195,50.41951 l 0,93.04182 c 0,27.93768 22.48184,50.44562 50.4195,50.44562 l 3.3229,0 c 27.93773,0 50.4195,-22.50794 50.4195,-50.44562 l 0,-93.04182 c 0,-27.93766 -22.48177,-50.41951 -50.4195,-50.41951 l -3.3229,0 z m 1.67456,16.74544 c 20.12817,0 35.95034,15.82142 35.95034,35.47939 l 0,74.46486 c 0,19.65806 -15.82217,35.47941 -35.95034,35.47941 -20.1282,0 -35.97658,-15.82135 -35.97658,-35.47941 l 0,-74.46486 c 0,-19.65797 15.84838,-35.47939 35.97658,-35.47939 z"
|
||||||
|
id="path3531" />
|
||||||
|
<rect
|
||||||
|
ry="3.9737797"
|
||||||
|
rx="3.9737797"
|
||||||
|
y="706.40234"
|
||||||
|
x="171.49129"
|
||||||
|
height="124.14557"
|
||||||
|
width="169.01746"
|
||||||
|
id="rect3533"
|
||||||
|
style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#4b4f2f;stroke-width:4.12070131;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
|
||||||
|
<path
|
||||||
|
sodipodi:nodetypes="cscc"
|
||||||
|
inkscape:connector-curvature="0"
|
||||||
|
id="path3535"
|
||||||
|
d="m 199.31408,796.34234 c 12.41682,10.27683 33.179,17.03328 56.69903,17.03328 23.51804,0 44.25559,-6.75787 56.67285,-17.03328 z"
|
||||||
|
style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#4b4f2f;stroke-width:4.12070131;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
|
||||||
|
<path
|
||||||
|
transform="matrix(0.90538746,0,0,0.90538746,-76.624431,405.57604)"
|
||||||
|
d="m 316.87315,407.66223 a 9.388834,9.388834 0 1 1 -18.77767,0 9.388834,9.388834 0 1 1 18.77767,0 z"
|
||||||
|
sodipodi:ry="9.388834"
|
||||||
|
sodipodi:rx="9.388834"
|
||||||
|
sodipodi:cy="407.66223"
|
||||||
|
sodipodi:cx="307.48431"
|
||||||
|
id="path3537"
|
||||||
|
style="color:#000000;fill:#4b4f2f;fill-opacity:1;fill-rule:nonzero;stroke:#4b4f2f;stroke-width:4.55131245;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
|
||||||
|
sodipodi:type="arc" />
|
||||||
|
<path
|
||||||
|
transform="matrix(0.90538746,0,0,0.90538746,36.007648,405.57604)"
|
||||||
|
sodipodi:type="arc"
|
||||||
|
style="color:#000000;fill:#4b4f2f;fill-opacity:1;fill-rule:nonzero;stroke:#4b4f2f;stroke-width:4.55131245;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
|
||||||
|
id="path3539"
|
||||||
|
sodipodi:cx="307.48431"
|
||||||
|
sodipodi:cy="407.66223"
|
||||||
|
sodipodi:rx="9.388834"
|
||||||
|
sodipodi:ry="9.388834"
|
||||||
|
d="m 316.87315,407.66223 a 9.388834,9.388834 0 1 1 -18.77767,0 9.388834,9.388834 0 1 1 18.77767,0 z" />
|
||||||
|
<g
|
||||||
|
id="g10754"
|
||||||
|
transform="matrix(0.83727181,0,0,0.83727181,829.92363,-416.95697)"
|
||||||
|
style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#4b4f2f;stroke-width:4.92158127;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate">
|
||||||
|
<g
|
||||||
|
id="g5737-8"
|
||||||
|
transform="translate(-898.12108,631.20806)"
|
||||||
|
style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#4b4f2f;stroke-width:4.92158127;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate">
|
||||||
|
<rect
|
||||||
|
style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#4b4f2f;stroke-width:4.92158127;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
|
||||||
|
id="rect5739-5"
|
||||||
|
width="29.344997"
|
||||||
|
height="96.371902"
|
||||||
|
x="153.20558"
|
||||||
|
y="918.29181"
|
||||||
|
rx="0.84849852"
|
||||||
|
ry="0.95320696" />
|
||||||
|
<path
|
||||||
|
sodipodi:nodetypes="cscc"
|
||||||
|
inkscape:connector-curvature="0"
|
||||||
|
id="path5741-6"
|
||||||
|
d="m 192.11794,916.83294 c -7.43536,-12.87842 -23.7891,-17.26042 -36.66754,-9.82505 -12.87845,7.43537 -17.26039,23.78913 -9.82503,36.66755 z"
|
||||||
|
style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#4b4f2f;stroke-width:4.92158127;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
|
||||||
|
<rect
|
||||||
|
ry="3"
|
||||||
|
rx="3"
|
||||||
|
y="1010.0776"
|
||||||
|
x="133.00574"
|
||||||
|
height="11.311689"
|
||||||
|
width="69.74469"
|
||||||
|
id="rect5743-2"
|
||||||
|
style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#4b4f2f;stroke-width:4.92158127;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
|
||||||
|
<path
|
||||||
|
style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#4b4f2f;stroke-width:4.92158127;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
|
||||||
|
d="m 145.00574,916.83294 c 7.43536,-12.87842 23.7891,-17.26042 36.66754,-9.82505 12.87845,7.43537 17.26039,23.78913 9.82503,36.66755 z"
|
||||||
|
id="path5745-2"
|
||||||
|
inkscape:connector-curvature="0"
|
||||||
|
sodipodi:nodetypes="cscc" />
|
||||||
|
<rect
|
||||||
|
ry="7.1440544"
|
||||||
|
rx="7.1440544"
|
||||||
|
y="968.78937"
|
||||||
|
x="145.20558"
|
||||||
|
height="14.288109"
|
||||||
|
width="45.344997"
|
||||||
|
id="rect5747-2"
|
||||||
|
style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#4b4f2f;stroke-width:4.92158127;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
|
||||||
|
</g>
|
||||||
|
<g
|
||||||
|
id="g5749-5"
|
||||||
|
transform="matrix(-1,0,0,1,-472.81628,631.20806)"
|
||||||
|
style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#4b4f2f;stroke-width:4.92158127;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate">
|
||||||
|
<rect
|
||||||
|
ry="0.95320696"
|
||||||
|
rx="0.84849852"
|
||||||
|
y="918.29181"
|
||||||
|
x="153.20558"
|
||||||
|
height="96.371902"
|
||||||
|
width="29.344997"
|
||||||
|
id="rect5751-5"
|
||||||
|
style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#4b4f2f;stroke-width:4.92158127;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
|
||||||
|
<path
|
||||||
|
style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#4b4f2f;stroke-width:4.92158127;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
|
||||||
|
d="m 192.11794,916.83294 c -7.43536,-12.87842 -23.7891,-17.26042 -36.66754,-9.82505 -12.87845,7.43537 -17.26039,23.78913 -9.82503,36.66755 z"
|
||||||
|
id="path5753-0"
|
||||||
|
inkscape:connector-curvature="0"
|
||||||
|
sodipodi:nodetypes="cscc" />
|
||||||
|
<rect
|
||||||
|
style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#4b4f2f;stroke-width:4.92158127;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
|
||||||
|
id="rect5755-0"
|
||||||
|
width="69.74469"
|
||||||
|
height="11.311689"
|
||||||
|
x="133.00574"
|
||||||
|
y="1010.0776"
|
||||||
|
rx="3"
|
||||||
|
ry="3" />
|
||||||
|
<path
|
||||||
|
sodipodi:nodetypes="cscc"
|
||||||
|
inkscape:connector-curvature="0"
|
||||||
|
id="path5757-1"
|
||||||
|
d="m 145.00574,916.83294 c 7.43536,-12.87842 23.7891,-17.26042 36.66754,-9.82505 12.87845,7.43537 17.26039,23.78913 9.82503,36.66755 z"
|
||||||
|
style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#4b4f2f;stroke-width:4.92158127;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
|
||||||
|
<rect
|
||||||
|
style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#4b4f2f;stroke-width:4.92158127;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
|
||||||
|
id="rect5759-7"
|
||||||
|
width="45.344997"
|
||||||
|
height="14.288109"
|
||||||
|
x="145.20558"
|
||||||
|
y="968.78937"
|
||||||
|
rx="7.1440544"
|
||||||
|
ry="7.1440544" />
|
||||||
|
</g>
|
||||||
|
</g>
|
||||||
|
<g
|
||||||
|
transform="matrix(0.83727181,0,0,0.83727181,84.650265,61.513651)"
|
||||||
|
id="g5697-5"
|
||||||
|
style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#4b4f2f;stroke-width:4.92158127;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate">
|
||||||
|
<path
|
||||||
|
sodipodi:nodetypes="cccccc"
|
||||||
|
inkscape:connector-curvature="0"
|
||||||
|
id="path5699-6"
|
||||||
|
d="m 326.98547,847.70808 57.45819,0 0,-73.83379 -10,0 0,61.83379 -47.45819,0"
|
||||||
|
style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#4b4f2f;stroke-width:4.92158127;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
|
||||||
|
<rect
|
||||||
|
style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#4b4f2f;stroke-width:4.92158127;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
|
||||||
|
id="rect5703-1"
|
||||||
|
width="9.4107542"
|
||||||
|
height="42.249756"
|
||||||
|
x="305.50339"
|
||||||
|
y="821.53503"
|
||||||
|
rx="4.7053771"
|
||||||
|
ry="4.7053771" />
|
||||||
|
<path
|
||||||
|
inkscape:connector-curvature="0"
|
||||||
|
style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#4b4f2f;stroke-width:4.92158127;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
|
||||||
|
d="m 390.56742,727.10519 c -6.09957,0 -11,4.90043 -11,11 l 0,10.15625 -10.15625,0 c -6.09957,0 -11,4.90043 -11,11 0,6.09957 4.90043,11 11,11 l 21.15625,0 c 6.09957,0 11,-4.90043 11,-11 l 0,-21.15625 c 0,-6.09957 -4.90043,-11 -11,-11 z"
|
||||||
|
id="path5705-8" />
|
||||||
|
<rect
|
||||||
|
ry="2.1935852"
|
||||||
|
rx="4.0765176"
|
||||||
|
y="771.6814"
|
||||||
|
x="369.11923"
|
||||||
|
height="12.20938"
|
||||||
|
width="21.740107"
|
||||||
|
id="rect5707-1"
|
||||||
|
style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#4b4f2f;stroke-width:4.92158127;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
|
||||||
|
<rect
|
||||||
|
ry="2.9156427"
|
||||||
|
rx="7.0489321"
|
||||||
|
y="829.57007"
|
||||||
|
x="318.22556"
|
||||||
|
height="26.179665"
|
||||||
|
width="14.097864"
|
||||||
|
id="rect5709-1"
|
||||||
|
style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#4b4f2f;stroke-width:4.92158127;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
|
||||||
|
<g
|
||||||
|
id="g5711-2"
|
||||||
|
transform="translate(-34.057657,-0.65450616)"
|
||||||
|
style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#4b4f2f;stroke-width:4.92158127;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate">
|
||||||
|
<path
|
||||||
|
inkscape:connector-curvature="0"
|
||||||
|
id="path5713-1"
|
||||||
|
d="m 404.77705,825.97291 -9.16957,15.86559 9.16957,15.84038 18.38979,0 9.19491,-15.84038 -9.19491,-15.86559 -18.38979,0 z"
|
||||||
|
style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#4b4f2f;stroke-width:4.92158127;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
|
||||||
|
<path
|
||||||
|
inkscape:connector-curvature="0"
|
||||||
|
id="path5715-3"
|
||||||
|
d="m 413.97195,836.00644 c 3.23493,0 5.85942,2.61224 5.85942,5.83206 0,3.21983 -2.62449,5.83207 -5.85942,5.83207 -3.23494,0 -5.85943,-2.61224 -5.85943,-5.83207 0,-3.21982 2.62449,-5.83206 5.85943,-5.83206 z"
|
||||||
|
style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#4b4f2f;stroke-width:4.92158127;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
|
||||||
|
</g>
|
||||||
|
</g>
|
||||||
|
<g
|
||||||
|
transform="matrix(-0.83727181,0,0,-0.83727181,427.34978,1471.4837)"
|
||||||
|
id="g10957"
|
||||||
|
style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#4b4f2f;stroke-width:4.92158127;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate">
|
||||||
|
<path
|
||||||
|
sodipodi:nodetypes="cccccc"
|
||||||
|
inkscape:connector-curvature="0"
|
||||||
|
id="path10959"
|
||||||
|
d="m 326.98547,847.70808 57.45819,0 0,-73.83379 -10,0 0,61.83379 -47.45819,0"
|
||||||
|
style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#4b4f2f;stroke-width:4.92158127;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
|
||||||
|
<rect
|
||||||
|
style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#4b4f2f;stroke-width:4.92158127;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
|
||||||
|
id="rect10961"
|
||||||
|
width="9.4107542"
|
||||||
|
height="42.249756"
|
||||||
|
x="305.50339"
|
||||||
|
y="821.53503"
|
||||||
|
rx="4.7053771"
|
||||||
|
ry="4.7053771" />
|
||||||
|
<path
|
||||||
|
inkscape:connector-curvature="0"
|
||||||
|
style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#4b4f2f;stroke-width:4.92158127;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
|
||||||
|
d="m 390.56742,727.10519 c -6.09957,0 -11,4.90043 -11,11 l 0,10.15625 -10.15625,0 c -6.09957,0 -11,4.90043 -11,11 0,6.09957 4.90043,11 11,11 l 21.15625,0 c 6.09957,0 11,-4.90043 11,-11 l 0,-21.15625 c 0,-6.09957 -4.90043,-11 -11,-11 z"
|
||||||
|
id="path10963" />
|
||||||
|
<rect
|
||||||
|
ry="2.1935852"
|
||||||
|
rx="4.0765176"
|
||||||
|
y="771.6814"
|
||||||
|
x="369.11923"
|
||||||
|
height="12.20938"
|
||||||
|
width="21.740107"
|
||||||
|
id="rect10965"
|
||||||
|
style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#4b4f2f;stroke-width:4.92158127;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
|
||||||
|
<rect
|
||||||
|
ry="2.9156427"
|
||||||
|
rx="7.0489321"
|
||||||
|
y="829.57007"
|
||||||
|
x="318.22556"
|
||||||
|
height="26.179665"
|
||||||
|
width="14.097864"
|
||||||
|
id="rect10967"
|
||||||
|
style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#4b4f2f;stroke-width:4.92158127;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
|
||||||
|
<g
|
||||||
|
id="g10969"
|
||||||
|
transform="translate(-34.057657,-0.65450616)"
|
||||||
|
style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#4b4f2f;stroke-width:4.92158127;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate">
|
||||||
|
<path
|
||||||
|
inkscape:connector-curvature="0"
|
||||||
|
id="path10971"
|
||||||
|
d="m 404.77705,825.97291 -9.16957,15.86559 9.16957,15.84038 18.38979,0 9.19491,-15.84038 -9.19491,-15.86559 -18.38979,0 z"
|
||||||
|
style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#4b4f2f;stroke-width:4.92158127;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
|
||||||
|
<path
|
||||||
|
inkscape:connector-curvature="0"
|
||||||
|
id="path10973"
|
||||||
|
d="m 413.97195,836.00644 c 3.23493,0 5.85942,2.61224 5.85942,5.83206 0,3.21983 -2.62449,5.83207 -5.85942,5.83207 -3.23494,0 -5.85943,-2.61224 -5.85943,-5.83207 0,-3.21982 2.62449,-5.83206 5.85943,-5.83206 z"
|
||||||
|
style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#4b4f2f;stroke-width:4.92158127;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
|
||||||
|
</g>
|
||||||
|
</g>
|
||||||
|
<rect
|
||||||
|
ry="12.863822"
|
||||||
|
rx="12.863822"
|
||||||
|
y="836.96265"
|
||||||
|
x="214.05772"
|
||||||
|
height="25.727644"
|
||||||
|
width="83.8843"
|
||||||
|
id="rect5685-1"
|
||||||
|
style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#4b4f2f;stroke-width:4.12070131;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
|
||||||
|
</g>
|
||||||
|
</svg>
|
||||||
|
After Width: | Height: | Size: 24 KiB |
Loading…
Reference in New Issue
Block a user