Commit 7645b424 authored by djamel's avatar djamel

mise à jour de la barnav danas l'activité principal

parent 80470b36
......@@ -37,7 +37,7 @@
<ConfirmationsSetting value="0" id="Add" />
<ConfirmationsSetting value="0" id="Remove" />
</component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.7" project-jdk-type="JavaSDK">
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.7" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/build/classes" />
</component>
<component name="ProjectType">
......
......@@ -4,7 +4,7 @@
android:layout_height="match_parent">
<ListView
android:layout_width="wrap_content"
android:layout_height="478dp"
android:layout_height="wrap_content"
android:id="@+id/listView"/>
<LinearLayout
......@@ -19,18 +19,15 @@
android:id="@+id/id"
android:layout_weight="1"
android:numeric="integer"
android:layout_below="@+id/listView"
android:hint="id"/>
android:hint="@string/id" />
<EditText
android:layout_width="0dp"
android:layout_height="wrap_content"
android:id="@+id/key"
android:layout_weight="3"
android:layout_toRightOf="@id/id"
android:autoText="false"
android:hint="key"
/>
android:hint="@string/key" />
<Button
style="?android:attr/buttonStyleSmall"
......@@ -38,8 +35,7 @@
android:layout_height="wrap_content"
android:text="@string/new_key"
android:layout_weight="1"
android:id="@+id/new_key"
android:layout_toRightOf="@id/key"/>
android:id="@+id/new_key" />
</LinearLayout>
</RelativeLayout>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android" >
<menu xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
tools:context=".Read_QR_Code">
<item android:id="@+id/action_settings"
android:title="@string/settings"/>
android:icon="@drawable/ic_settings_black_48dp"
app:showAsAction="ifRoom"
android:title="@string/settings"/>
</menu>
......@@ -9,4 +9,6 @@
<string name="error_lib_empty">Veuillez entrer au moins une clé valide</string>
<string name="ebillet_true">Le billet est valide</string>
<string name="ebillet_false">Le billet n\'est pas valide</string>
<string name="id">id</string>
<string name="key">key</string>
</resources>
<resources>
<style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar" />
<style name="AppTheme" parent="Theme.AppCompat.Light" />
</resources>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment