lovis_ix/Pilldroid
1
1
Fork 0
mirror of https://github.com/jfoucry/Pilldroid.git synced 2024-11-22 04:29:22 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'bugfix/fix-prerelease' into develop

Browse source
This commit is contained in:
jacques 2021-12-04 21:19:54 +01:00
commit 63f68b0db8
52 changed files with 376 additions and 584 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/build.gradle
View file

@ -2,8 +2,8 @@
apply plugin: 'com.android.application'
ext.versionMajor = 0
ext.versionMinor = 60
ext.versionPatch = 20211115
ext.versionMinor = 65
ext.versionPatch = 20211204
ext.versionClassifier = null
ext.isSnapshot = false
ext.minimumSdkVersion = defaultMinSdkVersion

20
app/preproduct/prerelease/output-metadata.json Normal file
View file

@ -0,0 +1,20 @@
{
"version": 3,
"artifactType": {
"type": "APK",
"kind": "Directory"
},
"applicationId": "net.foucry.pilldroid",
"variantName": "preproductPrerelease",
"elements": [
{
"type": "SINGLE",
"filters": [],
"attributes": [],
"versionCode": 260217704,
"versionName": "0.65.20211204-ac94daf",
"outputFile": "app-preproduct-prerelease.apk"
}
],
"elementType": "File"
}

6
app/src/main/assets/about.html
View file

@ -16,7 +16,7 @@
<body>
<center><img src="file:///android_asset/ic_launcher-web.png" width="64"/></center>
<!--<div class="build">[[[about_string]]]</div>-->
<h5>PillDroid &copy;&nbsp;2020 Jacques Foucry </h5>
<h5>PillDroid &copy;&nbsp;2021 Jacques Foucry </h5>
<p>PillDroid est une gestion théorique de votre stock de médicaments.</p>
<p>PillDroid n'a aucune connaissance des interactions des médicaments entre eux.</p>
<p class="red">EN CAS DE DOUTE, CONSULTEZ VOTRE MÉDECIN OU VOTRE PHARMACIEN.</p>
@ -26,12 +26,12 @@
<p>PillDroid n'aurait pas pu voir le jour sans les conseils avisés de Frank, Benoit, Dominique &amp; Aurélien.</p>
<p>Stéphane en grand chamboulateur d'interface en fait quelque chose d'utilisable</p>
<hr width=45%/>
<p>Les conseils et aides de <a href="mob-dev.fr">mob-dev.fr</a>.</p>
<p>Les conseils et aides de <a href="https://mob-dev.fr">mob-dev.fr</a>.</p>
<p>Le soutien actif et les conseils du Dr Kauffmann me permettent de faire
évoluer PillDroid.</p>
<p>Vous pouvez me contacter à l'adresse suivante : <a
href="mailto:jacques+PillDroid@foucry.net?subject=À propos de
PillDroid">jacques+pilldroid@foucry.net</a></p>.
<p>Le site web de l'<a href="https://pildroid.foucry.net">application</a>.
<p>Le site web de l'<a href="https://pilldroid.foucry.net">application</a>.
</body>
</html>

BIN
app/src/main/res/drawable/content_save.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 403 B

10
app/src/main/res/drawable/ic_baseline_add_circle_24.xml
View file

@ -1,10 +0,0 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24"
android:tint="?attr/colorControlNormal">
<path
android:fillColor="@android:color/white"
android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM17,13h-4v4h-2v-4L7,13v-2h4L11,7h2v4h4v2z"/>
</vector>

31
app/src/main/res/drawable/ic_icon_officielle_android.xml
View file

