Skip to content

Commit

Permalink
2.0.0
Browse files Browse the repository at this point in the history
  • Loading branch information
MarioSwitch committed Aug 30, 2022
1 parent eacbe6e commit 8248973
Show file tree
Hide file tree
Showing 8 changed files with 32 additions and 15 deletions.
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.

8 changes: 4 additions & 4 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ android {
applicationId "fr.marioswitch.time"
minSdk 21
targetSdk 32
versionCode 6
versionName "2.β2"
versionCode 7
versionName "2.0.0"

testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}
Expand All @@ -33,8 +33,8 @@ android {

dependencies {

implementation 'androidx.core:core-ktx:1.7.0'
implementation 'androidx.appcompat:appcompat:1.4.2'
implementation 'androidx.core:core-ktx:1.8.0'
implementation 'androidx.appcompat:appcompat:1.5.0'
implementation 'com.google.android.material:material:1.6.1'
implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
testImplementation 'junit:junit:4.13.2'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@
"kind": "Directory"
},
"applicationId": "fr.marioswitch.time",
"variantName": "debug",
"variantName": "release",
"elements": [
{
"type": "SINGLE",
"filters": [],
"attributes": [],
"versionCode": 6,
"versionName": "2.β2",
"outputFile": "app-debug.apk"
"versionCode": 7,
"versionName": "2.0.0",
"outputFile": "app-release.apk"
}
],
"elementType": "File"
Expand Down
5 changes: 3 additions & 2 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,13 @@
android:icon="@mipmap/ic_launcher"
android:label="@string/app_name"
android:roundIcon="@mipmap/ic_launcher_round"
android:supportsRtl="true"
android:supportsRtl="false"
android:theme="@style/Theme"
tools:targetApi="31">
<activity
android:name=".MainActivity"
android:exported="true">
android:exported="true"
android:screenOrientation="portrait">
<intent-filter>
<action android:name="android.intent.action.MAIN" />

Expand Down
12 changes: 8 additions & 4 deletions app/src/main/res/layout/activity_main.xml
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,8 @@
app:layout_constraintBottom_toBottomOf="@+id/level"
app:layout_constraintEnd_toStartOf="@+id/view"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="@+id/level_title" />
app:layout_constraintTop_toTopOf="@+id/level_title"
android:contentDescription="@string/bronze_medal" />

<ImageView
android:id="@+id/silver_icon"
Expand All @@ -117,7 +118,8 @@
app:layout_constraintBottom_toBottomOf="@+id/level"
app:layout_constraintEnd_toStartOf="@+id/view"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="@+id/level_title" />
app:layout_constraintTop_toTopOf="@+id/level_title"
android:contentDescription="@string/silver_medal" />

<ImageView
android:id="@+id/gold_icon"
Expand All @@ -127,7 +129,8 @@
app:layout_constraintBottom_toBottomOf="@+id/level"
app:layout_constraintEnd_toStartOf="@+id/view"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="@+id/level_title" />
app:layout_constraintTop_toTopOf="@+id/level_title"
android:contentDescription="@string/gold_medal" />

<ImageView
android:id="@+id/diamond_icon"
Expand All @@ -137,6 +140,7 @@
app:layout_constraintBottom_toBottomOf="@+id/level"
app:layout_constraintEnd_toStartOf="@+id/view"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="@+id/level_title" />
app:layout_constraintTop_toTopOf="@+id/level_title"
android:contentDescription="@string/diamond_medal" />

</androidx.constraintlayout.widget.ConstraintLayout>
4 changes: 4 additions & 0 deletions app/src/main/res/values-es/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -32,4 +32,8 @@
<string name="nextlevel12">14 días</string>
<string name="nextlevel13">30 días</string>
<string name="nextlevel14">Ninguna</string>
<string name="bronze_medal">Medalla de bronce</string>
<string name="silver_medal">Medalla de plata</string>
<string name="gold_medal">Medalla de oro</string>
<string name="diamond_medal">Medalla de diamante</string>
</resources>
4 changes: 4 additions & 0 deletions app/src/main/res/values-fr/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -32,4 +32,8 @@
<string name="nextlevel12">14 jours</string>
<string name="nextlevel13">30 jours</string>
<string name="nextlevel14">Aucun</string>
<string name="bronze_medal">Médaille de bronze</string>
<string name="silver_medal">Médaille d\'argent</string>
<string name="gold_medal">Médaille d\'or</string>
<string name="diamond_medal">Médaille de diamant</string>
</resources>
4 changes: 4 additions & 0 deletions app/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -32,4 +32,8 @@
<string name="nextlevel12">14 days</string>
<string name="nextlevel13">30 days</string>
<string name="nextlevel14">None</string>
<string name="bronze_medal">Bronze Medal</string>
<string name="silver_medal">Silver Medal</string>
<string name="gold_medal">Gold Medal</string>
<string name="diamond_medal">Diamond Medal</string>
</resources>

0 comments on commit 8248973

Please sign in to comment.