mirror of
https://github.com/beemdevelopment/Aegis
synced 2024-09-06 16:03:30 +00:00
Merge pull request #981 from jas14/monochromatic-icon
Add monochrome launcher icon
This commit is contained in:
commit
e19ceb0761
|
@ -19,12 +19,12 @@ def fileProviderAuthority = "${packageName}.fileprovider"
|
||||||
def fileProviderAuthorityDebug = "${packageName}.debug.fileprovider"
|
def fileProviderAuthorityDebug = "${packageName}.debug.fileprovider"
|
||||||
|
|
||||||
android {
|
android {
|
||||||
compileSdkVersion 31
|
compileSdkVersion 33
|
||||||
|
|
||||||
defaultConfig {
|
defaultConfig {
|
||||||
applicationId "${packageName}"
|
applicationId "${packageName}"
|
||||||
minSdkVersion 21
|
minSdkVersion 21
|
||||||
targetSdkVersion 31
|
targetSdkVersion 33
|
||||||
versionCode 51
|
versionCode 51
|
||||||
versionName "2.0.3"
|
versionName "2.0.3"
|
||||||
multiDexEnabled true
|
multiDexEnabled true
|
||||||
|
@ -186,7 +186,7 @@ dependencies {
|
||||||
testImplementation "com.google.guava:guava:${guavaVersion}-jre"
|
testImplementation "com.google.guava:guava:${guavaVersion}-jre"
|
||||||
testImplementation "junit:junit:${junitVersion}"
|
testImplementation "junit:junit:${junitVersion}"
|
||||||
testImplementation "org.json:json:20220320"
|
testImplementation "org.json:json:20220320"
|
||||||
testImplementation 'org.robolectric:robolectric:4.8'
|
testImplementation 'org.robolectric:robolectric:4.8.2'
|
||||||
|
|
||||||
coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.5'
|
coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.5'
|
||||||
}
|
}
|
||||||
|
|
7
app/src/main/res/mipmap-anydpi-v33/ic_launcher.xml
Normal file
7
app/src/main/res/mipmap-anydpi-v33/ic_launcher.xml
Normal file
|
@ -0,0 +1,7 @@
|
||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
|
||||||
|
<background android:drawable="@mipmap/ic_launcher_background"/>
|
||||||
|
<foreground android:drawable="@mipmap/ic_launcher_foreground"/>
|
||||||
|
|
||||||
|
<monochrome android:drawable="@mipmap/ic_launcher_monochrome" />
|
||||||
|
</adaptive-icon>
|
7
app/src/main/res/mipmap-anydpi-v33/ic_launcher_debug.xml
Normal file
7
app/src/main/res/mipmap-anydpi-v33/ic_launcher_debug.xml
Normal file
|
@ -0,0 +1,7 @@
|
||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
|
||||||
|
<background android:drawable="@mipmap/ic_launcher_background"/>
|
||||||
|
<foreground android:drawable="@mipmap/ic_launcher_debug_foreground"/>
|
||||||
|
|
||||||
|
<monochrome android:drawable="@mipmap/ic_launcher_monochrome" />
|
||||||
|
</adaptive-icon>
|
BIN
app/src/main/res/mipmap-hdpi/ic_launcher_monochrome.png
Normal file
BIN
app/src/main/res/mipmap-hdpi/ic_launcher_monochrome.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 2.1 KiB |
BIN
app/src/main/res/mipmap-mdpi/ic_launcher_monochrome.png
Normal file
BIN
app/src/main/res/mipmap-mdpi/ic_launcher_monochrome.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 1.2 KiB |
BIN
app/src/main/res/mipmap-xhdpi/ic_launcher_monochrome.png
Normal file
BIN
app/src/main/res/mipmap-xhdpi/ic_launcher_monochrome.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 2.7 KiB |
BIN
app/src/main/res/mipmap-xxhdpi/ic_launcher_monochrome.png
Normal file
BIN
app/src/main/res/mipmap-xxhdpi/ic_launcher_monochrome.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 5.1 KiB |
BIN
app/src/main/res/mipmap-xxxhdpi/ic_launcher_monochrome.png
Normal file
BIN
app/src/main/res/mipmap-xxxhdpi/ic_launcher_monochrome.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 6.4 KiB |
|
@ -7,6 +7,7 @@ import static org.junit.Assert.assertTrue;
|
||||||
|
|
||||||
import android.content.Context;
|
import android.content.Context;
|
||||||
import android.content.SharedPreferences;
|
import android.content.SharedPreferences;
|
||||||
|
import android.os.Build;
|
||||||
import android.preference.PreferenceManager;
|
import android.preference.PreferenceManager;
|
||||||
|
|
||||||
import androidx.test.core.app.ApplicationProvider;
|
import androidx.test.core.app.ApplicationProvider;
|
||||||
|
@ -14,9 +15,11 @@ import androidx.test.core.app.ApplicationProvider;
|
||||||
import org.junit.Test;
|
import org.junit.Test;
|
||||||
import org.junit.runner.RunWith;
|
import org.junit.runner.RunWith;
|
||||||
import org.robolectric.RobolectricTestRunner;
|
import org.robolectric.RobolectricTestRunner;
|
||||||
|
import org.robolectric.annotation.Config;
|
||||||
|
|
||||||
import java.util.Date;
|
import java.util.Date;
|
||||||
|
|
||||||
|
@Config(sdk = { Build.VERSION_CODES.S_V2 })
|
||||||
@RunWith(RobolectricTestRunner.class)
|
@RunWith(RobolectricTestRunner.class)
|
||||||
public class PreferencesTest {
|
public class PreferencesTest {
|
||||||
@Test
|
@Test
|
||||||
|
|
|
@ -7,6 +7,7 @@ import static org.junit.Assert.assertTrue;
|
||||||
|
|
||||||
import android.graphics.Rect;
|
import android.graphics.Rect;
|
||||||
import android.media.Image;
|
import android.media.Image;
|
||||||
|
import android.os.Build;
|
||||||
|
|
||||||
import androidx.annotation.NonNull;
|
import androidx.annotation.NonNull;
|
||||||
import androidx.annotation.Nullable;
|
import androidx.annotation.Nullable;
|
||||||
|
@ -18,6 +19,7 @@ import com.beemdevelopment.aegis.util.IOUtils;
|
||||||
import org.junit.Test;
|
import org.junit.Test;
|
||||||
import org.junit.runner.RunWith;
|
import org.junit.runner.RunWith;
|
||||||
import org.robolectric.RobolectricTestRunner;
|
import org.robolectric.RobolectricTestRunner;
|
||||||
|
import org.robolectric.annotation.Config;
|
||||||
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.io.InputStream;
|
import java.io.InputStream;
|
||||||
|
@ -25,6 +27,7 @@ import java.nio.ByteBuffer;
|
||||||
import java.util.concurrent.atomic.AtomicBoolean;
|
import java.util.concurrent.atomic.AtomicBoolean;
|
||||||
import java.util.zip.GZIPInputStream;
|
import java.util.zip.GZIPInputStream;
|
||||||
|
|
||||||
|
@Config(sdk = { Build.VERSION_CODES.S_V2 })
|
||||||
@RunWith(RobolectricTestRunner.class)
|
@RunWith(RobolectricTestRunner.class)
|
||||||
public class QrCodeAnalyzerTest {
|
public class QrCodeAnalyzerTest {
|
||||||
private static final String _expectedUri = "otpauth://totp/neo4j:Charlotte?secret=B33WS2ALPT34K4BNY24AYROE4M&issuer=neo4j&algorithm=SHA1&digits=6&period=30";
|
private static final String _expectedUri = "otpauth://totp/neo4j:Charlotte?secret=B33WS2ALPT34K4BNY24AYROE4M&issuer=neo4j&algorithm=SHA1&digits=6&period=30";
|
||||||
|
|
|
@ -33,7 +33,7 @@ import java.io.InputStream;
|
||||||
import java.util.Arrays;
|
import java.util.Arrays;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
@Config(sdk = { Build.VERSION_CODES.P })
|
@Config(sdk = { Build.VERSION_CODES.S_V2 })
|
||||||
@RunWith(RobolectricTestRunner.class)
|
@RunWith(RobolectricTestRunner.class)
|
||||||
public class DatabaseImporterTest {
|
public class DatabaseImporterTest {
|
||||||
private List<VaultEntry> _vectors;
|
private List<VaultEntry> _vectors;
|
||||||
|
|
Loading…
Reference in a new issue