Merge remote-tracking branch 'origin/master'

This commit is contained in:
Gongxter 2015-11-15 12:38:28 +01:00
commit 45ed0fc2da
4 changed files with 12 additions and 5 deletions

View file

@ -15,8 +15,6 @@
<!-- TODO .. add menu --> <!-- TODO .. add menu -->
<!--<android.support.design.widget.NavigationView android:id="@+id/nav_view" <!--<android.support.design.widget.NavigationView android:id="@+id/nav_view"
android:layout_width="wrap_content" android:layout_height="match_parent" android:layout_width="wrap_content" android:layout_height="match_parent"
android:layout_gravity="start" android:fitsSystemWindows="true" > android:layout_gravity="start" android:fitsSystemWindows="true" >

View file

@ -26,11 +26,14 @@
<Button <Button
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="0dp"
android:text="New Button" android:text="@string/start_game"
android:textStyle="normal"
android:id="@+id/button" android:id="@+id/button"
android:layout_gravity="center_horizontal" android:layout_gravity="center_horizontal"
android:layout_weight="1" android:layout_weight="1"
android:onClick="onPlayClick"/> android:onClick="onPlayClick"
android:capitalize="none"
android:clickable="false" />
</LinearLayout> </LinearLayout>

View file

@ -26,4 +26,7 @@
<string name="about_affiliation">In Zusammenarbeit mit:</string> <string name="about_affiliation">In Zusammenarbeit mit:</string>
<string name="about_author">Autor: \nChristopher Beckmann, Timm Lippert</string> <string name="about_author">Autor: \nChristopher Beckmann, Timm Lippert</string>
<!-- New Game -->
<string name="start_game">Spiel starten</string>
</resources> </resources>

View file

@ -49,6 +49,9 @@
<string name="more_info">More information can be found on:</string> <string name="more_info">More information can be found on:</string>
<string name="url"><a href="https://www.secuso.informatik.tu-darmstadt.de/en/research/results/">https://www.secuso.org</a></string> <string name="url"><a href="https://www.secuso.informatik.tu-darmstadt.de/en/research/results/">https://www.secuso.org</a></string>
<!-- ###New Game### -->
<string name="start_game">start game</string>
<!-- end of valid settings --> <!-- end of valid settings -->