Skip to content

Commit

Permalink
Update icon; update target SDK level
Browse files Browse the repository at this point in the history
  • Loading branch information
solkin committed Aug 21, 2023
1 parent 1fff956 commit e1533c7
Show file tree
Hide file tree
Showing 28 changed files with 349 additions and 30 deletions.
310 changes: 310 additions & 0 deletions .idea/assetWizardSettings.xml

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion .idea/compiler.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions .idea/kotlinc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

23 changes: 11 additions & 12 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@ apply plugin: 'com.android.application'

apply plugin: 'kotlin-android'

apply plugin: 'kotlin-android-extensions'

android {
signingConfigs {
release {
Expand All @@ -13,13 +11,13 @@ android {
if (project.hasProperty("keyPassword")) keyPassword project.keyPassword
}
}
compileSdkVersion 32
compileSdk 33
defaultConfig {
applicationId "com.tomclaw.kvassword"
minSdkVersion 21
targetSdkVersion 32
versionCode project.hasProperty("versionCode") ? Integer.parseInt(project.versionCode) : 1000
versionName "1.7"
targetSdkVersion 33
versionCode project.hasProperty("versionCode") ? Integer.parseInt(project.versionCode) : 82
versionName "1.8"
manifestPlaceholders = [
APPCENTER_APP_ID: "3072f86b-5b3a-4480-8881-0e1f00948f82"
]
Expand All @@ -33,15 +31,16 @@ android {
}
}
compileOptions {
targetCompatibility 1.8
sourceCompatibility 1.8
targetCompatibility 17
sourceCompatibility 17
}
namespace 'com.tomclaw.kvassword'
}

dependencies {
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
implementation 'com.google.android.material:material:1.6.1'
implementation 'com.google.code.gson:gson:2.8.9'
implementation "com.microsoft.appcenter:appcenter-analytics:4.1.0"
implementation "com.microsoft.appcenter:appcenter-crashes:4.1.0"
implementation 'com.google.android.material:material:1.9.0'
implementation 'com.google.code.gson:gson:2.10.1'
implementation "com.microsoft.appcenter:appcenter-analytics:4.4.5"
implementation "com.microsoft.appcenter:appcenter-crashes:4.4.5"
}
5 changes: 2 additions & 3 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.tomclaw.kvassword">
<manifest xmlns:android="http://schemas.android.com/apk/res/android">

<application
android:allowBackup="true"
Expand All @@ -18,7 +17,7 @@
</intent-filter>
</activity>
<meta-data
android:name="net.hockeyapp.android.appIdentifier"
android:name="appcenter.app_identifier"
android:value="${APPCENTER_APP_ID}" />
</application>

Expand Down
Binary file modified app/src/main/ic_launcher-playstore.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion app/src/main/java/com/tomclaw/kvassword/MainActivity.kt
Original file line number Diff line number Diff line change
Expand Up @@ -373,4 +373,4 @@ private const val KEY_PASSWORD = "password"
private const val KEY_NICKNAME = "nickname"
private const val KEY_NAVIGATION = "navigation"

private const val APP_IDENTIFIER_KEY = "net.hockeyapp.android.appIdentifier"
private const val APP_IDENTIFIER_KEY = "appcenter.app_identifier"
3 changes: 2 additions & 1 deletion app/src/main/java/com/tomclaw/kvassword/Strings.kt
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import android.content.res.Resources
import android.text.Spannable
import android.text.SpannableString
import android.text.style.ForegroundColorSpan
import java.util.Locale
import java.util.Random

fun Random.digit(): String = (1 + nextInt(9)).toString()
Expand All @@ -24,7 +25,7 @@ fun Array<out String>.concat(): String {
}

fun String.toFirstUpper(): String {
return substring(0, 1).toUpperCase() + substring(1).toLowerCase()
return substring(0, 1).uppercase(Locale.getDefault()) + substring(1).lowercase(Locale.getDefault())
}

fun List<Span>.concatItems(resources: Resources): Spannable {
Expand Down
17 changes: 9 additions & 8 deletions app/src/main/res/drawable/ic_launcher_foreground.xml
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="108dp"
android:height="108dp"
android:viewportWidth="108"
android:viewportHeight="108">
<group android:scaleX="0.12648083"
android:scaleY="0.12648083"
android:translateX="36.925087"
android:translateY="35.85">
android:viewportWidth="24"
android:viewportHeight="24"
android:tint="#FFFFFF">
<group android:scaleX="0.464"
android:scaleY="0.464"
android:translateX="6.432"
android:translateY="6.432">
<path
android:pathData="M24.22,270.05C27.23,270.05 30.18,269.5 32.97,268.42C34.12,267.98 35.32,267.74 36.34,267.74C37.03,267.74 37.96,267.85 38.48,268.37L52.6,282.48C55.44,285.32 59.22,286.89 63.23,286.89C67.25,286.89 71.03,285.33 73.87,282.48L86.87,269.48C89.72,266.64 91.29,262.86 91.29,258.84C91.29,254.82 89.72,251.05 86.87,248.21L72.76,234.09C72.06,233.4 72.06,232.26 72.75,231.56L74.99,229.32C75.42,228.88 75.91,228.79 76.25,228.79C76.58,228.79 77.07,228.88 77.5,229.31L91.63,243.46C94.47,246.3 98.25,247.87 102.26,247.87C106.28,247.87 110.05,246.3 112.89,243.46L125.9,230.46C131.72,224.58 131.72,215.04 125.92,209.18L111.78,195.04C111.35,194.61 111.26,194.12 111.26,193.78C111.26,193.44 111.35,192.95 111.78,192.52L168.14,136.15C168.89,135.4 170.43,134.9 171.96,134.9C172.76,134.9 173.54,135.03 174.16,135.28C182.49,138.58 191.26,140.25 200.22,140.25C218.82,140.25 236.32,133.01 249.48,119.88C276.84,92.47 276.84,47.93 249.48,20.57C236.21,7.31 218.57,0 199.81,0C181.05,0 163.41,7.31 150.14,20.57C130.47,40.25 124.43,69.8 134.75,95.86C135.5,97.76 135.07,100.68 133.87,101.88L7.08,228.7C2.51,233.26 0,239.35 0,245.84C0,252.33 2.52,258.42 7.08,262.98C11.64,267.53 17.72,270.05 24.22,270.05ZM178.07,70.22C178.07,64.4 180.32,58.94 184.41,54.84C188.52,50.73 193.99,48.47 199.81,48.47C205.63,48.47 211.1,50.73 215.21,54.84C219.3,58.94 221.55,64.4 221.55,70.22C221.55,76.05 219.3,81.51 215.21,85.6C211.1,89.69 205.63,91.95 199.81,91.95C193.99,91.95 188.52,89.69 184.41,85.6C180.32,81.51 178.07,76.05 178.07,70.22Z"
android:fillColor="#FDE6FF"/>
android:fillColor="@android:color/white"
android:pathData="M21,10h-8.35C11.83,7.67 9.61,6 7,6c-3.31,0 -6,2.69 -6,6s2.69,6 6,6c2.61,0 4.83,-1.67 5.65,-4H13l2,2l2,-2l2,2l4,-4.04L21,10zM7,15c-1.65,0 -3,-1.35 -3,-3c0,-1.65 1.35,-3 3,-3s3,1.35 3,3C10,13.65 8.65,15 7,15z"/>
</group>
</vector>
Binary file added app/src/main/res/mipmap-hdpi/ic_launcher.webp
Binary file not shown.
Binary file removed app/src/main/res/mipmap-hdpi/ic_launcher_round.png
Binary file not shown.
Binary file not shown.
Binary file added app/src/main/res/mipmap-mdpi/ic_launcher.webp
Binary file not shown.
Binary file removed app/src/main/res/mipmap-mdpi/ic_launcher_round.png
Binary file not shown.
Binary file not shown.
Binary file added app/src/main/res/mipmap-xhdpi/ic_launcher.webp
Binary file not shown.
Binary file removed app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
Binary file not shown.
Binary file not shown.
Binary file added app/src/main/res/mipmap-xxhdpi/ic_launcher.webp
Binary file not shown.
Binary file removed app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
Binary file not shown.
Binary file not shown.
Binary file added app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp
Binary file not shown.
Binary file not shown.
Binary file not shown.
4 changes: 2 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.

buildscript {
ext.kotlin_version = '1.6.0'
ext.kotlin_version = '1.8.21'
repositories {
google()
mavenCentral()
}
dependencies {
classpath 'com.android.tools.build:gradle:7.2.2'
classpath 'com.android.tools.build:gradle:8.1.1'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"

// NOTE: Do not place your application dependencies here; they belong
Expand Down
3 changes: 3 additions & 0 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,10 @@
# http://www.gradle.org/docs/current/userguide/build_environment.html
# Specifies the JVM arguments used for the daemon process.
# The setting is particularly useful for tweaking memory settings.
android.defaults.buildfeatures.buildconfig=true
android.enableJetifier=true
android.nonFinalResIds=false
android.nonTransitiveRClass=false
android.useAndroidX=true
org.gradle.jvmargs=-Xmx1536m
# When configured, Gradle will run in incubating parallel mode.
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip

0 comments on commit e1533c7

Please sign in to comment.