@ -1,31 +0,0 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:aapt="http://schemas.android.com/aapt"
android:width="1024dp"
android:height="1024dp"
android:viewportWidth="1024"
android:viewportHeight="1024">
<path
android:pathData="M0,0h1024v1024h-1024z"
android:strokeWidth="2"
android:fillColor="#2c75ff"
android:strokeColor="#00000000"
android:fillType="nonZero"/>
<path
android:pathData="M270.22,598.75C100.34,496.76 112.04,503.85 103.99,498.08 97.09,493.14 83.3,480.94 77.72,474.84 54.48,449.45 39.25,418.26 32.91,383.12 31.24,373.86 29.8,349.63 30.41,341.17 33.3,301.26 47.02,265.54 70.82,235.94 123.21,170.8 211.33,152.85 283.15,192.69c8.33,4.62 308.41,186.09 308.98,186.46 0.64,0.43 -1.77,0.5 -3.69,1.79 -43.37,28.95 -86.69,76.32 -118.01,129.03 -26.24,44.17 -44.75,95.02 -50.07,137.56 -1.65,13.19 -1.98,28.66 -1.39,36.02 0.17,2.08 0.49,4.23 0.24,4.25 -0.25,0.02 -67.76,-40.29 -148.99,-89.05z"
android:fillColor="#ff0000"
android:strokeColor="#00000000"
android:fillType="evenOdd"/>
<path
android:pathData="m780.26,882.05c-1.22,-0.11 -6.22,-0.35 -11.1,-0.51 -18.42,-0.63 -37.94,-6.33 -55.42,-16.17 -4.98,-2.8 -74.42,-44.42 -154.31,-92.48l-145.25,-87.38 0.11,-11.72c0.12,-13.28 3.18,-32.51 8.11,-51.04 23.6,-88.72 84.95,-183.58 155.56,-240.53 4.14,-3.34 8.25,-6.18 9.18,-6.05 2.62,0.35 293.81,176.26 303.96,183.26 28.37,19.55 48.24,52.78 55.9,93.46 2.93,15.59 2.78,44.99 -0.32,62.58 -6.28,35.63 -19.82,66.45 -41.79,95.14 -21.43,27.99 -44.42,46.36 -74.72,59.71 -7.52,3.31 -14.6,5.32 -28.82,8.16 -10.37,2.07 -19.85,3.68 -21.07,3.56v0z"
android:fillColor="#ebebeb"
android:strokeColor="#00000000"
android:fillType="evenOdd"/>
<path
android:pathData="m268.31,209.94c-55.66,-33.49 -118.17,-29.81 -144.71,7.13 31.24,-23.49 85.79,-21.26 135.58,8.7L861.38,588.14c22.28,13.41 40.35,30.49 53.25,48.82 -9.75,-29.09 -33.17,-58.06 -66.49,-78.11z"
android:strokeAlpha="0.75"
android:strokeWidth="5.649193"
android:fillColor="#ffffff"
android:strokeColor="#ffffff"
android:fillAlpha="0.75"
android:strokeLineCap="round"/>
</vector>

29
app/src/main/res/drawable/ic_launcher_foreground.xml
View file

@ -1,5 +1,4 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:aapt="http://schemas.android.com/aapt"
android:width="108dp"
android:height="108dp"
android:viewportWidth="108"
@ -8,23 +7,15 @@
android:scaleY="0.052734375"
android:translateX="27"
android:translateY="27">
<path
android:pathData="M270.22,597.99C100.34,468.26 112.04,477.27 103.99,469.93 97.09,463.64 83.3,448.12 77.72,440.37 54.48,408.06 39.25,368.39 32.91,323.68 31.24,311.91 29.8,281.09 30.41,270.33 33.3,219.55 47.02,174.11 70.82,136.45 123.21,53.59 211.33,30.75 283.15,81.44c8.33,5.88 308.41,236.73 308.98,237.2 0.64,0.54 -1.77,0.64 -3.69,2.27 -43.37,36.83 -86.69,97.08 -118.01,164.15 -26.24,56.19 -44.75,120.88 -50.07,174.99 -1.65,16.78 -1.98,36.46 -1.39,45.82 0.17,2.65 0.49,5.38 0.24,5.41 -0.25,0.03 -67.76,-51.25 -148.99,-113.28z"
android:fillColor="#ff0000"
android:strokeColor="#00000000"
android:fillType="evenOdd"/>
<path
android:pathData="m780.26,958.4c-1.22,-0.15 -6.22,-0.44 -11.1,-0.65 -18.42,-0.81 -37.94,-8.05 -55.42,-20.56 -4.98,-3.57 -74.42,-56.51 -154.31,-117.64l-145.25,-111.16 0.11,-14.91c0.12,-16.89 3.18,-41.36 8.11,-64.93 23.6,-112.87 84.95,-233.54 155.56,-305.98 4.14,-4.25 8.25,-7.86 9.18,-7.7 2.62,0.44 293.81,224.23 303.96,233.13 28.37,24.87 48.24,67.14 55.9,118.9 2.93,19.83 2.78,57.23 -0.32,79.62 -6.28,45.32 -19.82,84.53 -41.79,121.03 -21.43,35.6 -44.42,58.97 -74.72,75.96 -7.52,4.22 -14.6,6.77 -28.82,10.38 -10.37,2.64 -19.85,4.68 -21.07,4.53l0,0z"
android:fillColor="#ebebeb"
android:strokeColor="#00000000"
android:fillType="evenOdd"/>
<path
android:pathData="m268.31,103.38c-55.66,-42.6 -118.17,-37.92 -144.71,9.07 31.24,-29.88 85.79,-27.04 135.58,11.07L861.38,584.5c22.28,17.06 40.35,38.79 53.25,62.1 -9.75,-37 -33.17,-73.86 -66.49,-99.36z"
android:strokeAlpha="0.75"
android:strokeWidth="6.3716674"
android:fillColor="#ffffff"
android:strokeColor="#ffffff"
android:fillAlpha="0.75"
android:strokeLineCap="round"/>
<path android:fillColor="#ff0000" android:fillType="evenOdd"
android:pathData="M277.68,599.16C122.1,452.58 132.81,462.76 125.55,454.62 119.34,447.66 107.23,430.8 102.48,422.51 82.7,387.98 71.64,346.95 69.95,301.82 69.5,289.94 71.25,259.13 72.97,248.49 81.09,198.29 99.43,154.5 126.99,119.5 187.64,42.49 277.65,28.87 343.86,86.7 351.53,93.4 626.18,353.99 626.7,354.52c0.58,0.6 -1.83,0.45 -3.91,1.88 -46.94,32.16 -96.24,87.62 -134.32,151.09 -31.9,53.18 -56.99,115.61 -67.87,168.89 -3.37,16.52 -5.73,36.06 -6.11,45.44 -0.11,2.66 -0.07,5.41 -0.32,5.41 -0.25,0 -62.1,-57.97 -136.5,-128.06z"
android:strokeColor="#00000000" android:strokeWidth="1.12789"/>
<path android:fillColor="#ebebeb" android:fillType="evenOdd"
android:pathData="m698.5,963.81c-1.2,-0.27 -6.14,-1.08 -10.98,-1.8 -18.24,-2.7 -36.91,-11.93 -53,-26.18 -4.59,-4.06 -68.19,-63.89 -141.34,-132.94l-133,-125.56 1.65,-14.82c1.87,-16.79 7.43,-40.81 14.77,-63.75 35.13,-109.83 108.61,-223.53 186.31,-288.29 4.56,-3.8 9.02,-6.96 9.92,-6.71 2.56,0.71 269.09,253.36 278.27,263.26 25.65,27.67 41.05,71.76 43.33,124.03 0.87,20.03 -3.14,57.21 -8.53,79.16 -10.93,44.43 -28.44,82.03 -54.06,116.07 -24.99,33.2 -50.27,54.07 -82.16,67.84 -7.91,3.42 -15.22,5.22 -29.74,7.35 -10.59,1.55 -20.23,2.6 -21.43,2.33v0z"
android:strokeColor="#00000000" android:strokeWidth="1.12789"/>
<path android:fillAlpha="0.75" android:fillColor="#ffffff"
android:pathData="m312.67,102.55c-47.67,-45.01 -106.28,-46.69 -135.51,-5.54 31.95,-24.78 82.43,-16.88 125.07,23.39L817.98,607.42c19.08,18.02 33.8,39.98 43.55,62.92 -5.5,-35.37 -23.73,-71.92 -52.26,-98.86z"
android:strokeAlpha="0.75" android:strokeColor="#ffffff"
android:strokeLineCap="round" android:strokeWidth="2.19584"/>
</group>
</vector>

