Commit 50468eca authored by Bartek Fabiszewski's avatar Bartek Fabiszewski
Browse files

Merge branch 'master' into waypoint 

# Conflicts:
#	app/build.gradle
parents a0f436ba ac084930

app/build.gradle

+3 −3
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ apply plugin: 'com.android.application' 


android {

    compileSdkVersion 29

    buildToolsVersion '29.0.0'

    buildToolsVersion '29.0.2'



    defaultConfig {

        applicationId 'net.fabiszewski.ulogger'
@@ -45,8 +45,8 @@ android { 


dependencies {

    implementation fileTree(include: ['*.jar'], dir: 'libs')

    implementation 'androidx.appcompat:appcompat:1.1.0-rc01'

    implementation 'androidx.preference:preference:1.1.0-rc01'

    implementation 'androidx.appcompat:appcompat:1.1.0'

    implementation 'androidx.preference:preference:1.1.0'

    implementation 'androidx.exifinterface:exifinterface:1.0.0'

    testImplementation 'junit:junit:4.12'

}

app/src/main/res/values-cs/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ 
    <string name="no_track_warning">Nejprve nastavte novou trasu</string>

    <string name="empty_trackname_warning">Název trasy nemůže být prázdný</string>

    <string name="logger_running_warning">Nejdříve zastavte aktuální sledování</string>

    <string name="about">O nás...</string>

    <string name="about">O nás…</string>

    <string name="about_description">Jednoduchý záznamník polohy s podporou živého sledování a nahrávání pozic do vlastních stránek <xliff:g id="server_link_open"><![CDATA[<a href=\"https://github.com/bfabiszewski/ulogger-server\">]]></xliff:g>μlogger server<xliff:g id="server_link_close"><![CDATA[</a>]]></xliff:g>.</string>

    <string name="about_description2">Další informace a nápovědu naleznete na domovské stránce <xliff:g id="app_link_open"><![CDATA[ <a href=\"https://github.com/bfabiszewski/ulogger-android\">]]></xliff:g> μlogger <xliff:g id="app_link_close"><![CDATA[</a>]]></xliff:g>.</string>

    <string name="about_version">Verze %s</string>

app/src/main/res/xml/network_security_config.xml

+3 −2
Original line number Diff line number Diff line
@@ -8,8 +8,9 @@ 
  ~ See <http://www.gnu.org/licenses/>

  -->



<network-security-config>

    <base-config cleartextTrafficPermitted="true">

<network-security-config xmlns:tools="http://schemas.android.com/tools">

    <base-config cleartextTrafficPermitted="true"

        tools:ignore="InsecureBaseConfiguration">

        <trust-anchors>

            <certificates src="system" />

            <certificates src="user" />

build.gradle

+1 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ buildscript { 
        jcenter()

    }

    dependencies {

        classpath 'com.android.tools.build:gradle:3.4.2'

        classpath 'com.android.tools.build:gradle:3.5.0'

    }

}

gradle/wrapper/gradle-wrapper.properties

+2 −2
Original line number Diff line number Diff line 
#Sat May 04 21:00:45 CEST 2019

#Mon Sep 16 09:29:20 CEST 2019

distributionBase=GRADLE_USER_HOME

distributionPath=wrapper/dists

zipStoreBase=GRADLE_USER_HOME

zipStorePath=wrapper/dists

distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip
 
distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip