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 'feature/fix_entercip13' into develop

Browse source
This commit is contained in:
jacques 2022-10-05 10:20:25 +02:00
commit dc2327f143
2 changed files with 57 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
app/build.gradle
View file

@ -30,7 +30,7 @@ android {
keyPassword secretProperties['signing_key_password'] keyPassword secretProperties['signing_key_password']
} }
} }
compileSdk 31 compileSdk 33
defaultConfig { defaultConfig {
applicationId "net.foucry.pilldroid" applicationId "net.foucry.pilldroid"
@ -97,21 +97,22 @@ sourceSets {
} }
} }
dependencies { dependencies {
implementation "androidx.room:room-common:2.4.2" implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
annotationProcessor "androidx.room:room-compiler:2.4.2" implementation "androidx.room:room-common:2.4.3"
implementation "androidx.room:room-testing:2.4.2" annotationProcessor "androidx.room:room-compiler:2.4.3"
implementation "androidx.room:room-rxjava3:2.4.2" implementation "androidx.room:room-testing:2.4.3"
implementation "androidx.room:room-runtime:2.4.2" implementation "androidx.room:room-rxjava3:2.4.3"
implementation "androidx.room:room-runtime:2.4.3"
implementation fileTree(include: ['*.jar'], dir: 'libs') implementation fileTree(include: ['*.jar'], dir: 'libs')
testImplementation 'junit:junit:4.13.2' testImplementation 'junit:junit:4.13.2'
implementation 'androidx.appcompat:appcompat:1.4.2' implementation 'androidx.appcompat:appcompat:1.5.1'
implementation 'androidx.recyclerview:recyclerview:1.2.1' implementation 'androidx.recyclerview:recyclerview:1.2.1'
implementation 'com.google.android.material:material:1.6.1' implementation 'com.google.android.material:material:1.6.1'
implementation 'androidx.legacy:legacy-support-v4:1.0.0' implementation 'androidx.legacy:legacy-support-v4:1.0.0'
implementation 'com.journeyapps:zxing-android-embedded:4.3.0' implementation 'com.journeyapps:zxing-android-embedded:4.3.0'
implementation 'androidx.core:core:1.8.0' implementation 'androidx.core:core:1.9.0'
coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.2.0' coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.0.0'
} }

73
app/src/main/res/layout/input_dialog.xml
View file

@ -1,41 +1,62 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="match_parent"
xmlns:tools="http://schemas.android.com/tools"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:orientation="vertical" android:orientation="vertical"
android:padding="10dp"
tools:ignore="MissingDefaultResource"> tools:ignore="MissingDefaultResource">
<TextView <TextView
android:id="@+id/textView" android:id="@+id/textView"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:text="@string/enter_cip_13" android:text="@string/enter_cip_13"
android:textAppearance="?android:attr/textAppearanceMedium" /> android:textAppearance="?android:attr/textAppearanceMedium"
app:layout_constraintStart_toStartOf="parent"
<EditText app:layout_constraintTop_toTopOf="parent" />
android:id="@+id/edittext"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentEnd="true"
android:layout_centerVertical="true"
android:autofillHints="@string/enter_cip_13_here"
android:hint="@string/enter_cip_13_here"
android:inputType="number"
android:layout_marginTop="50dp"
tools:ignore="RelativeOverlap" />
<TextView <TextView
android:id="@+id/startcip13" android:id="@+id/startcip13"
android:layout_width="wrap_content" android:layout_width="70dp"
android:layout_height="wrap_content" android:layout_height="match_parent"
android:layout_alignParentStart="true" android:layout_marginStart="16dp"
android:layout_centerVertical="true" android:layout_marginTop="44dp"
android:layout_toStartOf="@+id/edittext"
android:ems="10"
android:text="34009" android:text="34009"
android:textAlignment="viewEnd" android:textAlignment="viewEnd"
android:layout_marginEnd="15dp" android:textSize="24sp"
android:textSize="24sp" /> app:layout_constraintStart_toStartOf="parent"
</RelativeLayout> app:layout_constraintTop_toTopOf="parent" />
<EditText
android:id="@+id/edittext"
android:layout_width="301dp"
android:layout_height="48dp"
android:layout_marginStart="104dp"
android:layout_marginTop="32dp"
android:autofillHints="@string/enter_cip_13_here"
android:hint="@string/enter_cip_13_here"
android:inputType="number"
android:textColorHint="#546E7A"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
tools:ignore="RelativeOverlap" />
<androidx.constraintlayout.widget.Guideline
android:id="@+id/guideline4"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical"
app:layout_constraintGuide_begin="20dp" />
<androidx.constraintlayout.widget.Guideline
android:id="@+id/guideline5"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="horizontal"
app:layout_constraintGuide_begin="94dp" />
</androidx.constraintlayout.widget.ConstraintLayout>