kumi/andOTP
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into feature/311

Browse source
This commit is contained in:
Jakob Nixdorf 2019-10-31 07:22:31 +01:00 committed by GitHub
commit c2efe24c7b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
23 changed files with 271 additions and 274 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
.gitignore vendored
View file

@ -1,11 +1,17 @@
*.iml
.gradle
# Local config files
crowdin.properties
/local.properties
/.idea/workspace.xml
/.idea/libraries
/.idea/markdown-navigator*
/.idea/caches
local.properties
# IntelliJ
*.iml
.idea
# Gradle
.gradle
build
# Android Studio
captures
# OS files
.DS_Store
/build
/captures

35
.idea/assetWizardSettings.xml
View file

@ -1,35 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="WizardSettings">
<option name="children">
<map>
<entry key="vectorWizard">
<value>
<PersistentState>
<option name="children">
<map>
<entry key="vectorAssetStep">
<value>
<PersistentState>
<option name="values">
<map>
<entry key="assetSourceType" value="FILE" />
<entry key="height" value="128" />
<entry key="outputName" value="thumb_instagram" />
<entry key="overrideSize" value="true" />
<entry key="sourceFile" value="$PROJECT_DIR$/../../../downloads/instagram.svg" />
<entry key="width" value="128" />
</map>
</option>
</PersistentState>
</value>
</entry>
</map>
</option>
</PersistentState>
</value>
</entry>
</map>
</option>
</component>
</project>

29
.idea/codeStyles/Project.xml
View file

@ -1,29 +0,0 @@
<component name="ProjectCodeStyleConfiguration">
<code_scheme name="Project" version="173">
<Objective-C-extensions>
<file>
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Import" />
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Macro" />
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Typedef" />
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Enum" />
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Constant" />
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Global" />
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Struct" />
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="FunctionPredecl" />
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Function" />
</file>
<class>
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Property" />
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Synthesize" />
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="InitMethod" />
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="StaticMethod" />
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="InstanceMethod" />
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="DeallocMethod" />
</class>
<extensions>
<pair source="cpp" header="h" fileNamingConvention="NONE" />
<pair source="c" header="h" fileNamingConvention="NONE" />
</extensions>
</Objective-C-extensions>
</code_scheme>
</component>

18
.idea/gradle.xml
View file

@ -1,18 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="GradleSettings">
<option name="linkedExternalProjectsSettings">
<GradleProjectSettings>
<option name="distributionType" value="DEFAULT_WRAPPED" />
<option name="externalProjectPath" value="$PROJECT_DIR$" />
<option name="modules">
<set>
<option value="$PROJECT_DIR$" />
<option value="$PROJECT_DIR$/app" />
</set>
</option>
<option name="resolveModulePerSourceSet" value="false" />
</GradleProjectSettings>
</option>
</component>
</project>

14
.idea/misc.xml
View file

@ -1,14 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="CMakeSettings">
<configurations>
<configuration PROFILE_NAME="Debug" CONFIG_NAME="Debug" />
</configurations>
</component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/build/classes" />
</component>
<component name="ProjectType">
<option name="id" value="Android" />
</component>
</project>

9
.idea/modules.xml
View file

@ -1,9 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectModuleManager">
<modules>
<module fileurl="file://$PROJECT_DIR$/andOTP.iml" filepath="$PROJECT_DIR$/andOTP.iml" />
<module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
</modules>
</component>
</project>

12
.idea/runConfigurations.xml
View file

@ -1,12 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="RunConfigurationProducerService">
<option name="ignoredProducers">
<set>
<option value="org.jetbrains.plugins.gradle.execution.test.runner.AllInPackageGradleConfigurationProducer" />
<option value="org.jetbrains.plugins.gradle.execution.test.runner.TestClassGradleConfigurationProducer" />
<option value="org.jetbrains.plugins.gradle.execution.test.runner.TestMethodGradleConfigurationProducer" />
</set>
</option>
</component>
</project>

6
.idea/vcs.xml
View file

@ -1,6 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="VcsDirectoryMappings">
<mapping directory="" vcs="Git" />
</component>
</project>

14
README.md
View file

