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 tag 'fix_button' into develop

Browse source 
Tagging hotfix fix_button fix_button
This commit is contained in:
jacques 2022-05-30 22:36:20 +02:00
commit a13bf79d23
5 changed files with 11 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
app/build.gradle
View file

@ -18,19 +18,15 @@ else {
android { android {
signingConfigs { signingConfigs {
release { release {
storeFile rootProject.file("android-signing-keystore.jks")
storePassword secretProperties['signing_keystore_password']
keyAlias secretProperties['signing_release_alias_key']
keyPassword secretProperties['signing_release_key_password']
} }
prerelease { prerelease {
storeFile rootProject.file("android-signing-keystore.jks") storeFile file("../android-signing-keystore.jks")
storePassword secretProperties['signing_keystore_password'] storePassword secretProperties['signing_keystore_password']
keyAlias secretProperties['signing_pre-release_key_alias'] keyAlias secretProperties['signing_key_alias']
keyPassword secretProperties['signing_pre-release_key_password'] keyPassword secretProperties['signing_key_password']
} }
} }
compileSdkVersion 31 compileSdkVersion 29
defaultConfig { defaultConfig {
applicationId "net.foucry.pilldroid" applicationId "net.foucry.pilldroid"
@ -87,7 +83,7 @@ android {
targetCompatibility JavaVersion.VERSION_11 targetCompatibility JavaVersion.VERSION_11
} }
buildToolsVersion '32.0.0' buildToolsVersion = "32.0.0"
allprojects { allprojects {
tasks.withType(JavaCompile) { tasks.withType(JavaCompile) {
@ -124,4 +120,4 @@ dependencies {
implementation 'androidx.core:core:1.7.0' implementation 'androidx.core:core:1.7.0'
coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.5' coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.5'
} }

4
app/src/main/AndroidManifest.xml
View file

@ -13,6 +13,7 @@
android:icon="@mipmap/ic_launcher" android:icon="@mipmap/ic_launcher"
android:label="@string/app_name" android:label="@string/app_name"
android:roundIcon="@mipmap/ic_launcher_round" android:roundIcon="@mipmap/ic_launcher_round"
android:screenOrientation="portrait"
android:supportsRtl="true" android:supportsRtl="true"
android:theme="@style/AppTheme" android:theme="@style/AppTheme"
android:allowBackup="true"> android:allowBackup="true">
@ -29,7 +30,8 @@
android:name=".DrugDetailActivity" android:name=".DrugDetailActivity"
android:label="@string/title_drug_detail" android:label="@string/title_drug_detail"
android:parentActivityName=".DrugListActivity" android:parentActivityName=".DrugListActivity"
android:theme="@style/AppTheme.NoActionBar"> android:theme="@style/AppTheme.NoActionBar"
android:windowSoftInputMode="adjustResize">
<meta-data <meta-data
android:name="android.support.PARENT_ACTIVITY" android:name="android.support.PARENT_ACTIVITY"
android:value="net.foucry.pilldroid.DrugListActivity" /> android:value="net.foucry.pilldroid.DrugListActivity" />

1
app/src/main/res/layout-w900dp/drug_list.xml
View file

@ -9,6 +9,7 @@
android:divider="?android:attr/dividerHorizontal" android:divider="?android:attr/dividerHorizontal"
android:orientation="horizontal" android:orientation="horizontal"
android:showDividers="middle" android:showDividers="middle"
android:fitsSystemWindows="true"
tools:context="net.foucry.pilldroid.DrugListActivity"> tools:context="net.foucry.pilldroid.DrugListActivity">
<!-- <!--

1
app/src/main/res/layout/drug_list.xml
View file

@ -6,6 +6,7 @@
android:name="net.foucry.pilldroid.MedicamentListFragment" android:name="net.foucry.pilldroid.MedicamentListFragment"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:fitsSystemWindows="true"
app:layoutManager="LinearLayoutManager" app:layoutManager="LinearLayoutManager"
android:background="@drawable/list_selector" android:background="@drawable/list_selector"
tools:context="net.foucry.pilldroid.DrugListActivity" tools:context="net.foucry.pilldroid.DrugListActivity"

2
build.gradle
View file

@ -23,8 +23,6 @@ ext {
defaultMinSdkVersion = 26 defaultMinSdkVersion = 26
defaultTargetSdkVersion = 30 defaultTargetSdkVersion = 30
defaultVersionCode = 1 defaultVersionCode = 1
defaultVersionCode1 = defaultVersionCode
defaultVersionName = 'beta-0.+$versioncode'
} }
allprojects { allprojects {