mirror/Android
1
0
Fork 0
mirror of https://github.com/CatimaLoyalty/Android.git synced 2026-04-13 11:57:26 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2304 from CatimaLoyalty/fix/15_no_e2e

Browse Source 
Revert to targeting Android 14
This commit is contained in:
Sylvia van Os
2025-01-17 19:02:05 +01:00
committed by GitHub
parent 926b9e0822 c23527eb82
commit 21da1fed85
6 changed files with 17 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/build.gradle.kts
View File

@@ -21,7 +21,7 @@ android {
defaultConfig {
applicationId = "me.hackerchick.catima"
minSdk = 21
targetSdk = 35
targetSdk = 34
versionCode = 145
versionName = "2.34.3"

3
app/src/main/res/layout/barcode_selector_activity.xml
View File

@@ -4,8 +4,7 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:fitsSystemWindows="true">
android:layout_height="fill_parent">
<com.google.android.material.appbar.AppBarLayout
android:layout_width="fill_parent"

14
app/src/main/res/layout/import_export_activity.xml
View File

@@ -1,14 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.coordinatorlayout.widget.CoordinatorLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:fitsSystemWindows="true">
<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:fitsSystemWindows="true">
<com.google.android.material.appbar.AppBarLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
android:layout_height="wrap_content"
android:fitsSystemWindows="true">
<com.google.android.material.appbar.MaterialToolbar
android:id="@+id/toolbar"

19
app/src/main/res/layout/loyalty_card_view_layout.xml
View File

@@ -8,8 +8,7 @@
<com.google.android.material.appbar.AppBarLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:fitsSystemWindows="true">
android:layout_height="wrap_content">
<com.google.android.material.appbar.MaterialToolbar
android:id="@+id/toolbar"
@@ -26,8 +25,7 @@
android:layout_marginBottom="100dp"
android:orientation="vertical"
android:layout_marginStart="0dp"
android:layout_marginEnd="0dp"
android:fitsSystemWindows="true">
android:layout_marginEnd="0dp">
<LinearLayout
android:id="@+id/icon_container"
@@ -149,8 +147,7 @@
android:id="@+id/fullscreen_layout"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
android:fitsSystemWindows="false">
android:orientation="vertical">
<ImageView
android:importantForAccessibility="no"
@@ -209,13 +206,13 @@
android:layout_height="wrap_content"
android:layout_gravity="bottom"
android:background="?attr/colorPrimary"
app:fabAlignmentMode="center"
app:fabCradleVerticalOffset="2dp"
android:fitsSystemWindows="true">
app:contentInsetLeft="0dp"
app:contentInsetStart="0dp"
app:contentInsetRight="0dp"
app:contentInsetEnd="0dp"
app:fabAlignmentMode="center">
<LinearLayout
android:paddingTop="12dp"
android:paddingBottom="12dp"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layoutDirection="ltr">

1
app/src/main/res/layout/scan_activity.xml
View File

@@ -5,7 +5,6 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:fitsSystemWindows="true"
tools:context=".ScanActivity">
<com.google.android.material.appbar.AppBarLayout

1
app/src/main/res/values/themes.xml
View File

@@ -31,7 +31,6 @@
<item name="alertDialogTheme">@style/ThemeOverlay.App.MaterialAlertDialog.Monet</item>
<item name="windowActionModeOverlay">true</item>
</style>
<style name="ThemeOverlay.App.MaterialAlertDialog.Monet" parent="ThemeOverlay.Material3.MaterialAlertDialog">