Skip to content

Commit

Permalink
Merge pull request #26 from honza-kasik/0.12-alpha-small-fixes
Browse files Browse the repository at this point in the history
Forcing portrait mode, solving #25
  • Loading branch information
honza-kasik authored Nov 29, 2016

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
2 parents d8c33e1 + 269cee0 commit 4120bb6
Showing 4 changed files with 10 additions and 6 deletions.
4 changes: 2 additions & 2 deletions app/build.gradle
Original file line number Diff line number Diff line change
@@ -7,8 +7,8 @@ android {
applicationId "cz.honzakasik.bazenolomouc"
minSdkVersion 21
targetSdkVersion 24
versionCode 1
versionName "0.1-Alpha"
versionCode 2
versionName "0.12-alpha"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
}
buildTypes {
3 changes: 2 additions & 1 deletion app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -11,7 +11,8 @@
android:label="@string/app_name"
android:supportsRtl="true"
android:theme="@style/AppTheme">
<activity android:name=".MainActivity">
<activity android:name=".MainActivity"
android:screenOrientation="portrait">
<intent-filter>
<action android:name="android.intent.action.MAIN" />

5 changes: 4 additions & 1 deletion app/src/main/res/values-cs/strings.xml
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@
<string name="app_name">Olomoucký bazén</string>
<string name="about_application">O aplikaci</string>
<string name="app_credits">Autor: Honza Kašík – honzakasik.cz. Pokud narazíte na problém, prosím, vyplňte issue na GitHubu: https://github.com/honza-kasik/OlomouckyBazen</string>
<string name="app_description">Aplikace zobrazující aktuální dostupné dráhy pro veřejnost a počet návštěvníků areálu</string>
<string name="app_description">Neoficiální aplikace zobrazující aktuálně dostupné dráhy pro veřejnost a počet návštěvníků areálu.</string>
<string name="arrow_left_content_description">Zobrazí obsazenost drah za třicet minut</string>
<string name="arrow_right_content_description">Zobrazí obsazenost drah před třiceti minutami</string>
<string name="invalid_date_error_message">Neplatné datum! Není možné jít do minulosti.</string>
@@ -12,4 +12,7 @@
<string name="swimming_pool_is_closed_now">Plavecký bazén je nyní zavřený!</string>
<string name="swimming_pool_occupation_label">Obsazenost bazénu</string>
<string name="update_data">Aktualizovat</string>

<string name="connection_error_message">Problém s připojením k internetu. Zkuste to prosím za chvíli znovu.</string>

</resources>
4 changes: 2 additions & 2 deletions app/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<resources>
<string name="app_name">Swimming Pool Olomouc</string>
<string name="app_description">Application showing occupancy and current temperature in Olomouc swimming pool. This app is not official!</string>
<string name="app_credits">Author: Honza Kašík – honzakasik.cz. If you run into any problems fill an issue on GitHub.</string>
<string name="app_description">Unofficial application showing occupancy and available tracks for public at Olomouc swimming pool.</string>
<string name="app_credits">Author: Honza Kašík – honzakasik.cz. If you run into any problems, please, fill an issue on GitHub.</string>

<string name="invalid_date_error_message">Invalid date!</string>
<string name="swimming_pool_occupation_label">Swimming pool occupation</string>

0 comments on commit 4120bb6

Please sign in to comment.