BIN
app/src/main/res/drawable/icon_small.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 1.2 KiB

BIN
app/src/main/res/drawable/lower_stock_bitmap.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 1.1 KiB

BIN
app/src/main/res/drawable/ok_stock_bitmap.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 1.1 KiB

BIN
app/src/main/res/drawable/pilldroid_icon.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 98 KiB

BIN
app/src/main/res/drawable/plus_icon_small.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 798 B

BIN
app/src/main/res/drawable/qr_code_scan.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 322 B

BIN
app/src/main/res/drawable/suspended_pill.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 870 B

BIN
app/src/main/res/drawable/suspended_pill_slide.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 1.1 KiB

BIN
app/src/main/res/drawable/warning_stock_bitmap.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 971 B

7
app/src/main/res/layout/custom_barcode_scanner.xml
View file

@ -14,7 +14,7 @@
<com.journeyapps.barcodescanner.ViewfinderView
android:id="@+id/zxing_viewfinder_view"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_height="match_parent"
android:layout_gravity="center"
app:zxing_possible_result_points="@color/zxing_custom_possible_result_points"
app:zxing_result_view="@color/zxing_custom_result_view"
@ -26,9 +26,12 @@
android:id="@+id/zxing_status_view"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal|top"
android:layout_gravity="center_horizontal"
android:layout_marginTop="@dimen/app_bar_height"
android:background="@color/zxing_transparent"
android:fontFamily="sans-serif-black"
android:textSize="32sp"
android:textAlignment="center"
android:text="@string/zxing_msg_default_status"
android:textColor="@color/design_default_color_primary_dark"
tools:ignore="PrivateResource" />

14
app/src/main/res/layout/custom_button.xml
View file

@ -1,14 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<com.google.android.material.floatingactionbutton.FloatingActionButton xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/fb"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:layout_gravity="top|center"
android:backgroundTint="@android:color/transparent"
app:fabCustomSize="60dp"
app:maxImageSize="60dp"
android:src="@drawable/ic_add_circle_black_24dp"
android:contentDescription="@string/add_button" />

12
app/src/main/res/layout/drug_detail.xml
View file

@ -8,21 +8,21 @@
<include
android:id="@+id/name_cell"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:layout_height="match_parent"
layout="@layout/info_cell" />
<include
android:id="@+id/presentation_cell"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:layout_height="match_parent"
layout="@layout/info_cell"/>
<!-- android:layout_marginTop="5sp" />-->
<include
android:id="@+id/administration_cell"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:layout_height="match_parent"
layout="@layout/info_cell"/>
<!-- android:layout_marginTop="5sp" />-->

20
app/src/main/res/layout/info_cell.xml
View file

