thib8956/diceroller
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Added layouts

Browse Source
This commit is contained in:
thibaud 2017-04-20 13:50:24 +02:00
parent ec1bf57a98
commit d806e0291b
6 changed files with 96 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.idea/misc.xml
View File

@ -37,7 +37,7 @@
<ConfirmationsSetting value="0" id="Add" /> <ConfirmationsSetting value="0" id="Add" />
<ConfirmationsSetting value="0" id="Remove" /> <ConfirmationsSetting value="0" id="Remove" />
</component> </component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK"> <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/build/classes" /> <output url="file://$PROJECT_DIR$/build/classes" />
</component> </component>
<component name="ProjectType"> <component name="ProjectType">

6
.idea/vcs.xml Normal file
View File

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="VcsDirectoryMappings">
<mapping directory="$PROJECT_DIR$" vcs="Git" />
</component>
</project>

10
app/src/main/java/com/example/diceroller/DiceActivity.java Normal file
View File

@ -0,0 +1,10 @@
package com.example.diceroller;
import android.app.Activity;
/**
* Created by thibaud on 20/04/17.
*/
public class DiceActivity extends Activity {
}

30
app/src/main/res/layout/activity_dice.xml Normal file
View File

@ -0,0 +1,30 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical" android:layout_width="match_parent"
android:layout_height="match_parent">
<TextView
android:id="@+id/textTitle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:text="@string/x_sided_dice"
android:textSize="30sp"/>
<TextView
android:id="@+id/textResult"
android:layout_width="wrap_content"
android:layout_height="0dp"
android:layout_weight="1"
android:layout_gravity="center"
android:gravity="center"
android:text="@string/x"
android:textSize="250sp"/>
<Button
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/roll_dice"
android:textSize="25sp"
android:layout_gravity="center"/>
</LinearLayout>

55
app/src/main/res/layout/activity_main.xml
View File

@ -1,18 +1,47 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto" android:orientation="vertical" android:layout_width="match_parent"
xmlns:tools="http://schemas.android.com/tools" android:layout_height="match_parent">
<Space
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="0dp"
tools:context="com.example.diceroller.MainActivity"> android:layout_weight="1" />
<TextView <!-- On place les Button dans des FrameLayout afin de pouvoir
android:layout_width="wrap_content" définir leur taille verticale -->
<FrameLayout
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1">
<Button
android:id="@+id/button6"
android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="Hello World!" android:layout_gravity="center"
app:layout_constraintBottom_toBottomOf="parent" android:padding="20dp"
app:layout_constraintLeft_toLeftOf="parent" android:layout_margin="20dp"
app:layout_constraintRight_toRightOf="parent" android:text="@string/_6_sided_dice"
app:layout_constraintTop_toTopOf="parent" /> android:textSize="18sp"/>
</FrameLayout>
</android.support.constraint.ConstraintLayout> <FrameLayout
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1">
<Button
android:id="@+id/button20"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:padding="20dp"
android:layout_margin="20dp"
android:text="@string/_20_sided_dice"
android:textSize="18sp"/>
</FrameLayout>
<Space
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1" />
</LinearLayout>

5
app/src/main/res/values/strings.xml
View File

@ -1,3 +1,8 @@
<resources> <resources>
<string name="app_name">DiceRoller</string> <string name="app_name">DiceRoller</string>
<string name="_6_sided_dice">6-sided dice</string>
<string name="_20_sided_dice">20-sided dice</string>
<string name="x_sided_dice">X sided dice</string>
<string name="x">X</string>
<string name="roll_dice">Roll dice !</string>
</resources> </resources>