From cebec19e716fe7f3b657805f79e29afd97459ff4 Mon Sep 17 00:00:00 2001 From: Alessandro Digilio Date: Mon, 7 Oct 2019 02:21:09 +0200 Subject: [PATCH 1/2] extracted strings, added italian translation, updated dependencies and build tools --- .idea/.name | 1 + app/build.gradle | 8 ++++---- app/src/main/res/layout/content_answer_view.xml | 4 ++-- app/src/main/res/values-it/strings.xml | 6 ++++++ app/src/main/res/values/strings.xml | 2 ++ build.gradle | 8 ++++---- 6 files changed, 19 insertions(+), 10 deletions(-) create mode 100644 .idea/.name create mode 100644 app/src/main/res/values-it/strings.xml diff --git a/.idea/.name b/.idea/.name new file mode 100644 index 0000000..1e2600a --- /dev/null +++ b/.idea/.name @@ -0,0 +1 @@ +Calci \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 5403395..c87d2d7 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -2,7 +2,7 @@ apply plugin: 'com.android.application' android { compileSdkVersion 29 - buildToolsVersion "29.0.0" + buildToolsVersion "29.0.2" defaultConfig { applicationId "com.exuberant.calci" minSdkVersion 21 @@ -21,10 +21,10 @@ android { dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) - implementation 'androidx.appcompat:appcompat:1.0.2' + implementation 'androidx.appcompat:appcompat:1.1.0' implementation 'androidx.constraintlayout:constraintlayout:1.1.3' testImplementation 'junit:junit:4.12' - androidTestImplementation 'androidx.test:runner:1.1.1' - androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1' + androidTestImplementation 'androidx.test:runner:1.2.0' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0' implementation 'com.google.android.material:material:1.1.0-beta01' } diff --git a/app/src/main/res/layout/content_answer_view.xml b/app/src/main/res/layout/content_answer_view.xml index 970907e..cfeceec 100644 --- a/app/src/main/res/layout/content_answer_view.xml +++ b/app/src/main/res/layout/content_answer_view.xml @@ -11,7 +11,7 @@ android:layout_marginTop="16dp" android:gravity="end" android:textSize="24sp" - android:text="Total Calculation" + android:text="@string/total_calculation" android:textColor="#757575" android:layout_width="match_parent" android:layout_height="wrap_content"/> @@ -24,7 +24,7 @@ android:layout_marginEnd="16dp" android:gravity="end" android:textSize="32sp" - android:text="Current Calculation" + android:text="@string/current_calculation" android:textColor="#757575" android:layout_width="match_parent" android:layout_height="wrap_content"/> diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml new file mode 100644 index 0000000..b682571 --- /dev/null +++ b/app/src/main/res/values-it/strings.xml @@ -0,0 +1,6 @@ + + + Calci + Calcolo corrente + Risultato + \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 3c3a285..e1d6e5a 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1,3 +1,5 @@ Calci + Current Calculation + Total Calculation diff --git a/build.gradle b/build.gradle index f5fb2cc..05d53ae 100644 --- a/build.gradle +++ b/build.gradle @@ -4,11 +4,11 @@ buildscript { repositories { google() jcenter() - + } dependencies { - classpath 'com.android.tools.build:gradle:3.5.0' - + classpath 'com.android.tools.build:gradle:3.5.1' + // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files } @@ -18,7 +18,7 @@ allprojects { repositories { google() jcenter() - + } } From ae2803d5067ac2af19f5300b08c936434f8e9e17 Mon Sep 17 00:00:00 2001 From: Alessandro Digilio Date: Mon, 7 Oct 2019 09:49:55 +0200 Subject: [PATCH 2/2] removed .idea folder --- .gitignore | 1 + .idea/.name | 1 - .idea/codeStyles/Project.xml | 116 ----------------------------------- .idea/misc.xml | 9 --- .idea/runConfigurations.xml | 12 ---- .idea/vcs.xml | 6 -- 6 files changed, 1 insertion(+), 144 deletions(-) delete mode 100644 .idea/.name delete mode 100644 .idea/codeStyles/Project.xml delete mode 100644 .idea/misc.xml delete mode 100644 .idea/runConfigurations.xml delete mode 100644 .idea/vcs.xml diff --git a/.gitignore b/.gitignore index 1a869a7..b834b49 100644 --- a/.gitignore +++ b/.gitignore @@ -31,6 +31,7 @@ captures/ # IntelliJ *.iml +.idea/ .idea/workspace.xml .idea/tasks.xml .idea/gradle.xml diff --git a/.idea/.name b/.idea/.name deleted file mode 100644 index 1e2600a..0000000 --- a/.idea/.name +++ /dev/null @@ -1 +0,0 @@ -Calci \ No newline at end of file diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml deleted file mode 100644 index 681f41a..0000000 --- a/.idea/codeStyles/Project.xml +++ /dev/null @@ -1,116 +0,0 @@ - - - - - - - -
- - - - xmlns:android - - ^$ - - - -
-
- - - - xmlns:.* - - ^$ - - - BY_NAME - -
-
- - - - .*:id - - http://schemas.android.com/apk/res/android - - - -
-
- - - - .*:name - - http://schemas.android.com/apk/res/android - - - -
-
- - - - name - - ^$ - - - -
-
- - - - style - - ^$ - - - -
-
- - - - .* - - ^$ - - - BY_NAME - -
-
- - - - .* - - http://schemas.android.com/apk/res/android - - - ANDROID_ATTRIBUTE_ORDER - -
-
- - - - .* - - .* - - - BY_NAME - -
- - - - - \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml deleted file mode 100644 index 37a7509..0000000 --- a/.idea/misc.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml deleted file mode 100644 index 7f68460..0000000 --- a/.idea/runConfigurations.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml deleted file mode 100644 index 94a25f7..0000000 --- a/.idea/vcs.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file