rixxc/KeePassDX
1
0
Fork 0
mirror of https://github.com/Kunzisoft/KeePassDX.git synced 2025-12-04 15:49:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

Updates to support new gradle and android studio versions

Browse Source
This commit is contained in:
Brian Pellin
2017-10-30 21:59:58 -05:00
parent 4115746258
commit b3720ef72f
9 changed files with 118 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
.idea/misc.xml generated
View File

@@ -1,8 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project version="4"> <project version="4">
<component name="EntryPointsManager">
<entry_points version="2.0" />
</component>
<component name="NullableNotNullManager"> <component name="NullableNotNullManager">
<option name="myDefaultNullable" value="android.support.annotation.Nullable" /> <option name="myDefaultNullable" value="android.support.annotation.Nullable" />
<option name="myDefaultNotNull" value="android.support.annotation.NonNull" /> <option name="myDefaultNotNull" value="android.support.annotation.NonNull" />
@@ -27,17 +24,7 @@
</value> </value>
</option> </option>
</component> </component>
<component name="ProjectLevelVcsManager" settingsEditedManually="false"> <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
<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">
<output url="file://$PROJECT_DIR$/build/classes" /> <output url="file://$PROJECT_DIR$/build/classes" />
</component> </component>
<component name="ProjectType"> <component name="ProjectType">

19
LICENSE
View File

@@ -381,3 +381,22 @@ from Tavmjong Bah. For further information, contact: tavmjong @ free
$Id: LICENSE 2133 2007-11-28 02:46:28Z lechimp $ $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
View File

@@ -27,7 +27,7 @@
</configuration> </configuration>
</facet> </facet>
</component> </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 url="file://$MODULE_DIR$/build/intermediates/classes/flavor1/debug" />
<output-test url="file://$MODULE_DIR$/build/intermediates/classes/test/flavor1/debug" /> <output-test url="file://$MODULE_DIR$/build/intermediates/classes/test/flavor1/debug" />
<exclude-output /> <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" 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/aes" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/jni/final_key/sha" 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/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/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/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/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/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$/build/generated/res/resValues/flavor1/debug" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/flavor1Debug/res" 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/jni" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/flavor1Debug/rs" 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$/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/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/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/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/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/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$/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/res" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/testFlavor1Debug/resources" 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" /> <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/jni" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/debug/rs" 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/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/res" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/resources" 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" /> <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" /> <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/assets" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" /> <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/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" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes-jar" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/cmake" /> <excludeFolder url="file://$MODULE_DIR$/build/intermediates/cmake" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" /> <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-classes" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-runtime-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/incremental-verifier" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-resources" /> <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/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/jniLibs" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" /> <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/reload-dex" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" /> <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/rs" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" /> <excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/sourceFolderJavaResources" /> <excludeFolder url="file://$MODULE_DIR$/build/intermediates/sourceFolderJavaResources" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/split-apk" /> <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/symbols" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/tmp" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" /> <excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
<excludeFolder url="file://$MODULE_DIR$/build/outputs" /> <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
<excludeFolder url="file://$MODULE_DIR$/build/tmp" /> <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
</content> </content>
<orderEntry type="jdk" jdkName="Android API 22 Platform" jdkType="Android SDK" /> <orderEntry type="jdk" jdkName="Android API 22 Platform" jdkType="Android SDK" />
<orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" exported="" scope="TEST" name="junit4" level="project" /> <orderEntry type="library" name="com.madgag.spongycastle:core:1.54.0.0@jar" level="project" />
<orderEntry type="library" exported="" name="prov-1.54.0.0" 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" exported="" name="core-1.54.0.0" level="project" /> <orderEntry type="library" name="com.madgag.spongycastle:prov:1.54.0.0@jar" level="project" />
<orderEntry type="library" exported="" name="joda-time-2.9.4" level="project" /> <orderEntry type="library" name="joda-time:joda-time:2.9.4@jar" level="project" />
</component> </component>
</module> </module>

20
app/build.gradle
View File

