Merge remote-tracking branch 'origin/master'
continuous-integration/drone/push Build is passing Details

master
Jeremy DUCOURTHIAL 1 year ago
commit afd2b52013

@ -14,7 +14,7 @@
android:theme="@style/Theme.MathsEduc" android:theme="@style/Theme.MathsEduc"
tools:targetApi="31"> tools:targetApi="31">
<activity android:name=".MainActivity" android:exported="true"> <activity android:name=".MainActivity" android:exported="true">
<intent-filter>= <intent-filter>
<category android:name="android.intent.category.LAUNCHER"/> <category android:name="android.intent.category.LAUNCHER"/>
<action android:name="android.intent.action.MAIN"/> <action android:name="android.intent.action.MAIN"/>
</intent-filter> </intent-filter>

Binary file not shown.

After

Width:  |  Height:  |  Size: 22 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 152 KiB

@ -4,28 +4,42 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:orientation="vertical" android:orientation="vertical"
tools:context=".MainActivity"> tools:context=".MainActivity"
android:gravity="center">
<TextView <ImageView
android:id="@+id/textTitle" android:id="@+id/background_image"
android:layout_width="wrap_content" android:layout_width="165dp"
android:layout_height="wrap_content" android:layout_height="138dp"
android:layout_gravity="center_horizontal" android:layout_gravity="center_horizontal"
android:layout_marginTop="24dp" android:layout_marginTop="30dp"
android:text="@string/app_name" android:contentDescription="@string/app_name"
android:textSize="34sp" /> android:scaleType="centerCrop"
android:src="@drawable/logo" />
<Button <Button
android:id="@+id/btnSolo" android:id="@+id/btnSolo"
android:layout_width="match_parent" android:layout_width="370dp"
android:layout_height="wrap_content" android:layout_height="90dp"
android:layout_marginTop="16dp" android:layout_marginTop="40dp"
android:backgroundTint="@color/green"
android:text="@string/solo" /> android:text="@string/solo" />
<Button <Button
android:id="@+id/btnMulti" android:id="@+id/btnMulti"
android:layout_width="match_parent" android:layout_width="370dp"
android:layout_height="wrap_content" android:layout_height="90dp"
android:layout_marginTop="8dp" android:layout_marginTop="30dp"
android:backgroundTint="@color/orange"
android:text="@string/multiplayer" /> android:text="@string/multiplayer" />
<Button
android:id="@+id/btnConnexion"
android:layout_width="200dp"
android:layout_height="60dp"
android:layout_marginTop="50dp"
android:backgroundTint="@color/grey"
android:text="@string/connexion" />
</LinearLayout> </LinearLayout>

@ -7,4 +7,7 @@
<color name="teal_700">#FF018786</color> <color name="teal_700">#FF018786</color>
<color name="black">#FF000000</color> <color name="black">#FF000000</color>
<color name="white">#FFFFFFFF</color> <color name="white">#FFFFFFFF</color>
<color name="green">#008000</color>
<color name="orange">#FFA500</color>
<color name="grey">#8C92AC</color>
</resources> </resources>

@ -2,4 +2,6 @@
<string name="app_name">MathsEduc</string> <string name="app_name">MathsEduc</string>
<string name="solo">Solo</string> <string name="solo">Solo</string>
<string name="multiplayer">Multiplayer</string> <string name="multiplayer">Multiplayer</string>
<string name="connexion">Connexion</string>
<string name="profile">Profile</string>
</resources> </resources>

@ -12,5 +12,6 @@
<!-- Status bar color. --> <!-- Status bar color. -->
<item name="android:statusBarColor">?attr/colorPrimaryVariant</item> <item name="android:statusBarColor">?attr/colorPrimaryVariant</item>
<!-- Customize your theme here. --> <!-- Customize your theme here. -->
<item name="android:windowBackground">@drawable/background</item>
</style> </style>
</resources> </resources>
Loading…
Cancel
Save