@ -1,12 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical" android:layout_width="match_parent"
android:layout_height="50dp"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/list_selector">
<TextView
android:id="@+id/value"
android:layout_width="match_parent"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingStart="10sp"
android:paddingEnd="10sp"
@ -15,18 +16,19 @@
android:textColor="#040404"
android:textSize="16sp"
android:textStyle="bold" />
<TextView
android:layout_width="match_parent"
android:id="@+id/label"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/label"
android:layout_below="@+id/value"
android:layout_alignParentStart="true"
android:textStyle="italic"
android:textColor="#0c4758"
android:background="@android:color/transparent"
android:id="@+id/label"
android:paddingStart="10sp"
android:paddingTop="5dp"
android:paddingEnd="10sp"
android:paddingTop="5dp"/>
android:text="@string/label"
android:textColor="#0c4758"
android:textStyle="italic" />
</RelativeLayout>

23
app/src/main/res/layout/welcome1.xml
View file

@ -1,23 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/bg_screen1">
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:gravity="center_horizontal"
android:orientation="vertical"
tools:ignore="UselessParent">
android:background="@color/bg_screen1"
android:gravity="center"
android:orientation="vertical">
<ImageView
android:layout_width="@dimen/img_width_height"
android:layout_height="@dimen/img_width_height"
android:src="@drawable/ic_launcher_foreground"
android:contentDescription="@string/pilldroid_icon" />
android:contentDescription="@string/pilldroid_icon"
android:src="@drawable/pilldroid_icon" />
<TextView
android:layout_width="wrap_content"
@ -29,7 +25,7 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_height="58dp"
android:layout_marginTop="20dp"
android:paddingLeft="@dimen/desc_padding"
android:paddingRight="@dimen/desc_padding"
@ -39,4 +35,3 @@
android:textSize="@dimen/slide_desc" />
</LinearLayout>
</RelativeLayout>

23
app/src/main/res/layout/welcome10.xml
View file

@ -1,31 +1,28 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/bg_screen5">
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:gravity="center_horizontal"
android:background="@color/bg_screen5"
android:gravity="center"
android:orientation="vertical">
<ImageView
android:layout_width="@dimen/img_width_height"
android:layout_height="@dimen/img_width_height"
android:src="@drawable/ic_suspended_pill"
android:contentDescription="@string/suspended_treatment_icon" />
android:contentDescription="@string/suspended_treatment_icon"
android:src="@drawable/ic_suspended_pill" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingStart="@dimen/title_padding"
android:paddingEnd="@dimen/title_padding"
android:text="@string/slide10_Pilldroid"
android:textAlignment="center"
android:textColor="@android:color/white"
android:textSize="@dimen/slide_title"
android:textStyle="bold"
android:paddingStart="@dimen/title_padding"
android:paddingEnd="@dimen/title_padding"/>
android:textStyle="bold" />
<TextView
android:layout_width="wrap_content"
@ -37,6 +34,4 @@
android:textAlignment="center"
android:textColor="@android:color/white"
android:textSize="@dimen/slide_desc" />
</LinearLayout>
</RelativeLayout>

23
app/src/main/res/layout/welcome11.xml
View file

@ -1,31 +1,28 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/bg_screen3">
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:gravity="center_horizontal"
android:background="@color/bg_screen3"
android:gravity="center"
android:orientation="vertical">
<ImageView
android:layout_width="@dimen/img_width_height"
android:layout_height="@dimen/img_width_height"
android:src="@drawable/ic_save_black_24dp"
android:contentDescription="@string/save_icon" />
android:contentDescription="@string/save_icon"
android:src="@drawable/ic_save_black_24dp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingStart="@dimen/title_padding"
android:paddingEnd="@dimen/title_padding"
android:text="@string/slide11_Pilldroid"
android:textAlignment="center"
android:textColor="@android:color/white"
android:textSize="@dimen/slide_title"
android:textStyle="bold"
android:paddingStart="@dimen/title_padding"
android:paddingEnd="@dimen/title_padding"/>
android:textStyle="bold" />
<TextView
android:layout_width="wrap_content"
@ -37,6 +34,4 @@
android:textAlignment="center"
android:textColor="@android:color/white"
android:textSize="@dimen/slide_desc" />
</LinearLayout>
</RelativeLayout>

25
app/src/main/res/layout/welcome12.xml
View file

@ -1,34 +1,31 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/bg_screen1">
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:gravity="center_horizontal"
android:background="@color/bg_screen1"
android:gravity="center"
android:orientation="vertical">
<ImageView
android:layout_width="@dimen/img_width_height"
android:layout_height="@dimen/img_width_height"
android:src="@drawable/ic_launcher_foreground"
android:contentDescription="@string/pilldroid_icon" />
android:contentDescription="@string/pilldroid_icon"
android:src="@drawable/pilldroid_icon" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingStart="@dimen/title_padding"
android:paddingEnd="@dimen/title_padding"
android:text="@string/slide12_Pilldroid"
android:textAlignment="center"
android:textColor="@android:color/white"
android:textSize="@dimen/slide_title"
android:textStyle="bold"
android:paddingStart="@dimen/title_padding"
android:paddingEnd="@dimen/title_padding"/>
android:textStyle="bold" />
<TextView
android:layout_width="wrap_content"
android:layout_width="350dp"
android:layout_height="wrap_content"
android:layout_marginTop="20dp"
android:paddingLeft="@dimen/desc_padding"
@ -37,6 +34,4 @@
android:textAlignment="center"
android:textColor="@android:color/white"
android:textSize="@dimen/slide_desc" />
</LinearLayout>
</RelativeLayout>

