Skip to content

Commit

Permalink
Merge pull request IEEE-VIT#9 from alsd4git/master
Browse files Browse the repository at this point in the history
extracted strings, added italian translation, updated dependencies
  • Loading branch information
reallyinvincible authored Oct 7, 2019
2 parents 1ebf3e5 + ae2803d commit 77d981e
Show file tree
Hide file tree
Showing 10 changed files with 19 additions and 153 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ captures/

# IntelliJ
*.iml
.idea/
.idea/workspace.xml
.idea/tasks.xml
.idea/gradle.xml
Expand Down
116 changes: 0 additions & 116 deletions .idea/codeStyles/Project.xml

This file was deleted.

9 changes: 0 additions & 9 deletions .idea/misc.xml

This file was deleted.

12 changes: 0 additions & 12 deletions .idea/runConfigurations.xml

This file was deleted.

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

This file was deleted.

8 changes: 4 additions & 4 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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'
}
4 changes: 2 additions & 2 deletions app/src/main/res/layout/content_answer_view.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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"/>
Expand All @@ -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"/>
Expand Down
6 changes: 6 additions & 0 deletions app/src/main/res/values-it/strings.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="app_name">Calci</string>
<string name="current_calculation">Calcolo corrente</string>
<string name="total_calculation">Risultato</string>
</resources>
2 changes: 2 additions & 0 deletions app/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
<resources>
<string name="app_name">Calci</string>
<string name="current_calculation">Current Calculation</string>
<string name="total_calculation">Total Calculation</string>
</resources>
8 changes: 4 additions & 4 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand All @@ -18,7 +18,7 @@ allprojects {
repositories {
google()
jcenter()

}
}

Expand Down

0 comments on commit 77d981e

Please sign in to comment.