mirror of
https://github.com/Kunzisoft/KeePassDX.git
synced 2025-12-04 15:49:33 +01:00
Updates to support new gradle and android studio versions
This commit is contained in:
Brian Pellin
15
.idea/misc.xml
generated
15
.idea/misc.xml
generated
@@ -1,8 +1,5 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="EntryPointsManager">
|
||||
<entry_points version="2.0" />
|
||||
</component>
|
||||
<component name="NullableNotNullManager">
|
||||
<option name="myDefaultNullable" value="android.support.annotation.Nullable" />
|
||||
<option name="myDefaultNotNull" value="android.support.annotation.NonNull" />
|
||||
@@ -27,17 +24,7 @@
|
||||
</value>
|
||||
</option>
|
||||
</component>
|
||||
<component name="ProjectLevelVcsManager" settingsEditedManually="false">
|
||||
<OptionsSetting value="true" id="Add" />
|
||||
<OptionsSetting value="true" id="Remove" />
|
||||
<OptionsSetting value="true" id="Checkout" />
|
||||
<OptionsSetting value="true" id="Update" />
|
||||
<OptionsSetting value="true" id="Status" />
|
||||
<OptionsSetting value="true" id="Edit" />
|
||||
<ConfirmationsSetting value="0" id="Add" />
|
||||
<ConfirmationsSetting value="0" id="Remove" />
|
||||
</component>
|
||||
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
|
||||
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
|
||||
<output url="file://$PROJECT_DIR$/build/classes" />
|
||||
</component>
|
||||
<component name="ProjectType">
|
||||
|
||||
21
LICENSE
21
LICENSE
@@ -5,7 +5,7 @@ The KeePass icon was created by Francis Jacquerye and is licensed under the term
|
||||
|
||||
---
|
||||
|
||||
Files under src/org/apache/*
|
||||
Files under src/org/apache/*
|
||||
|
||||
Licensed to the Apache Software Foundation (ASF) under one or more
|
||||
contributor license agreements. See the NOTICE file distributed with
|
||||
@@ -381,3 +381,22 @@ from Tavmjong Bah. For further information, contact: tavmjong @ free
|
||||
|
||||
$Id: LICENSE 2133 2007-11-28 02:46:28Z lechimp $
|
||||
|
||||
--
|
||||
ChaCha7539Engine.java
|
||||
|
||||
Copyright (c) 2000 - 2017 The Legion of the Bouncy Castle Inc. (https://www.bouncycastle.org)
|
||||
|
||||
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and
|
||||
associated documentation files (the "Software"), to deal in the Software without restriction,
|
||||
including without limitation the rights to use, copy, modify, merge, publish, distribute,
|
||||
sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is
|
||||
furnished to do so, subject to the following conditions:
|
||||
|
||||
The above copyright notice and this permission notice shall be included in all copies or
|
||||
substantial portions of the Software.
|
||||
|
||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT
|
||||
NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
||||
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
|
||||
DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
|
||||
41
app/app.iml
41
app/app.iml
@@ -27,7 +27,7 @@
|
||||
</configuration>
|
||||
</facet>
|
||||
</component>
|
||||
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
|
||||
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7">
|
||||
<output url="file://$MODULE_DIR$/build/intermediates/classes/flavor1/debug" />
|
||||
<output-test url="file://$MODULE_DIR$/build/intermediates/classes/test/flavor1/debug" />
|
||||
<exclude-output />
|
||||
@@ -38,11 +38,11 @@
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/main/jni/final_key" isTestSource="false" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/main/jni/final_key/aes" isTestSource="false" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/main/jni/final_key/sha" isTestSource="false" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/flavor1/debug" isTestSource="false" generated="true" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/flavor1/debug" isTestSource="false" generated="true" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/flavor1/debug" isTestSource="false" generated="true" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/flavor1/debug" isTestSource="false" generated="true" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/flavor1/debug" isTestSource="false" generated="true" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/flavor1/debug" isTestSource="false" generated="true" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/flavor1/debug" type="java-resource" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/flavor1/debug" type="java-resource" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/flavor1Debug/res" type="java-resource" />
|
||||
@@ -53,13 +53,22 @@
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/flavor1Debug/jni" isTestSource="false" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/flavor1Debug/rs" isTestSource="false" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/flavor1Debug/shaders" isTestSource="false" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/androidTest/flavor1/debug" isTestSource="true" generated="true" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/flavor1/debug" isTestSource="true" generated="true" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/flavor1/debug" isTestSource="true" generated="true" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/flavor1/debug" isTestSource="true" generated="true" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/flavor1/debug" isTestSource="true" generated="true" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/androidTest/flavor1/debug" isTestSource="true" generated="true" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/flavor1/debug" type="java-test-resource" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/flavor1/debug" type="java-test-resource" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/androidTestFlavor1Debug/res" type="java-test-resource" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/androidTestFlavor1Debug/resources" type="java-test-resource" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/androidTestFlavor1Debug/assets" type="java-test-resource" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/androidTestFlavor1Debug/aidl" isTestSource="true" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/androidTestFlavor1Debug/java" isTestSource="true" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/androidTestFlavor1Debug/jni" isTestSource="true" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/androidTestFlavor1Debug/rs" isTestSource="true" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/androidTestFlavor1Debug/shaders" isTestSource="true" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/test/flavor1/debug" isTestSource="true" generated="true" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/testFlavor1Debug/res" type="java-test-resource" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/testFlavor1Debug/resources" type="java-test-resource" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/testFlavor1Debug/assets" type="java-test-resource" />
|
||||
@@ -100,6 +109,14 @@
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/debug/jni" isTestSource="false" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/debug/shaders" isTestSource="false" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/res" type="java-test-resource" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/resources" type="java-test-resource" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/assets" type="java-test-resource" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/aidl" isTestSource="true" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/java" isTestSource="true" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/jni" isTestSource="true" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/rs" isTestSource="true" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/shaders" isTestSource="true" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/res" type="java-test-resource" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/resources" type="java-test-resource" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/assets" type="java-test-resource" />
|
||||
@@ -134,36 +151,40 @@
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/build-info" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/builds" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/check-manifest" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes-jar" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/cmake" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-classes" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-runtime-classes" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-safeguard" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-verifier" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-resources" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-support" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaPrecompile" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/prebuild" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/reload-dex" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/restart-dex" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/sourceFolderJavaResources" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/split-apk" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/splits-support" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/tmp" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
|
||||
</content>
|
||||
<orderEntry type="jdk" jdkName="Android API 22 Platform" jdkType="Android SDK" />
|
||||
<orderEntry type="sourceFolder" forTests="false" />
|
||||
<orderEntry type="library" exported="" scope="TEST" name="junit4" level="project" />
|
||||
<orderEntry type="library" exported="" name="prov-1.54.0.0" level="project" />
|
||||
<orderEntry type="library" exported="" name="core-1.54.0.0" level="project" />
|
||||
<orderEntry type="library" exported="" name="joda-time-2.9.4" level="project" />
|
||||
<orderEntry type="library" name="com.madgag.spongycastle:core:1.54.0.0@jar" level="project" />
|
||||
<orderEntry type="library" scope="TEST" name="__local_aars__:/home/bpellin/workspace/KeePassDroid/app/libs/junit4.jar:unspecified@jar" level="project" />
|
||||
<orderEntry type="library" name="com.madgag.spongycastle:prov:1.54.0.0@jar" level="project" />
|
||||
<orderEntry type="library" name="joda-time:joda-time:2.9.4@jar" level="project" />
|
||||
</component>
|
||||
</module>
|
||||
@@ -2,28 +2,19 @@ apply plugin: 'com.android.application'
|
||||
|
||||
android {
|
||||
compileSdkVersion = 22
|
||||
buildToolsVersion = "25.0.0"
|
||||
buildToolsVersion = '26.0.2'
|
||||
|
||||
defaultConfig {
|
||||
applicationId = "com.android.keepass"
|
||||
minSdkVersion = 3
|
||||
targetSdkVersion = 12
|
||||
minSdkVersion 3
|
||||
targetSdkVersion 12
|
||||
|
||||
versionCode = 154
|
||||
versionName = "2.0.6.4"
|
||||
|
||||
testApplicationId = "com.keepassdroid.tests"
|
||||
testInstrumentationRunner = "android.test.InstrumentationTestRunner"
|
||||
|
||||
|
||||
/*
|
||||
buildConfigFields.with {
|
||||
create() {
|
||||
type = "int"
|
||||
name = "VALUE"
|
||||
value = "1"
|
||||
}
|
||||
}
|
||||
*/
|
||||
}
|
||||
|
||||
externalNativeBuild {
|
||||
@@ -39,8 +30,11 @@ android {
|
||||
}
|
||||
}
|
||||
|
||||
flavorDimensions "all"
|
||||
|
||||
productFlavors {
|
||||
flavor1 {
|
||||
dimension = "all"
|
||||
applicationId = "com.android.keepass"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -22,47 +22,47 @@
|
||||
parent="android:Theme.Holo"></style>
|
||||
<style name="Dialog" parent="android:Theme.Holo.Dialog"></style>
|
||||
<style name="GroupTextSmall" parent="android:Theme.Holo">
|
||||
<item name="@android:textColor">@color/group</item>
|
||||
<item name="@android:textSize">15sp</item>
|
||||
<item name="android:textColor">@color/group</item>
|
||||
<item name="android:textSize">15sp</item>
|
||||
</style>
|
||||
<style name="GroupText" parent="android:Theme.Holo">
|
||||
<item name="@android:textColor">@color/group</item>
|
||||
<item name="@android:textSize">20sp</item>
|
||||
<item name="android:textColor">@color/group</item>
|
||||
<item name="android:textSize">20sp</item>
|
||||
</style>
|
||||
<style name="GroupTextLarge" parent="android:Theme.Holo">
|
||||
<item name="@android:textColor">@color/group</item>
|
||||
<item name="@android:textSize">28sp</item>
|
||||
<item name="android:textColor">@color/group</item>
|
||||
<item name="android:textSize">28sp</item>
|
||||
</style>
|
||||
<style name="ElementTextSmall">
|
||||
<item name="@android:textSize">15sp</item>
|
||||
<item name="android:textSize">15sp</item>
|
||||
</style>
|
||||
<style name="ElementText">
|
||||
<item name="@android:textSize">20sp</item>
|
||||
<item name="android:textSize">20sp</item>
|
||||
</style>
|
||||
<style name="ElementTextLarge">
|
||||
<item name="@android:textSize">28sp</item>
|
||||
<item name="android:textSize">28sp</item>
|
||||
</style>
|
||||
<style name="GroupLabel">
|
||||
<item name="@android:textSize">20sp</item>
|
||||
<item name="android:textSize">20sp</item>
|
||||
</style>
|
||||
<style name="WhiteOnBlack">
|
||||
<!-- <item name="@android:background">#666666</item> -->
|
||||
<!-- <item name="android:background">#666666</item> -->
|
||||
<item
|
||||
name="@android:textColor">@android:color/primary_text_dark</item>
|
||||
<item name="@android:textSize">20sp</item>
|
||||
name="android:textColor">@android:color/primary_text_dark</item>
|
||||
<item name="android:textSize">20sp</item>
|
||||
</style>
|
||||
<style name="WhiteOnBlackSmall" parent="WhiteOnBlack">
|
||||
<item name="@android:textSize">12sp</item>
|
||||
<item name="android:textSize">12sp</item>
|
||||
</style>
|
||||
<style name="WhiteOnDarkSmall" parent="WhiteOnBlack">
|
||||
<item name="@android:textSize">12sp</item>
|
||||
<!-- <item name="@android:background">#222222</item> -->
|
||||
<item name="android:textSize">12sp</item>
|
||||
<!-- <item name="android:background">#222222</item> -->
|
||||
</style>
|
||||
<style name="ElementTextTitle" parent="WhiteOnBlack">
|
||||
<item name="@android:textColor">@color/group</item>
|
||||
<item name="android:textColor">@color/group</item>
|
||||
</style>
|
||||
<style name="EntryItem">
|
||||
<item name="@android:padding">5sp</item>
|
||||
<item name="android:padding">5sp</item>
|
||||
</style>
|
||||
<style name="DividerEntry">
|
||||
<item name="android:layout_width">match_parent</item>
|
||||
|
||||
@@ -21,46 +21,46 @@
|
||||
<style name="NoTitleBar" parent="android:Theme.Material"></style>
|
||||
<style name="Dialog" parent="android:Theme.Material.Dialog"></style>
|
||||
<style name="GroupTextSmall" parent="android:Theme.Material">
|
||||
<item name="@android:textColor">@color/group</item>
|
||||
<item name="@android:textSize">15sp</item>
|
||||
<item name="android:textColor">@color/group</item>
|
||||
<item name="android:textSize">15sp</item>
|
||||
</style>
|
||||
<style name="GroupText" parent="android:Theme.Material">
|
||||
<item name="@android:textColor">@color/group</item>
|
||||
<item name="@android:textSize">20sp</item>
|
||||
<item name="android:textColor">@color/group</item>
|
||||
<item name="android:textSize">20sp</item>
|
||||
</style>
|
||||
<style name="GroupTextLarge" parent="android:Theme.Material">
|
||||
<item name="@android:textColor">@color/group</item>
|
||||
<item name="@android:textSize">28sp</item>
|
||||
<item name="android:textColor">@color/group</item>
|
||||
<item name="android:textSize">28sp</item>
|
||||
</style>
|
||||
<style name="ElementTextSmall">
|
||||
<item name="@android:textSize">15sp</item>
|
||||
<item name="android:textSize">15sp</item>
|
||||
</style>
|
||||
<style name="ElementText">
|
||||
<item name="@android:textSize">20sp</item>
|
||||
<item name="android:textSize">20sp</item>
|
||||
</style>
|
||||
<style name="ElementTextLarge">
|
||||
<item name="@android:textSize">28sp</item>
|
||||
<item name="android:textSize">28sp</item>
|
||||
</style>
|
||||
<style name="GroupLabel">
|
||||
<item name="@android:textSize">20sp</item>
|
||||
<item name="android:textSize">20sp</item>
|
||||
</style>
|
||||
<style name="WhiteOnBlack">
|
||||
<!-- <item name="@android:background">#666666</item> -->
|
||||
<!-- <item name="android:background">#666666</item> -->
|
||||
<item
|
||||
name="@android:textColor">@android:color/primary_text_dark</item>
|
||||
<item name="@android:textSize">20sp</item>
|
||||
name="android:textColor">@android:color/primary_text_dark</item>
|
||||
<item name="android:textSize">20sp</item>
|
||||
</style>
|
||||
<style name="WhiteOnBlackSmall" parent="WhiteOnBlack">
|
||||
<item name="@android:textSize">12sp</item>
|
||||
<item name="android:textSize">12sp</item>
|
||||
</style>
|
||||
<style name="WhiteOnDarkSmall" parent="WhiteOnBlack">
|
||||
<item name="@android:textSize">12sp</item>
|
||||
<!-- <item name="@android:background">#222222</item> -->
|
||||
<item name="android:textSize">12sp</item>
|
||||
<!-- <item name="android:background">#222222</item> -->
|
||||
</style>
|
||||
<style name="ElementTextTitle" parent="WhiteOnBlack">
|
||||
<item name="@android:textColor">@color/group</item>
|
||||
<item name="android:textColor">@color/group</item>
|
||||
</style>
|
||||
<style name="EntryItem">
|
||||
<item name="@android:padding">5sp</item>
|
||||
<item name="android:padding">5sp</item>
|
||||
</style>
|
||||
</resources>
|
||||
|
||||
@@ -21,52 +21,52 @@
|
||||
<style name="NoTitleBar" parent="android:Theme.NoTitleBar"></style>
|
||||
<style name="Dialog" parent="android:Theme.Dialog"></style>
|
||||
<style name="GroupTextSmall" parent="android:Theme">
|
||||
<item name="@android:textColor">@color/group</item>
|
||||
<item name="@android:textSize">15sp</item>
|
||||
<item name="android:textColor">@color/group</item>
|
||||
<item name="android:textSize">15sp</item>
|
||||
</style>
|
||||
<style name="GroupText" parent="android:Theme">
|
||||
<item name="@android:textColor">@color/group</item>
|
||||
<item name="@android:textSize">20sp</item>
|
||||
<item name="android:textColor">@color/group</item>
|
||||
<item name="android:textSize">20sp</item>
|
||||
</style>
|
||||
<style name="GroupTextLarge" parent="android:Theme">
|
||||
<item name="@android:textColor">@color/group</item>
|
||||
<item name="@android:textSize">28sp</item>
|
||||
<item name="android:textColor">@color/group</item>
|
||||
<item name="android:textSize">28sp</item>
|
||||
</style>
|
||||
<style name="ElementTextSmall">
|
||||
<item name="@android:textSize">15sp</item>
|
||||
<item name="android:textSize">15sp</item>
|
||||
</style>
|
||||
<style name="ElementText">
|
||||
<item name="@android:textSize">20sp</item>
|
||||
<item name="android:textSize">20sp</item>
|
||||
</style>
|
||||
<style name="ElementTextLarge">
|
||||
<item name="@android:textSize">28sp</item>
|
||||
<item name="android:textSize">28sp</item>
|
||||
</style>
|
||||
<style name="GroupLabel">
|
||||
<item name="@android:textSize">20sp</item>
|
||||
<item name="android:textSize">20sp</item>
|
||||
</style>
|
||||
<style name="Small">
|
||||
<item name="@android:textSize">12sp</item>
|
||||
<item name="android:textSize">12sp</item>
|
||||
</style>
|
||||
<style name="WhiteOnBlack">
|
||||
<!-- <item name="@android:background">#666666</item>-->
|
||||
<item name="@android:textColor">@android:color/primary_text_dark</item>
|
||||
<item name="@android:textSize">20sp</item>
|
||||
<!-- <item name="android:background">#666666</item>-->
|
||||
<item name="android:textColor">@android:color/primary_text_dark</item>
|
||||
<item name="android:textSize">20sp</item>
|
||||
</style>
|
||||
<style name="WhiteOnBlackSmall" parent="WhiteOnBlack">
|
||||
<item name="@android:textSize">12sp</item>
|
||||
<item name="android:textSize">12sp</item>
|
||||
</style>
|
||||
<style name="DarkOnBlackSmall" parent="WhiteOnBlackSmall">
|
||||
<item name="@android:textColor">@android:color/secondary_text_dark</item>
|
||||
<item name="android:textColor">@android:color/secondary_text_dark</item>
|
||||
</style>
|
||||
<style name="WhiteOnDarkSmall" parent="WhiteOnBlack">
|
||||
<item name="@android:textSize">12sp</item>
|
||||
<!-- <item name="@android:background">#222222</item> -->
|
||||
<item name="android:textSize">12sp</item>
|
||||
<!-- <item name="android:background">#222222</item> -->
|
||||
</style>
|
||||
<style name="ElementTextTitle" parent="WhiteOnBlack">
|
||||
<item name="@android:textColor">@color/group</item>
|
||||
<item name="android:textColor">@color/group</item>
|
||||
</style>
|
||||
<style name="EntryItem">
|
||||
<item name="@android:padding">5sp</item>
|
||||
<item name="android:padding">5sp</item>
|
||||
</style>
|
||||
<style name="Divider">
|
||||
<item name="android:layout_width">match_parent</item>
|
||||
|
||||
@@ -4,7 +4,7 @@ buildscript {
|
||||
jcenter()
|
||||
}
|
||||
dependencies {
|
||||
classpath 'com.android.tools.build:gradle:2.3.0'
|
||||
classpath 'com.android.tools.build:gradle:3.0.0'
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
4
gradle/wrapper/gradle-wrapper.properties
vendored
4
gradle/wrapper/gradle-wrapper.properties
vendored
@@ -1,6 +1,6 @@
|
||||
#Sun Mar 26 15:21:55 CDT 2017
|
||||
#Sat Oct 28 10:13:14 CDT 2017
|
||||
distributionBase=GRADLE_USER_HOME
|
||||
distributionPath=wrapper/dists
|
||||
zipStoreBase=GRADLE_USER_HOME
|
||||
zipStorePath=wrapper/dists
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip
|
||||
|
||||
Reference in New Issue
Block a user