21
app/src/main/res/layout/welcome2.xml
View file

@ -1,14 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/bg_screen2">
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:gravity="center_horizontal"
android:background="@color/bg_screen2"
android:gravity="center"
android:orientation="vertical">
<ImageView
@ -20,13 +16,13 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingStart="@dimen/title_padding"
android:paddingEnd="@dimen/title_padding"
android:text="@string/slide2_Pilldroid"
android:textAlignment="center"
android:textColor="@android:color/white"
android:textSize="@dimen/slide_title"
android:textAlignment="center"
android:textStyle="bold"
android:paddingEnd="@dimen/title_padding"
android:paddingStart="@dimen/title_padding"/>
android:textStyle="bold" />
<TextView
android:layout_width="wrap_content"
@ -40,6 +36,3 @@
android:textSize="@dimen/slide_desc" />
</LinearLayout>
</RelativeLayout>

26
app/src/main/res/layout/welcome3.xml
View file

@ -1,36 +1,32 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/bg_screen3">
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:gravity="center_horizontal"
android:background="@color/bg_screen3"
android:gravity="center"
android:orientation="vertical">
<ImageView
android:layout_width="@dimen/img_width_height"
android:layout_height="@dimen/img_width_height"
android:src="@drawable/ic_barcode"
android:contentDescription="@string/barre_code_icone" />
android:contentDescription="@string/barre_code_icone"
android:src="@drawable/ic_barcode" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingStart="@dimen/title_padding"
android:paddingEnd="@dimen/title_padding"
android:text="@string/slide3_Pilldroid"
android:textAlignment="center"
android:textColor="@android:color/white"
android:textSize="@dimen/slide_title"
android:textAlignment="center"
android:textStyle="bold"
android:paddingStart="@dimen/title_padding"
android:paddingEnd="@dimen/title_padding"/>
android:textStyle="bold" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_height="33dp"
android:layout_marginTop="20dp"
android:paddingLeft="@dimen/desc_padding"
android:paddingRight="@dimen/desc_padding"
@ -40,5 +36,3 @@
android:textSize="@dimen/slide_desc" />
</LinearLayout>
</RelativeLayout>

19
app/src/main/res/layout/welcome4.xml
View file

@ -1,21 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/bg_screen4">
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:gravity="center_horizontal"
android:background="@color/bg_screen4"
android:gravity="center"
android:orientation="vertical">
<ImageView
android:layout_width="@dimen/img_width_height"
android:layout_height="@dimen/img_width_height"
android:src="@drawable/ic_qr_code"
android:contentDescription="@string/qr_code_icon" />
android:contentDescription="@string/qr_code_icon"
android:src="@drawable/ic_qr_code" />
<TextView
android:layout_width="wrap_content"
@ -27,7 +22,7 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_height="36dp"
android:layout_marginTop="20dp"
android:paddingLeft="@dimen/desc_padding"
android:paddingRight="@dimen/desc_padding"
@ -37,5 +32,3 @@
android:textSize="@dimen/slide_desc" />
</LinearLayout>
</RelativeLayout>

35
app/src/main/res/layout/welcome5.xml
View file

@ -1,44 +1,29 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/bg_screen3">
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:gravity="center_horizontal"
android:background="@color/bg_screen3"
android:gravity="center"
android:orientation="vertical">
<ImageView
android:layout_width="@dimen/img_width_height"
android:layout_height="@dimen/img_width_height"
android:src="@drawable/ok_stock_vect"
android:contentDescription="@string/happy_face" />
android:contentDescription="@string/happy_face"
android:src="@drawable/ok_stock_vect" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingStart="@dimen/title_padding"
android:paddingEnd="@dimen/title_padding"
android:text="@string/slide5_Pilldroid"
android:textAlignment="center"
android:textColor="@android:color/white"
android:textSize="@dimen/slide_title"
android:textStyle="bold"
android:paddingEnd="@dimen/title_padding"
android:paddingStart="@dimen/title_padding"/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="20dp"
android:paddingLeft="@dimen/desc_padding"
android:paddingRight="@dimen/desc_padding"
android:text="@string/slide5_desc"
android:textAlignment="center"
android:textColor="@android:color/white"
android:textSize="@dimen/slide_desc" />
android:textStyle="bold" />
</LinearLayout>
</RelativeLayout>

34
app/src/main/res/layout/welcome6.xml
View file