@ -61,7 +61,7 @@ key, which renders them useless.
### Opening the backups on your PC:
* [OpenPGP](http://openpgp.org/): OpenPGP can be used to easily decrypt the **OpenPGP-encrypted backups** on your PC.
* [OpenPGP](https://openpgp.org/): OpenPGP can be used to easily decrypt the **OpenPGP-encrypted backups** on your PC.
* [WebDecrypt](https://flocke.shadowice.org/andOTP/decrypt/): JavaScript-based decryption of the **new password-protected backup format** in the browser ([source code](https://github.com/andOTP/WebDecrypt)).
* [andOTP-decrypt](https://github.com/asmw/andOTP-decrypt): Python script written by @asmw to decrypt the **old password-protected backup format** on your PC.
@ -89,16 +89,18 @@ So make sure you have a **current backup** before switching!
* **Translation**: If you want to help translate andOTP into your language head over to the [Crowdin project](https://crowdin.com/project/andotp).
* **Bug reports and feature requests**: You can report bugs and request features in the [Issue tracker](https://github.com/andOTP/andOTP/issues) on GitHub.
* **Requesting thumbnails**: If you are missing a thumbnail you can request it by editing the [wiki](https://github.com/andOTP/andOTP/wiki/Thumbnails#thumbnail-requests)
* **Requesting thumbnails**: If you are missing a thumbnail you can request it by [opening an issue](https://github.com/andOTP/andOTP/issues/new).
* **Discussion and support**:
- [XDA thread](https://forum.xda-developers.com/android/apps-games/app-andotp-android-otp-authenticator-t3636993) (please keep off-topic to a minimum)
- Telegram group [@andOTP](https://t.me/andOTP) (if you just want important updates you can mute the group so you only get notified about pinned messages)
- Matrix channel [#andOTP:privacytools.io](https://matrix.to/#/#andOTP:privacytools.io)
#### Developers:
#### Donations:
* [Jakob Nixdorf](https://github.com/flocke) (Telegram: [@flocke000](https://t.me/flocke000), Reddit: [/u/flocke000](https://www.reddit.com/user/flocke000))
* [Richy HBM](https://github.com/RichyHBM)
If you want to show your appreciation for our work with a small donation you can do so using the following links:
* [Donate to Jakob Nixdorf](https://flocke.shadowice.org/donate.html) (Main developer, maintainer)
* [Donate to Richy HBM](https://richyhbm.co.uk/donate) (Developer)
## Screenshots:
#### Light theme:
@ -136,7 +138,7 @@ So make sure you have a **current backup** before switching!
* [Android-ItemTouchHelper-Demo](https://github.com/iPaulPro/Android-ItemTouchHelper-Demo/tree/master/app/src/main/java/co/paulburke/android/itemtouchhelperdemo/helper)
* [Code Parts from Google's Android Samples](https://android.googlesource.com/platform/development/+/master/samples/Vault/src/com/example/android/vault)
* [LetterBitmap](http://stackoverflow.com/questions/23122088/colored-boxed-with-letters-a-la-gmail)
* [LetterBitmap](https://stackoverflow.com/questions/23122088/colored-boxed-with-letters-a-la-gmail)
* [DimensionConverter](https://stackoverflow.com/questions/8343971/how-to-parse-a-dimension-string-and-convert-it-to-a-dimension-value)
#### Previously used open-source components:

11
app/src/main/java/org/shadowice/flocke/andotp/Activities/MainActivity.java
View file

@ -330,11 +330,22 @@ public class MainActivity extends BaseActivity
setFilterString(this.filterString);
}
View cardList = findViewById(R.id.cardList);
if(cardList.getVisibility() == View.INVISIBLE)
cardList.setVisibility(View.VISIBLE);
startUpdater();
}
@Override
public void onPause() {
if(settings.getAuthMethod() == AuthMethod.DEVICE)
runOnUiThread(new Runnable() {
@Override
public void run() {
findViewById(R.id.cardList).setVisibility(View.INVISIBLE);
}
});
super.onPause();
stopUpdater();
}

8
app/src/main/java/org/shadowice/flocke/andotp/Activities/ThemedActivity.java
View file

@ -24,10 +24,13 @@ package org.shadowice.flocke.andotp.Activities;
import android.content.res.Configuration;
import android.content.res.Resources;
import android.os.Build;
import android.os.Bundle;
import android.support.v7.app.AppCompatActivity;
import org.shadowice.flocke.andotp.R;
import org.shadowice.flocke.andotp.Utilities.Settings;
import org.shadowice.flocke.andotp.Utilities.Tools;
import java.util.Locale;
@ -41,6 +44,11 @@ public abstract class ThemedActivity extends AppCompatActivity {
setTheme(settings.getTheme());
setLocale();
//Set navigation bar color
if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
getWindow().setNavigationBarColor(Tools.getThemeColor(this,R.attr.navigationBarColor));
}
super.onCreate(savedInstanceState);
}

28
app/src/main/java/org/shadowice/flocke/andotp/Fragments/BaseAboutFragment.java
View file

@ -36,18 +36,16 @@ public class BaseAboutFragment extends Fragment {
private static final String AUTHOR_ORIGINAL_GITHUB = "https://github.com/0xbb";
private static final String AUTHOR_ORIGINAL_EXTRA = AUTHOR_ORIGINAL_GITHUB + "/otp-authenticator";
private static final String CONTRIBUTORS_URI = GITHUB_URI + "/blob/master/README.md#contributors";
private static final String TRANSLATORS_URI = GITHUB_URI + "/blob/master/README.md#translators";
private static final String CONTRIBUTORS_URI = GITHUB_URI + "/graphs/contributors";
private static final String BUGREPORT_URI = GITHUB_URI + "/issues";
private static final String TRANSLATE_URI = "https://crowdin.com/project/andotp";
private static final String SUPPORT_URI = GITHUB_URI + "/blob/master/README.md#contribute";
private Settings settings;
static final int[] imageResources = {
R.id.aboutImgVersion, R.id.aboutImgLicense, R.id.aboutImgChangelog, R.id.aboutImgSource,
R.id.aboutImgAuthor2, R.id.aboutImgAuthorOriginal, R.id.aboutImgContributors,
R.id.aboutImgTranslators, R.id.aboutImgBugs, R.id.aboutImgTranslate
R.id.aboutImgSupport
};
static long lastTap = 0;
@ -170,32 +168,18 @@ public class BaseAboutFragment extends Fragment {
});
LinearLayout contributors = v.findViewById(R.id.about_layout_contributors);
LinearLayout translators = v.findViewById(R.id.about_layout_translators);
contributors.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
openURI(CONTRIBUTORS_URI);
}
});
translators.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
openURI(TRANSLATORS_URI);
}
});
LinearLayout bugReport = v.findViewById(R.id.about_layout_bugs);
LinearLayout translate = v.findViewById(R.id.about_layout_translate);
bugReport.setOnClickListener(new View.OnClickListener() {
LinearLayout supportLayout = v.findViewById(R.id.about_layout_support);
supportLayout.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
openURI(BUGREPORT_URI);
}
});
translate.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
openURI(TRANSLATE_URI);
openURI(SUPPORT_URI);
}
});

3
app/src/main/java/org/shadowice/flocke/andotp/Utilities/EntryThumbnail.java
View file

@ -127,6 +127,7 @@ public class EntryThumbnail {
Kraken(R.drawable.thumb_kraken),
Kucoin(R.drawable.thumb_kucoin),
LastPass(R.drawable.thumb_lastpass),
LibreNMS(R.drawable.thumb_librenms),
Lichess(R.drawable.thumb_lichess),
LinkedIn(R.drawable.thumb_linkedin),
Linode(R.drawable.thumb_linode),
@ -158,6 +159,7 @@ public class EntryThumbnail {
Okta(R.drawable.thumb_okta),
OnlineNet(R.drawable.thumb_online),
OpenVZ(R.drawable.thumb_openvz),
OPNsense(R.drawable.thumb_opnsense),
Origin(R.drawable.thumb_origin),
OVH(R.drawable.thumb_ovh),
Packet(R.drawable.thumb_packet),
@ -170,6 +172,7 @@ public class EntryThumbnail {
phpMyAdmin(R.drawable.thumb_phpmyadmin),
Plurk(R.drawable.thumb_plurk),
Posteo(R.drawable.thumb_posteo),
PrivateInternetAccess(R.drawable.thumb_private_internet_access),
ProtonMail(R.drawable.thumb_protonmail),
Proxmox(R.drawable.thumb_proxmox),
PyPI(R.drawable.thumb_pypi),

9
app/src/main/res/drawable/ic_bug_report_gray.xml
View file

@ -1,9 +0,0 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:fillColor="#FF727272"
android:pathData="M20,8h-2.81c-0.45,-0.78 -1.07,-1.45 -1.82,-1.96L17,4.41 15.59,3l-2.17,2.17C12.96,5.06 12.49,5 12,5c-0.49,0 -0.96,0.06 -1.41,0.17L8.41,3 7,4.41l1.62,1.63C7.88,6.55 7.26,7.22 6.81,8L4,8v2h2.09c-0.05,0.33 -0.09,0.66 -0.09,1v1L4,12v2h2v1c0,0.34 0.04,0.67 0.09,1L4,16v2h2.81c1.04,1.79 2.97,3 5.19,3s4.15,-1.21 5.19,-3L20,18v-2h-2.09c0.05,-0.33 0.09,-0.66 0.09,-1v-1h2v-2h-2v-1c0,-0.34 -0.04,-0.67 -0.09,-1L20,10L20,8zM14,16h-4v-2h4v2zM14,12h-4v-2h4v2z"/>
</vector>

9
app/src/main/res/drawable/ic_heart_gray.xml Normal file
View file

@ -0,0 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:fillColor="#FF727272"
android:pathData="M12,21.35l-1.45,-1.32C5.4,15.36 2,12.28 2,8.5 2,5.42 4.42,3 7.5,3c1.74,0 3.41,0.81 4.5,2.09C13.09,3.81 14.76,3 16.5,3 19.58,3 22,5.42 22,8.5c0,3.78 -3.4,6.86 -8.55,11.54L12,21.35z"/>
</vector>

9
app/src/main/res/drawable/ic_translate_gray.xml
View file

@ -1,9 +0,0 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:fillColor="#FF727272"
android:pathData="M12.87,15.07l-2.54,-2.51 0.03,-0.03c1.74,-1.94 2.98,-4.17 3.71,-6.53L17,6L17,4h-7L10,2L8,2v2L1,4v1.99h11.17C11.5,7.92 10.44,9.75 9,11.35 8.07,10.32 7.3,9.19 6.69,8h-2c0.73,1.63 1.73,3.17 2.98,4.56l-5.09,5.02L4,19l5,-5 3.11,3.11 0.76,-2.04zM18.5,10h-2L12,22h2l1.12,-3h4.75L21,22h2l-4.5,-12zM15.88,17l1.62,-4.33L19.12,17h-3.24z"/>
</vector>

14
app/src/main/res/drawable/thumb_librenms.xml Normal file
View file

@ -0,0 +1,14 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="128dp"
android:height="128dp"
android:viewportWidth="128"
android:viewportHeight="128">
<path
android:pathData="m71.517,44.187 l12.296,12.296 -4.839,4.879 -12.296,-12.296zM94.007,21.737 L106.303,34.033 101.424,38.912 89.128,26.615zM93.214,65.924 L105.589,78.22 100.71,83.099 88.018,70.803zM115.704,43.473 L128,55.769 123.161,60.648 110.865,47.955zM67.035,34.35 L79.331,22.054 84.249,26.933 71.953,39.229zM88.732,56.166 L101.028,43.87 105.946,48.63 93.65,60.926zM110.468,77.823 L122.764,65.527 127.643,70.366 115.347,82.662zM44.545,56.88 L56.841,44.584 61.759,49.423 49.463,61.719zM66.241,78.537 L78.617,66.241 83.456,71.12 71.16,83.416zM87.978,100.353 L100.274,87.978 105.193,92.856 92.896,105.549z"
android:strokeWidth="0.26458332"
android:fillColor="#575756"/>
<path
android:pathData="m26.576,89.088 l12.376,12.296 -4.839,4.918 -12.376,-12.376zM49.066,66.638 L61.362,78.934 56.523,83.813 44.227,71.517zM48.391,110.825 L60.688,123.121 55.809,128 43.513,115.704zM70.802,88.374 L83.098,100.671 78.259,105.549 65.963,93.253zM4.879,67.352 L17.175,79.648 12.296,84.487 0,72.191zM27.369,44.901 L39.665,57.197 34.787,62.076 22.49,49.78zM49.78,22.451 L62.076,34.747 57.316,39.665 45.02,27.369zM72.191,-0 L84.566,12.296 79.687,17.175 66.995,4.879zM45.337,12.693 L57.634,0.397 62.512,5.236 50.216,17.532zM22.847,35.183 L35.143,22.887 40.062,27.766 27.766,40.062zM0.397,57.673 L12.693,45.377 17.572,50.137 5.276,62.513zM22.054,79.331 L34.35,67.034 39.269,71.913 26.972,84.21zM43.79,101.067 L56.087,88.771 60.966,93.61 48.669,105.906zM65.448,122.804 L77.823,110.508 82.702,115.267 70.406,127.643z"
android:strokeWidth="0.26458332"
android:fillColor="#db202e"/>
</vector>

31
app/src/main/res/drawable/thumb_opnsense.xml Normal file
View file

@ -0,0 +1,31 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="128dp"
android:height="128dp"
android:viewportWidth="128"
android:viewportHeight="128">
<path
android:pathData="m19.747,45.145c-0.04,0.287 -0.109,2.458 -0.155,4.826l-0.083,4.304 4.612,2.237 4.612,2.238 -14.366,0.007L0.001,58.763l0,5.164 0,5.164l14.113,0.031 14.113,0.031 -4.341,2.214 -4.341,2.214 0.014,2.89c0.008,1.59 0.049,3.78 0.092,4.867l0.077,1.977 2.854,-1.463c1.57,-0.805 4.51,-2.285 6.533,-3.289 2.023,-1.004 7.018,-3.535 11.1,-5.623l7.421,-3.797L47.635,63.936 47.635,58.729l-7.928,-4.049c-4.361,-2.227 -9.669,-4.909 -11.797,-5.96 -2.128,-1.052 -3.926,-1.953 -3.996,-2.002 -0.07,-0.05 -1.019,-0.541 -2.11,-1.092l-1.984,-1.002 -0.072,0.521m85.29,1.03c-1.64,0.843 -3.609,1.842 -4.377,2.221 -0.768,0.379 -5.661,2.853 -10.875,5.498l-9.479,4.808 -0.003,5.182 -0.003,5.183 9.038,4.608c4.971,2.534 9.638,4.898 10.371,5.253 0.732,0.355 2.95,1.474 4.927,2.486 1.978,1.012 3.621,1.816 3.652,1.785 0.031,-0.03 0.092,-2.206 0.134,-4.836l0.077,-4.781 -4.32,-2.214 -4.32,-2.214 14.068,-0.031 14.068,-0.031l0,-5.164 0,-5.164l-14.43,-0.007 -14.43,-0.007 4.662,-2.269 4.662,-2.269 -0.017,-2.244c-0.031,-3.973 -0.166,-7.265 -0.3,-7.296 -0.07,-0.017 -1.468,0.659 -3.108,1.502"
android:fillColor="#d3732c"
android:strokeColor="#00000000"
android:fillType="evenOdd"/>
<path
android:pathData="M12.179,0.244C7.005,1.52 2.266,5.764 0.723,10.503 0.044,12.59 0.001,13.097 0.002,19.024l0.001,5.49 13.904,7.194c7.647,3.957 14.397,7.421 15,7.697 0.603,0.277 4.978,2.511 9.722,4.965 4.744,2.454 8.726,4.512 8.848,4.574 0.21,0.106 0.222,-0.16 0.222,-4.796L47.699,39.24L38.39,34.429C33.27,31.783 29.038,29.617 28.986,29.617 28.858,29.617 20.337,25.208 19.849,24.889 19.636,24.75 17.366,23.558 14.803,22.239l-4.66,-2.398 0.035,-2.829c0.045,-3.618 0.52,-4.796 2.279,-5.645l0.66,-0.319l52.366,0 52.366,0l-0.001,4.396 -0.001,4.397 -4.652,2.398c-2.558,1.319 -4.827,2.511 -5.042,2.65 -0.487,0.315 -9.014,4.729 -9.135,4.729 -0.049,0 -4.28,2.167 -9.404,4.816l-9.315,4.816l0,4.902 0,4.902l0.368,-0.185c0.203,-0.102 4.47,-2.303 9.483,-4.893 5.013,-2.589 9.268,-4.763 9.456,-4.83 0.189,-0.067 6.653,-3.387 14.366,-7.377L127.996,24.514 127.997,12.257 127.998,0 70.501,0.02C17.484,0.039 12.939,0.057 12.179,0.244m27.655,82.54c-4.291,2.222 -9.172,4.722 -10.846,5.557 -1.675,0.834 -8.867,4.53 -15.984,8.213L0.065,103.249 0.032,115.625 0,128l58.333,0c57.968,0 58.34,-0.002 59.337,-0.247 4.434,-1.09 8.166,-4.916 9.942,-10.19l0.388,-1.152 -0.033,-6.586 -0.033,-6.586 -13.637,-7.062c-7.5,-3.884 -14.151,-7.299 -14.778,-7.588 -0.628,-0.29 -5.21,-2.632 -10.181,-5.204l-9.04,-4.677 0.033,4.932 0.033,4.932 9.823,5.079c5.403,2.793 9.868,5.079 9.922,5.079 0.124,0 7.728,3.935 7.905,4.091 0.072,0.063 2.3,1.237 4.951,2.609l4.82,2.494l0,3.123 0,3.123l-0.431,0.848c-0.728,1.433 -1.794,2.248 -3.301,2.525 -0.452,0.083 -17.909,0.125 -52.293,0.125L10.147,117.67l0.033,-4.873 0.033,-4.872 4.82,-2.494c2.651,-1.371 4.878,-2.543 4.947,-2.605 0.166,-0.145 7.803,-4.096 7.918,-4.096 0.116,0 19.568,-10.057 19.701,-10.185 0.056,-0.054 0.087,-2.282 0.068,-4.95l-0.033,-4.852 -7.801,4.04"
android:fillColor="#939393"
android:strokeColor="#00000000"
android:fillType="evenOdd"/>
<path
android:pathData="m20.073,22.631 l0.034,2.36 4.44,2.306 4.44,2.306 35.012,0.002 35.012,0.002 4.44,-2.303 4.44,-2.302 0.034,-2.366 0.035,-2.366L64,20.271 20.039,20.271l0.035,2.36m69.911,21.478 l-9.407,4.877 9.392,0.032 9.392,0.032 5.216,-2.659c9.67,-4.93 13.271,-6.832 13.271,-7.008 0,-0.147 -1.386,-0.171 -9.229,-0.162l-9.229,0.011 -9.407,4.878m-79.933,0.11 l0.029,4.891 0.066,-4.743 0.066,-4.743 3.171,1.648c1.744,0.906 5.871,3.027 9.17,4.713l5.999,3.065 9.442,-0.031 9.442,-0.032 -9.225,-4.796 -9.225,-4.796 -9.483,-0.033 -9.482,-0.033 0.029,4.891m16.145,35.831c-1.465,0.748 -3.72,1.888 -5.011,2.534 -4.706,2.354 -11.163,5.728 -11.163,5.833 0,0.061 4.047,0.108 9.289,0.108l9.289,0l9.422,-4.869c5.182,-2.678 9.422,-4.891 9.422,-4.919 0,-0.028 -4.182,-0.049 -9.292,-0.048l-9.292,0.002 -2.664,1.36m54.427,-1.26c0.067,0.057 4.321,2.271 9.454,4.919l9.333,4.815l9.294,0c7.338,0 9.282,-0.032 9.241,-0.152 -0.051,-0.149 -4.175,-2.331 -8.595,-4.548 -1.221,-0.612 -3.997,-2.019 -6.168,-3.126l-3.949,-2.012l-9.365,0c-5.151,0 -9.31,0.047 -9.244,0.103m-56.678,21.998 l-3.901,2.028l0,2.631 0,2.631L64,108.078 107.955,108.078l0,-2.631 0,-2.631l-3.96,-2.042 -3.96,-2.042 -36.095,0.014 -36.094,0.014 -3.901,2.028"
android:fillColor="#3d3d3d"
android:strokeColor="#00000000"
android:fillType="evenOdd"/>
<path
android:pathData="m113.092,42.05c-2.581,1.345 -4.722,2.46 -4.757,2.478 -0.035,0.017 -0.047,1.042 -0.026,2.276l0.037,2.244l4.752,0 4.751,0l0,-4.734c0,-2.604 -0.014,-4.729 -0.032,-4.722 -0.017,0.007 -2.144,1.113 -4.725,2.458m-102.942,2.373l0,4.748l4.757,0 4.757,0l0.024,-1.968c0.013,-1.082 0.028,-2.109 0.032,-2.282 0.007,-0.268 -7.835,-4.589 -9.411,-5.186 -0.125,-0.047 -0.158,0.94 -0.158,4.688m98.269,35.462c-0.132,1.927 -0.104,3.474 0.062,3.474 0.08,0 2.226,1.079 4.769,2.398 2.543,1.319 4.647,2.398 4.675,2.398 0.028,0 0.051,-2.131 0.051,-4.735l0,-4.734l-4.738,0 -4.738,0l-0.082,1.199M10.023,83.529l0,4.72l4.815,-2.475 4.815,-2.475 0.005,-1.488c0.003,-0.819 -0.031,-1.829 -0.076,-2.244l-0.081,-0.756l-4.739,0 -4.739,0l0,4.72"
android:fillColor="#6b6b6b"
android:strokeColor="#00000000"
android:fillType="evenOdd"/>
<path
android:pathData="m12.41,78.778c1.348,0.02 3.517,0.02 4.821,0 1.304,-0.02 0.201,-0.036 -2.45,-0.036 -2.651,0 -3.718,0.016 -2.37,0.036"
android:fillColor="#545454"
android:strokeColor="#00000000"
android:fillType="evenOdd"/>
</vector>

155
app/src/main/res/drawable/thumb_private_internet_access.xml Normal file
View file

@ -0,0 +1,155 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:aapt="http://schemas.android.com/aapt"
android:width="128dp"
android:height="128dp"
android:viewportWidth="128"
android:viewportHeight="128">
<path
android:pathData="m111.17,46.365l0,0.004L105.973,46.368L105.973,41.724C105.973,18.68 87.179,0 63.993,0 40.81,0 22.016,18.68 22.016,41.724l0,4.644L16.826,46.368C11.375,46.368 6.96,50.755 6.96,56.174l0,38.306c0.011,2.551 0.164,4.406 1.162,5.757 1.036,1.356 2.776,1.84 5.373,1.832l8.35,0l1.274,20.17c0,0.048 -0.004,0.127 -0.004,0.227 0.004,0.536 0.063,1.761 0.741,2.938 0.667,1.188 2.068,2.249 4.333,2.231l21.219,0l11.018,-11.682l8.234,0L79.314,128l0.298,0c0,0 3.856,0 8.13,0 4.266,0 8.95,0 10.6,0l0.004,0c1.639,-0.007 3.141,0.034 4.441,-0.793 1.297,-0.845 2.075,-2.45 2.452,-5.247 0.548,-4.067 0.674,-15.194 0.924,-19.887l8.342,0c2.567,-0.007 4.244,-0.253 5.332,-1.423 1.051,-1.192 1.189,-2.89 1.203,-5.437L121.04,56.174c-0.007,-5.419 -4.423,-9.805 -9.87,-9.809z"
android:strokeWidth="1"
android:fillColor="#349334"
android:strokeColor="#00000000"
android:fillType="nonZero"/>
<path
android:pathData="m119.826,95.291c0.015,2.511 -0.242,3.915 -0.861,4.563 -0.578,0.674 -1.842,1.002 -4.358,0.995l-9.599,0l-0.034,0.618c-0.231,4.426 -0.388,16.265 -0.943,20.411 -0.362,2.675 -1.059,3.807 -1.868,4.329 -0.813,0.548 -2.062,0.589 -3.724,0.581l-0.004,0c-3.034,0 -16.28,0 -18.442,0L69.336,114.734L59.938,114.734L48.911,126.424L28.247,126.424c-1.883,-0.019 -2.684,-0.741 -3.195,-1.576 -0.492,-0.846 -0.57,-1.881 -0.567,-2.291 0,-0.127 0.004,-0.179 0.004,-0.179l0.004,-0.052 -1.364,-21.48L13.548,100.846c-2.494,-0.004 -3.691,-0.462 -4.324,-1.311 -0.671,-0.857 -0.91,-2.47 -0.902,-4.973L8.322,56.247C8.329,51.549 12.154,47.753 16.881,47.745L23.393,47.745L23.393,41.792C23.431,19.463 41.604,1.399 64.076,1.362 86.544,1.399 104.721,19.463 104.762,41.792l0,5.953l6.516,0c4.723,0.007 8.544,3.804 8.552,8.501l0,39.045z"
android:strokeWidth="1"
android:fillColor="#4bb749"
android:strokeColor="#00000000"
android:fillType="nonZero"/>
<path
android:pathData="M24.511,99.707l78.979,0l0,2.617l-78.979,0z"
android:strokeWidth="1"
android:fillColor="#118011"
android:strokeColor="#00000000"
android:fillType="nonZero"/>
<path
android:pathData="M23.3,100.615l0,-49.475l1.335,0l0,49.475z"
android:strokeWidth="1"
android:fillColor="#118011"
android:strokeColor="#00000000"
android:fillType="nonZero"/>
<path
android:pathData="M103.641,100.615l0,-49.475l1.335,0l0,49.475z"
android:strokeWidth="1"
android:fillColor="#118011"
android:strokeColor="#00000000"
android:fillType="nonZero"/>
<path
android:pathData="M35.102,61.73a5.144,28.293 90,1 0,56.586 0a5.144,28.293 90,1 0,-56.586 0z"
android:strokeWidth="1"
android:strokeColor="#00000000"
android:fillType="nonZero">
<aapt:attr name="android:fillColor">
<gradient
android:startY="66.862495"
android:startX="63.394802"
android:endY="57.485966"
android:endX="63.394802"
android:type="linear">
<item android:offset="0" android:color="#FF4BB749"/>
<item android:offset="1" android:color="#FF79B481"/>
</gradient>
</aapt:attr>
</path>
<path
android:pathData="m89.721,48.567l0,-7.545c0,-14.216 -11.547,-25.741 -25.795,-25.741 -14.248,0 -25.799,11.525 -25.799,25.741l0,7.545z"
android:strokeWidth="1"
android:fillColor="#ffffff"
android:strokeColor="#00000000"
android:fillType="nonZero"/>
<path
android:pathData="M53.106,40.7l22.998,0l0,2.735l-22.998,0z"
android:strokeWidth="1"
android:strokeColor="#00000000"
android:fillType="nonZero">
<aapt:attr name="android:fillColor">
<gradient
android:gradientRadius="10.784006"
android:centerX="64.86781"
android:centerY="42.21012"
android:type="radial">
<item android:offset="0" android:color="#FF000000"/>
<item android:offset="0.1901" android:color="#FF030303"/>
<item android:offset="0.3236" android:color="#FF0C0C0C"/>
<item android:offset="0.4397" android:color="#FF1C1C1C"/>
<item android:offset="0.5461" android:color="#FF323232"/>
<item android:offset="0.64559996" android:color="#FF4E4E4E"/>
<item android:offset="0.7402" android:color="#FF717171"/>
<item android:offset="0.83089995" android:color="#FF9A9A9A"/>
<item android:offset="0.9161" android:color="#FFC9C9C9"/>
<item android:offset="0.9985" android:color="#FFFEFEFE"/>
<item android:offset="1" android:color="#FFFFFFFF"/>
</gradient>
</aapt:attr>
</path>
<path
android:pathData="M55.452,29.277m-4.766,0a4.766,4.766 45,1 1,9.532 0a4.766,4.766 135,1 1,-9.532 0"
android:strokeWidth="1"
android:fillColor="#000000"
android:strokeColor="#00000000"
android:fillType="nonZero"/>
<path
android:pathData="M72.397,29.277m-4.766,0a4.766,4.766 0,1 1,9.532 0a4.766,4.766 135,1 1,-9.532 0"
android:strokeWidth="1"
android:fillColor="#000000"
android:strokeColor="#00000000"
android:fillType="nonZero"/>
<path
android:pathData="M54.771,77.314l17.248,0l0,12.861l-17.248,0z"
android:strokeWidth="1"
android:fillColor="#ffffff"
android:strokeColor="#00000000"
android:fillType="nonZero"/>
<path
android:pathData="m57.433,75.953c0.778,-2.716 3.189,-4.687 6.039,-4.69 2.85,0.004 5.261,1.974 6.043,4.69l2.05,0c-0.826,-3.792 -4.115,-6.657 -8.096,-6.657 -3.981,0.004 -7.267,2.865 -8.093,6.657z"
android:strokeWidth="1"
android:fillColor="#ffffff"
android:strokeColor="#00000000"
android:fillType="nonZero"/>
<path
android:pathData="m115.805,103.307c0.464,-0.004 0.89,-0.015 1.302,-0.034l0,-1.448c-0.752,0.116 -1.616,0.157 -2.622,0.161l-8.374,0c-0.127,2.341 -0.221,6.268 -0.352,10.128l1.365,0c0.112,-3.416 0.198,-6.735 0.31,-8.806z"
android:strokeWidth="1"
android:fillColor="#118011"
android:strokeColor="#00000000"
android:fillType="nonZero"/>
<path
android:pathData="m117.106,104.053l0,-0.715c-0.408,0.019 -0.834,0.033 -1.302,0.033l-8.374,0c-0.112,2.057 -0.198,5.351 -0.31,8.742l1.941,-0c4.447,0.004 8.045,-3.606 8.045,-8.06z"
android:strokeWidth="1"
android:strokeColor="#00000000"
android:fillType="nonZero">
<aapt:attr name="android:fillColor">
<gradient
android:startY="97.49953"
android:startX="102.2623"
android:endY="108.40542"
android:endX="112.76872"
android:type="linear">
<item android:offset="0" android:color="#FF23FF16"/>
<item android:offset="1" android:color="#FF189A33"/>
</gradient>
</aapt:attr>
</path>
<path
android:pathData="M21.91,102.073L13.549,102.073c-1.295,0.004 -2.369,-0.115 -3.261,-0.4l0,1.669c0.526,0.063 1.101,0.089 1.731,0.089l8.364,-0.004 0.552,8.686l1.608,0z"
android:strokeWidth="1"
android:fillColor="#118011"
android:strokeColor="#00000000"
android:fillType="nonZero"/>
<path
android:pathData="m12.01,103.427c-0.627,0 -1.199,-0.026 -1.722,-0.089l0,0.722c0,4.447 3.57,8.053 7.975,8.053l2.616,0l-0.549,-8.69z"
android:strokeWidth="1"
android:strokeColor="#00000000"
android:fillType="nonZero">
<aapt:attr name="android:fillColor">
<gradient
android:startY="93.15896"
android:startX="28.748474"
android:endY="110.74311"
android:endX="12.861952"
android:type="linear">
<item android:offset="0" android:color="#FF23FF16"/>
<item android:offset="1" android:color="#FF189A33"/>
</gradient>
</aapt:attr>
</path>
</vector>

92
app/src/main/res/layout/fragment_about.xml
View file

@ -410,34 +410,6 @@
</LinearLayout>
<!-- translators -->
<LinearLayout
android:id="@+id/about_layout_translators"
android:orientation="horizontal"
android:layout_width="match_parent"
android:layout_height="?android:attr/listPreferredItemHeight"
android:paddingTop="@dimen/activity_margin_small"
android:paddingBottom="@dimen/activity_margin_small"
android:background="?android:attr/selectableItemBackground"
android:gravity="center_vertical" >
<ImageView
android:id="@+id/aboutImgTranslators"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/activity_margin"
android:layout_marginEnd="@dimen/activity_margin_large"
app:srcCompat="@drawable/ic_translate_gray" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/about_label_translators"
android:textStyle="bold"
android:textAppearance="?android:attr/textAppearanceMedium" />
</LinearLayout>
</LinearLayout>
</android.support.v7.widget.CardView>
@ -448,35 +420,23 @@
android:layout_marginBottom="@dimen/activity_margin_small"
style="?attr/cardStyle" >
<LinearLayout
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:text="@string/about_title_support"/>
<!-- bug reports -->
<LinearLayout
android:id="@+id/about_layout_bugs"
android:id="@+id/about_layout_support"
android:orientation="horizontal"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/activity_margin"
android:paddingTop="@dimen/activity_margin_small"
android:paddingBottom="@dimen/activity_margin_small"
android:background="?android:attr/selectableItemBackground"
android:gravity="center_vertical" >
<ImageView
android:id="@+id/aboutImgBugs"
android:id="@+id/aboutImgSupport"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/activity_margin"
android:layout_marginEnd="@dimen/activity_margin_large"
app:srcCompat="@drawable/ic_bug_report_gray" />
app:srcCompat="@drawable/ic_heart_gray" />
<LinearLayout
android:orientation="vertical"
@ -487,7 +447,7 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/about_label_report_bugs"
android:text="@string/about_title_support"
android:textAppearance="?android:attr/textAppearanceMedium"
android:textStyle="bold" />
@ -495,53 +455,11 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceSmall"
android:text="@string/about_desc_report_bugs"/>
android:text="@string/about_desc_support"/>
</LinearLayout>
</LinearLayout>
<!-- translate -->
<LinearLayout
android:id="@+id/about_layout_translate"
android:orientation="horizontal"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingTop="@dimen/activity_margin_small"
android:paddingBottom="@dimen/activity_margin_small"
android:background="?android:attr/selectableItemBackground"
android:gravity="center_vertical" >
<ImageView
android:id="@+id/aboutImgTranslate"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/activity_margin"
android:layout_marginEnd="@dimen/activity_margin_large"
app:srcCompat="@drawable/ic_translate_gray" />
<LinearLayout
android:orientation="vertical"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center_vertical" >
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/about_label_translate"
android:textAppearance="?android:attr/textAppearanceMedium"
android:textStyle="bold" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceSmall"
android:text="@string/about_desc_translate"/>
</LinearLayout>
</LinearLayout>
</LinearLayout>
</android.support.v7.widget.CardView>
<!-- thumbnails -->

3
app/src/main/res/values-v27/styles.xml
View file

@ -1,17 +1,14 @@
<resources>
<!-- Light application theme -->
<style name="AppTheme" parent="AppBaseTheme">
<item name="android:navigationBarColor">?android:attr/colorBackground</item>
<item name="android:windowLightNavigationBar">true</item>
</style>
<style name="AppTheme.Dark" parent="AppBaseTheme.Dark">
<item name="android:navigationBarColor">?android:attr/colorBackground</item>
<item name="android:windowLightNavigationBar">false</item>
</style>
<style name="AppTheme.Black" parent="AppBaseTheme.Black">
<item name="android:navigationBarColor">@color/black</item>
<item name="android:windowLightNavigationBar">false</item>
</style>
</resources>

7
app/src/main/res/values/strings_about.xml
View file

@ -45,12 +45,7 @@
<!-- Support -->
<string name="about_title_support">Support development</string>
<string name="about_label_report_bugs">Report Bugs</string>
<string name="about_label_translate">Translate</string>
<string name="about_desc_report_bugs">Report bugs or request new features</string>
<string name="about_desc_translate">Help to translate andOTP to your language</string>
<string name="about_desc_support">Find out how you can support the development of andOTP</string>
<string name="about_title_special_features">Special features</string>
<string name="about_dialog_special_features">Are you sure you want to enable the special

5
app/src/main/res/values/styles.xml
View file

@ -6,6 +6,8 @@
<attr name="colorGithub" format="reference" />
<attr name="thumbnailBackground" format="reference" />
<attr name="navigationBarColor" format="reference" />
<attr name="colorExpiring" format="reference"/>
@ -23,6 +25,7 @@
<item name="colorAccent">@color/colorAccent</item>
<item name="windowBackground">?android:attr/colorBackground</item>
<item name="navigationBarColor">?android:attr/colorBackground</item>
<item name="colorGithub">@color/github_dark</item>
<item name="thumbnailBackground">@android:color/transparent</item>
@ -61,6 +64,7 @@
<item name="colorAccent">@color/colorAccent</item>
<item name="windowBackground">?android:attr/colorBackground</item>
<item name="navigationBarColor">?android:attr/colorBackground</item>
<item name="thumbnailBackground">@color/dark_thumbnail_background</item>
<item name="colorGithub">@color/github_light</item>
@ -95,6 +99,7 @@
<item name="colorAccent">@color/colorAccent</item>
<item name="windowBackground">@color/black</item>
<item name="navigationBarColor">@color/black</item>
<item name="thumbnailBackground">@color/dark_thumbnail_background</item>
<item name="colorGithub">@color/github_light</item>