@@ -2,28 +2,19 @@ apply plugin: 'com.android.application'
android { android {
compileSdkVersion = 22 compileSdkVersion = 22
buildToolsVersion = "25.0.0" buildToolsVersion = '26.0.2'
defaultConfig { defaultConfig {
applicationId = "com.android.keepass" applicationId = "com.android.keepass"
minSdkVersion = 3 minSdkVersion 3
targetSdkVersion = 12 targetSdkVersion 12
versionCode = 154 versionCode = 154
versionName = "2.0.6.4" versionName = "2.0.6.4"
testApplicationId = "com.keepassdroid.tests" testApplicationId = "com.keepassdroid.tests"
testInstrumentationRunner = "android.test.InstrumentationTestRunner" testInstrumentationRunner = "android.test.InstrumentationTestRunner"
/*
buildConfigFields.with {
create() {
type = "int"
name = "VALUE"
value = "1"
}
}
*/
} }
externalNativeBuild { externalNativeBuild {
@@ -39,8 +30,11 @@ android {
} }
} }
flavorDimensions "all"
productFlavors { productFlavors {
flavor1 { flavor1 {
dimension = "all"
applicationId = "com.android.keepass" applicationId = "com.android.keepass"
} }
} }

36
app/src/main/res/values-v11/styles.xml
View File

@@ -22,47 +22,47 @@
parent="android:Theme.Holo"></style> parent="android:Theme.Holo"></style>
<style name="Dialog" parent="android:Theme.Holo.Dialog"></style> <style name="Dialog" parent="android:Theme.Holo.Dialog"></style>
<style name="GroupTextSmall" parent="android:Theme.Holo"> <style name="GroupTextSmall" parent="android:Theme.Holo">
<item name="@android:textColor">@color/group</item> <item name="android:textColor">@color/group</item>
<item name="@android:textSize">15sp</item> <item name="android:textSize">15sp</item>
</style> </style>
<style name="GroupText" parent="android:Theme.Holo"> <style name="GroupText" parent="android:Theme.Holo">
<item name="@android:textColor">@color/group</item> <item name="android:textColor">@color/group</item>
<item name="@android:textSize">20sp</item> <item name="android:textSize">20sp</item>
</style> </style>
<style name="GroupTextLarge" parent="android:Theme.Holo"> <style name="GroupTextLarge" parent="android:Theme.Holo">
<item name="@android:textColor">@color/group</item> <item name="android:textColor">@color/group</item>
<item name="@android:textSize">28sp</item> <item name="android:textSize">28sp</item>
</style> </style>
<style name="ElementTextSmall"> <style name="ElementTextSmall">
<item name="@android:textSize">15sp</item> <item name="android:textSize">15sp</item>
</style> </style>
<style name="ElementText"> <style name="ElementText">
<item name="@android:textSize">20sp</item> <item name="android:textSize">20sp</item>
</style> </style>
<style name="ElementTextLarge"> <style name="ElementTextLarge">
<item name="@android:textSize">28sp</item> <item name="android:textSize">28sp</item>
</style> </style>
<style name="GroupLabel"> <style name="GroupLabel">
<item name="@android:textSize">20sp</item> <item name="android:textSize">20sp</item>
</style> </style>
<style name="WhiteOnBlack"> <style name="WhiteOnBlack">
<!-- <item name="@android:background">#666666</item> --> <!-- <item name="android:background">#666666</item> -->
<item <item
name="@android:textColor">@android:color/primary_text_dark</item> name="android:textColor">@android:color/primary_text_dark</item>
<item name="@android:textSize">20sp</item> <item name="android:textSize">20sp</item>
</style> </style>
<style name="WhiteOnBlackSmall" parent="WhiteOnBlack"> <style name="WhiteOnBlackSmall" parent="WhiteOnBlack">
<item name="@android:textSize">12sp</item> <item name="android:textSize">12sp</item>
</style> </style>
<style name="WhiteOnDarkSmall" parent="WhiteOnBlack"> <style name="WhiteOnDarkSmall" parent="WhiteOnBlack">
<item name="@android:textSize">12sp</item> <item name="android:textSize">12sp</item>
<!-- <item name="@android:background">#222222</item> --> <!-- <item name="android:background">#222222</item> -->
</style> </style>
<style name="ElementTextTitle" parent="WhiteOnBlack"> <style name="ElementTextTitle" parent="WhiteOnBlack">
<item name="@android:textColor">@color/group</item> <item name="android:textColor">@color/group</item>
</style> </style>
<style name="EntryItem"> <style name="EntryItem">
<item name="@android:padding">5sp</item> <item name="android:padding">5sp</item>
</style> </style>
<style name="DividerEntry"> <style name="DividerEntry">
<item name="android:layout_width">match_parent</item> <item name="android:layout_width">match_parent</item>

36
app/src/main/res/values-v21/styles.xml
View File

@@ -21,46 +21,46 @@
<style name="NoTitleBar" parent="android:Theme.Material"></style> <style name="NoTitleBar" parent="android:Theme.Material"></style>
<style name="Dialog" parent="android:Theme.Material.Dialog"></style> <style name="Dialog" parent="android:Theme.Material.Dialog"></style>
<style name="GroupTextSmall" parent="android:Theme.Material"> <style name="GroupTextSmall" parent="android:Theme.Material">
<item name="@android:textColor">@color/group</item> <item name="android:textColor">@color/group</item>
<item name="@android:textSize">15sp</item> <item name="android:textSize">15sp</item>
</style> </style>
<style name="GroupText" parent="android:Theme.Material"> <style name="GroupText" parent="android:Theme.Material">
<item name="@android:textColor">@color/group</item> <item name="android:textColor">@color/group</item>
<item name="@android:textSize">20sp</item> <item name="android:textSize">20sp</item>
</style> </style>
<style name="GroupTextLarge" parent="android:Theme.Material"> <style name="GroupTextLarge" parent="android:Theme.Material">
<item name="@android:textColor">@color/group</item> <item name="android:textColor">@color/group</item>
<item name="@android:textSize">28sp</item> <item name="android:textSize">28sp</item>
</style> </style>
<style name="ElementTextSmall"> <style name="ElementTextSmall">
<item name="@android:textSize">15sp</item> <item name="android:textSize">15sp</item>
</style> </style>
<style name="ElementText"> <style name="ElementText">
<item name="@android:textSize">20sp</item> <item name="android:textSize">20sp</item>
</style> </style>
<style name="ElementTextLarge"> <style name="ElementTextLarge">
<item name="@android:textSize">28sp</item> <item name="android:textSize">28sp</item>
</style> </style>
<style name="GroupLabel"> <style name="GroupLabel">
<item name="@android:textSize">20sp</item> <item name="android:textSize">20sp</item>
</style> </style>
<style name="WhiteOnBlack"> <style name="WhiteOnBlack">
<!-- <item name="@android:background">#666666</item> --> <!-- <item name="android:background">#666666</item> -->
<item <item
name="@android:textColor">@android:color/primary_text_dark</item> name="android:textColor">@android:color/primary_text_dark</item>
<item name="@android:textSize">20sp</item> <item name="android:textSize">20sp</item>
</style> </style>
<style name="WhiteOnBlackSmall" parent="WhiteOnBlack"> <style name="WhiteOnBlackSmall" parent="WhiteOnBlack">
<item name="@android:textSize">12sp</item> <item name="android:textSize">12sp</item>
</style> </style>
<style name="WhiteOnDarkSmall" parent="WhiteOnBlack"> <style name="WhiteOnDarkSmall" parent="WhiteOnBlack">
<item name="@android:textSize">12sp</item> <item name="android:textSize">12sp</item>
<!-- <item name="@android:background">#222222</item> --> <!-- <item name="android:background">#222222</item> -->
</style> </style>
<style name="ElementTextTitle" parent="WhiteOnBlack"> <style name="ElementTextTitle" parent="WhiteOnBlack">
<item name="@android:textColor">@color/group</item> <item name="android:textColor">@color/group</item>
</style> </style>
<style name="EntryItem"> <style name="EntryItem">
<item name="@android:padding">5sp</item> <item name="android:padding">5sp</item>
</style> </style>
</resources> </resources>

40
app/src/main/res/values/styles.xml
View File

@@ -21,52 +21,52 @@
<style name="NoTitleBar" parent="android:Theme.NoTitleBar"></style> <style name="NoTitleBar" parent="android:Theme.NoTitleBar"></style>
<style name="Dialog" parent="android:Theme.Dialog"></style> <style name="Dialog" parent="android:Theme.Dialog"></style>
<style name="GroupTextSmall" parent="android:Theme"> <style name="GroupTextSmall" parent="android:Theme">
<item name="@android:textColor">@color/group</item> <item name="android:textColor">@color/group</item>
<item name="@android:textSize">15sp</item> <item name="android:textSize">15sp</item>
</style> </style>
<style name="GroupText" parent="android:Theme"> <style name="GroupText" parent="android:Theme">
<item name="@android:textColor">@color/group</item> <item name="android:textColor">@color/group</item>
<item name="@android:textSize">20sp</item> <item name="android:textSize">20sp</item>
</style> </style>
<style name="GroupTextLarge" parent="android:Theme"> <style name="GroupTextLarge" parent="android:Theme">
<item name="@android:textColor">@color/group</item> <item name="android:textColor">@color/group</item>
<item name="@android:textSize">28sp</item> <item name="android:textSize">28sp</item>
</style> </style>
<style name="ElementTextSmall"> <style name="ElementTextSmall">
<item name="@android:textSize">15sp</item> <item name="android:textSize">15sp</item>
</style> </style>
<style name="ElementText"> <style name="ElementText">
<item name="@android:textSize">20sp</item> <item name="android:textSize">20sp</item>
</style> </style>
<style name="ElementTextLarge"> <style name="ElementTextLarge">
<item name="@android:textSize">28sp</item> <item name="android:textSize">28sp</item>
</style> </style>
<style name="GroupLabel"> <style name="GroupLabel">
<item name="@android:textSize">20sp</item> <item name="android:textSize">20sp</item>
</style> </style>
<style name="Small"> <style name="Small">
<item name="@android:textSize">12sp</item> <item name="android:textSize">12sp</item>
</style> </style>
<style name="WhiteOnBlack"> <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:textColor">@android:color/primary_text_dark</item>
<item name="@android:textSize">20sp</item> <item name="android:textSize">20sp</item>
</style> </style>
<style name="WhiteOnBlackSmall" parent="WhiteOnBlack"> <style name="WhiteOnBlackSmall" parent="WhiteOnBlack">
<item name="@android:textSize">12sp</item> <item name="android:textSize">12sp</item>
</style> </style>
<style name="DarkOnBlackSmall" parent="WhiteOnBlackSmall"> <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>
<style name="WhiteOnDarkSmall" parent="WhiteOnBlack"> <style name="WhiteOnDarkSmall" parent="WhiteOnBlack">
<item name="@android:textSize">12sp</item> <item name="android:textSize">12sp</item>
<!-- <item name="@android:background">#222222</item> --> <!-- <item name="android:background">#222222</item> -->
</style> </style>
<style name="ElementTextTitle" parent="WhiteOnBlack"> <style name="ElementTextTitle" parent="WhiteOnBlack">
<item name="@android:textColor">@color/group</item> <item name="android:textColor">@color/group</item>
</style> </style>
<style name="EntryItem"> <style name="EntryItem">
<item name="@android:padding">5sp</item> <item name="android:padding">5sp</item>
</style> </style>
<style name="Divider"> <style name="Divider">
<item name="android:layout_width">match_parent</item> <item name="android:layout_width">match_parent</item>

2
build.gradle
View File

@@ -4,7 +4,7 @@ buildscript {
jcenter() jcenter()
} }
dependencies { 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
View File

@@ -1,6 +1,6 @@
#Sun Mar 26 15:21:55 CDT 2017 #Sat Oct 28 10:13:14 CDT 2017
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists 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