@ -1,14 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/bg_screen2">
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:gravity="center_horizontal"
android:background="@color/bg_screen2"
android:gravity="center"
android:orientation="vertical">
<ImageView
@ -20,26 +17,11 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingStart="@dimen/title_padding"
android:paddingEnd="@dimen/title_padding"
android:text="@string/slide6_Pilldroid"
android:textAlignment="center"
android:textColor="@android:color/white"
android:textSize="@dimen/slide_title"
android:textAlignment="center"
android:textStyle="bold"
android:paddingStart="@dimen/title_padding"
android:paddingEnd="@dimen/title_padding"/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="20dp"
android:paddingLeft="@dimen/desc_padding"
android:paddingRight="@dimen/desc_padding"
android:text="@string/slide6_desc"
android:textAlignment="center"
android:textColor="@android:color/white"
android:textSize="@dimen/slide_desc" />
android:textStyle="bold" />
</LinearLayout>
</RelativeLayout>

41
app/src/main/res/layout/welcome7.xml
View file

@ -1,46 +1,25 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/bg_screen4">
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:gravity="center_horizontal"
android:orientation="vertical"
tools:ignore="UselessParent">
android:background="@color/bg_screen4"
android:gravity="center"
android:orientation="vertical">
<ImageView
android:layout_width="@dimen/img_width_height"
android:layout_height="@dimen/img_width_height"
android:src="@drawable/lower_stock_vect"
android:contentDescription="@string/unhappy_face" />
android:contentDescription="@string/unhappy_face"
android:src="@drawable/lower_stock_vect" />
<TextView
android:layout_width="349dp"
android:layout_height="wrap_content"
android:paddingStart="@dimen/title_padding"
android:paddingEnd="@dimen/title_padding"
android:text="@string/slide7_Pilldroid"
android:textAlignment="center"
android:textColor="@android:color/white"
android:textSize="@dimen/slide_title"
android:textAlignment="center"
android:textStyle="bold"
android:paddingEnd="@dimen/title_padding"
android:paddingStart="@dimen/title_padding"/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="20dp"
android:paddingLeft="@dimen/desc_padding"
android:paddingRight="@dimen/desc_padding"
android:text="@string/slide7_desc"
android:textAlignment="center"
android:textColor="@android:color/white"
android:textSize="@dimen/slide_desc" />
android:textStyle="bold" />
</LinearLayout>
</RelativeLayout>

30
app/src/main/res/layout/welcome8.xml
View file

@ -1,14 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/bg_screen1">
<LinearLayout
android:layout_width="@dimen/screen_shot_view_width"
android:layout_height="@dimen/screen_shot_view_height"
android:layout_centerInParent="true"
android:gravity="center_horizontal"
android:background="@color/bg_screen1"
android:gravity="center"
android:orientation="vertical">
<ImageView
@ -20,24 +16,12 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/slide8_Pilldroid"
android:textColor="@android:color/white"
android:textSize="@dimen/slide_title"
android:textStyle="bold"
android:paddingStart="@dimen/title_padding"
android:paddingEnd="@dimen/title_padding"/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="20dp"
android:paddingLeft="@dimen/desc_padding"
android:paddingRight="@dimen/desc_padding"
android:text="@string/slide8_desc"
android:paddingEnd="@dimen/title_padding"
android:text="@string/slide8_Pilldroid"
android:textAlignment="center"
android:textColor="@android:color/white"
android:textSize="@dimen/slide_desc" />
android:textSize="@dimen/slide_title"
android:textStyle="bold" />
</LinearLayout>
</RelativeLayout>

33
app/src/main/res/layout/welcome9.xml
View file

@ -1,14 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/bg_screen2">
<LinearLayout
android:layout_width="@dimen/screen_shot_view_width"
android:layout_height="@dimen/screen_shot_view_height"
android:layout_centerInParent="true"
android:gravity="center_horizontal"
android:background="@color/bg_screen2"
android:gravity="center"
android:orientation="vertical">
<ImageView
@ -20,26 +16,11 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingStart="@dimen/title_padding"
android:paddingEnd="@dimen/title_padding"
android:text="@string/slide9_Pilldroid"
android:textAlignment="center"
android:textColor="@android:color/white"
android:textSize="@dimen/slide_title"
android:textAlignment="center"
android:textStyle="bold"
android:paddingStart="@dimen/title_padding"
android:paddingEnd="@dimen/title_padding"/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="20dp"
android:paddingLeft="@dimen/desc_padding"
android:paddingRight="@dimen/desc_padding"
android:text="@string/slide9_desc"
android:textAlignment="center"
android:textColor="@android:color/white"
android:textSize="@dimen/slide_desc" />
android:textStyle="bold" />
</LinearLayout>
</RelativeLayout>

2
app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
<background android:drawable="@color/ic_launcher_background"/>
<foreground android:drawable="@mipmap/ic_launcher_foreground"/>
<foreground android:drawable="@drawable/ic_launcher_foreground"/>
</adaptive-icon>

2
app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
<background android:drawable="@color/ic_launcher_background"/>
<foreground android:drawable="@mipmap/ic_launcher_foreground"/>
<foreground android:drawable="@drawable/ic_launcher_foreground"/>
</adaptive-icon>

BIN
app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 4.2 KiB

BIN
app/src/main/res/mipmap-hdpi/ic_launcher_round.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 4.7 KiB

BIN
app/src/main/res/mipmap-mdpi/ic_launcher.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 1.6 KiB

BIN
app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 2.5 KiB

BIN
app/src/main/res/mipmap-mdpi/ic_launcher_round.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 2.8 KiB

BIN
app/src/main/res/mipmap-xhdpi/ic_launcher.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 3.6 KiB

BIN
app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 6.1 KiB

BIN
app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 6.9 KiB

BIN
app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 11 KiB

BIN
app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 11 KiB

BIN
app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 8.8 KiB

BIN
app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 16 KiB

BIN
app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 17 KiB

20
app/src/main/res/values-fr-rFR/strings.xml
View file

@ -14,27 +14,23 @@
<string name="drug_warningTherehold_label">Seuil d\'alerte</string>
<string name="msgFound">Médicament trouvé dans la base de données</string>
<string name="drug_current_stock_label">Stock courant</string>
<string name="turn_off_flashlight">Éteindre le flash</string>
<string name="turn_on_flashlight">Allumer le flash</string>
<string name="notification_text">Vous devez passer à la pharmacie</string>
<string name="button_keyboard">Utilisez le clavier</string>
<string name="detail_view">Vue de détail</string>
<string name="scan_action">Scanner un code barre de médicament</string>
<string name="save_button">Enrefistrez</string>
<string name="flashlighButton">Allumez/Éteignez le Flash</string>
<string name="enter_cip_13_here">Enter cip 13 here..</string>
<string name="enter_cip_13">Enter CIP 13</string>
<string name="input_cip13">Saissisez le code CIP 13 à l\'aide du clavier</string>
<!-- Slide Strings -->
<string name="slide1_Pilldroid">Bienvenue dans Pilldroid</string>
<string name="slide2_Pilldroid">Pour ajouter un médicament, tapez sur le bouton « Plus »</string>
<string name="slide3_Pilldroid">Vous pouvez scanner le code barre</string>
<string name="slide4_Pilldroid">Ou le QRCode</string>
<string name="slide5_Pilldroid">Fond vert, visage souriant, le stock est bon</string>
<string name="slide6_Pilldroid">Fond orange, visage neutre</string>
<string name="slide7_Pilldroid">Fond rouge, visage grincheux</string>
<string name="slide9_Pilldroid">Les valeurs modifiables. Le stock est recalculé tous les jours vers midi</string>
<string name="slide5_Pilldroid">Fond vert, visage souriant, le stock est bon.</string>
<string name="slide6_Pilldroid">Fond orange, visage neutre, le stock diminue.</string>
<string name="slide7_Pilldroid">Fond rouge, visage grincheux le stock est bas.</string>
<string name="slide9_Pilldroid">Les valeurs modifiables. Le stock est recalculé tous les jours</string>
<string name="slide8_Pilldroid">Les informations sur le médicament</string>
<string name="slide10_Pilldroid">Traitement suspendu, la prise est mise à zéro, le stock n\'est plus calculé.</string>
<string name="slide11_Pilldroid">L\'icone de sauvegarde de vos modifications.</string>
@ -48,27 +44,21 @@
<string name="happy_face">Visage souriant</string>
<string name="barre_code_icone">Icône de code barre</string>
<string name="qr_code_icon">icône de QR-Code</string>
<string name="slide5_desc">Le stock est suffisant</string>
<string name="slide6_desc">Attention le stock diminue</string>
<string name="slide7_desc">Alerte le stock est très bas</string>
<string name="neutral_face">Visage neutre</string>
<string name="unhappy_face">Visage grincheux</string>
<string name="slide8_desc">Informations sur le médicament</string>
<string name="drug_info">Capture d\'écran sur la partie information du médicament</string>
<string name="slide9_desc">Réglages du stock courant, prise et valeurs d\'attention et d\'alerte</string>
<string name="tunables">Réglages</string>
<string name="slide10_desc">Mettre la prise à zéro suspend le traitement et les calculs de stock</string>
<string name="suspended_treatment_icon">Icône de traitemernt suspendu</string>
<string name="slide11_desc">Pour enregistrer les changements, utilisez l\'icône de sauvegarde</string>
<string name="save_icon">l\'icône de sauvegarde</string>
<string name="slide12_desc">Plus de renseignements sur https://pilldroid.foucry.net</string>
<string name="slide12_desc">Plus de renseignements sur <a href="https://pilldroid.foucry.net">https://pilldroid.foucry.net</a></string>
<string name="skip">Passer</string>
<string name="next">Suivant</string>
<string name="start">Démarrer</string>
<string name="add_button">Ajout d\'un médicament à votre liste</string>
<string name="drugName">Nom Médicament</string>
<string name="stockIcon">Icône de stock</string>
<string name="cip13_goes_here">Ici le cip13</string>
<string name="Date">lundi 1 janvier 2001</string>
<string name="Value">Valeur</string>
<string name="label">Libellé</string>

2
app/src/main/res/values/colors.xml
View file

@ -4,7 +4,6 @@
<color name="colorPrimaryDark">#303F9F</color>
<color name="colorAccent">#FF4081</color>
<color name="black_overlay">#66000000</color>
<!-- slide bg -->
<color name="bg_screen1">#4f91ff</color>
<color name="bg_screen2">#fb9c25</color>
@ -16,7 +15,6 @@
<color name="dot_light">#7f7f5d</color>
<color name="dot_dark">#000000</color>
<color name="tutorial_buttonTextColor">#000000</color>
<color name="led">#31f623</color>
<color name="grey">#777</color>
</resources>

7
app/src/main/res/values/dimens.xml
View file

@ -3,15 +3,11 @@
<dimen name="fab_margin">16dp</dimen>
<dimen name="app_bar_height">75dp</dimen>
<dimen name="item_width">200dp</dimen>
<dimen name="dp19">19dp</dimen>
<dimen name="fab_height">48dp</dimen>
<dimen name="fab_width">48dp</dimen>
<dimen name="fab_marginTop">32dp</dimen>
<!-- Default screen margins, per the Android Design guidelines. -->
<!-- Slide dimens -->
<dimen name="activity_horizontal_margin">16dp</dimen>
<dimen name="activity_vertical_margin">16dp</dimen>
<dimen name="dots_height">75dp</dimen>
<dimen name="dots_margin_bottom">20dp</dimen>
<dimen name="img_width_height">240dp</dimen>
@ -19,9 +15,6 @@
<dimen name="slide_desc">16sp</dimen>
<dimen name="desc_padding">40dp</dimen>
<dimen name="title_padding">20dp</dimen>
<dimen name="screen_shot_view_width">300dp</dimen>
<dimen name="screen_shot_view_height">350dp</dimen>
<dimen name="screen_shot_width">250dp</dimen>
<dimen name="screen_shot_height">250dp</dimen>
</resources>

12
app/src/main/res/values/strings.xml
View file

@ -7,8 +7,6 @@
<string name="about">About</string>
<string name="help">Help</string>
<string name="notification_text">You have to go to the pharmacy</string>
<string name="turn_on_flashlight">Turn Flash On</string>
<string name="turn_off_flashlight">Turn Flash Off</string>
<string name="drug_name_label">Name</string>
<string name="drug_presention_labal">Presentation</string>
<string name="drug_administationMode_label">Administration mode</string>
@ -18,9 +16,7 @@
<string name="drug_alertTherehold_label">Critical therehold</string>
<string name="button_keyboard">"Use the keyboard"</string>
<string name="detail_view">Detail view</string>
<string name="scan_action">Scan a drug barcode</string>
<string name="save_button">Save</string>
<string name="input_cip13">Input Cip13 with the keyboard</string>
<string name="flashlighButton">Toggle Flash</string>
<string name="enter_cip_13_here">Enter cip 13 here..</string>
<string name="enter_cip_13">Enter CIP 13</string>
@ -41,22 +37,17 @@
<string name="slide9_Pilldroid">Tunable</string>
<string name="slide8_Pilldroid">Info</string>
<string name="slide10_Pilldroid">Treatment suspended</string>
<string name="slide11_Pilldroid">save icone</string>
<string name="slide11_Pilldroid">save icon</string>
<string name="slide12_Pilldroid">Thanks</string>
<string name="pilldroid_icon">PillDroid Icon</string>
<string name="the_plus_icon">The plus icon</string>
<string name="slide4_desc">In order to find the CIP13</string>
<string name="slide5_desc">Stock is OK</string>
<string name="slide6_desc">Warning stock in rising down</string>
<string name="slide7_desc">Alert stock too low</string>
<string name="happy_face">Happy face</string>
<string name="barre_code_icone">Barre code icon</string>
<string name="qr_code_icon">qr-code icon</string>
<string name="neutral_face">neutral face</string>
<string name="unhappy_face">unhappy face</string>
<string name="slide8_desc">Drug info</string>
<string name="drug_info">Drug info screenshot</string>
<string name="slide9_desc">Tunables informations</string>
<string name="tunables">Tunables</string>
<string name="slide10_desc">Take to 0 to suspend treatment</string>
<string name="suspended_treatment_icon">Treatment suspended icon</string>
@ -70,7 +61,6 @@
<string name="add_button">Add new drug in list</string>
<string name="drugName">Drug Name</string>
<string name="stockIcon">Stock Icon</string>
<string name="cip13_goes_here">cip13 goes here</string>
<string name="Date">Monday January 1st 2001</string>
<string name="Value">Value</string>
<string name="label">Label</string>

11
app/src/main/res/values/styles.xml
View file

@ -17,15 +17,4 @@
<style name="AppTheme.PopupOverlay" parent="ThemeOverlay.AppCompat.Light" />
<style name="FullscreenTheme" parent="AppTheme">
<item name="android:actionBarStyle">@style/FullscreenActionBarStyle</item>
<item name="android:windowActionBarOverlay">true</item>
<item name="android:windowBackground">@null</item>
<item name="metaButtonBarStyle">?android:attr/buttonBarStyle</item>
<item name="metaButtonBarButtonStyle">?android:attr/buttonBarButtonStyle</item>
</style>
<style name="FullscreenActionBarStyle" parent="Widget.AppCompat.ActionBar">
<item name="android:background">@color/black_overlay</item>
</style>
</resources>