diff --git a/.idea/caches/gradle_models.ser b/.idea/caches/gradle_models.ser index acece03..2686443 100644 Binary files a/.idea/caches/gradle_models.ser and b/.idea/caches/gradle_models.ser differ diff --git a/app/build.gradle b/app/build.gradle index f0f5603..e4a6812 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -5,10 +5,10 @@ android { compileSdkVersion 28 defaultConfig { applicationId "at.smartshopper.smartshopperapp" - minSdkVersion 19 + minSdkVersion 23 targetSdkVersion 28 - versionCode 10 - versionName "4" + versionCode 11 + versionName "4.1" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" } buildTypes { diff --git a/app/release/app-release.apk b/app/release/app-release.apk deleted file mode 100644 index 63a7718..0000000 Binary files a/app/release/app-release.apk and /dev/null differ diff --git a/app/release/app.aab b/app/release/app.aab index 59158b4..40c9d9b 100644 Binary files a/app/release/app.aab and b/app/release/app.aab differ diff --git a/app/release/output.json b/app/release/output.json deleted file mode 100644 index 8fb3618..0000000 --- a/app/release/output.json +++ /dev/null @@ -1 +0,0 @@ -[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":10,"versionName":"4","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}] \ No newline at end of file diff --git a/app/src/main/java/at/smartshopper/smartshopperapp/activitys/EditUser.java b/app/src/main/java/at/smartshopper/smartshopperapp/activitys/EditUser.java index b591e99..c335a5e 100644 --- a/app/src/main/java/at/smartshopper/smartshopperapp/activitys/EditUser.java +++ b/app/src/main/java/at/smartshopper/smartshopperapp/activitys/EditUser.java @@ -125,7 +125,7 @@ public class EditUser extends Activity { userbild.setImageDrawable(LoadImageFromWebOperations(photoUrl)); editname.setText(name); - EnableRuntimePermission(); +// EnableRuntimePermission(); chooseImg.setOnClickListener(new View.OnClickListener() { @Override diff --git a/app/src/main/res/layout/activity_dash.xml b/app/src/main/res/layout/activity_dash.xml index 9253c18..5afd92e 100644 --- a/app/src/main/res/layout/activity_dash.xml +++ b/app/src/main/res/layout/activity_dash.xml @@ -18,8 +18,8 @@ diff --git a/app/src/main/res/layout/activity_item_list.xml b/app/src/main/res/layout/activity_item_list.xml index e25307f..8789443 100644 --- a/app/src/main/res/layout/activity_item_list.xml +++ b/app/src/main/res/layout/activity_item_list.xml @@ -125,8 +125,8 @@ diff --git a/app/src/main/res/layout/activity_shoppinglist_details.xml b/app/src/main/res/layout/activity_shoppinglist_details.xml index 7b39a69..5873e3d 100644 --- a/app/src/main/res/layout/activity_shoppinglist_details.xml +++ b/app/src/main/res/layout/activity_shoppinglist_details.xml @@ -19,8 +19,8 @@ diff --git a/app/src/main/res/layout/add_group_dialog.xml b/app/src/main/res/layout/add_group_dialog.xml index a4076f3..9c2e39f 100644 --- a/app/src/main/res/layout/add_group_dialog.xml +++ b/app/src/main/res/layout/add_group_dialog.xml @@ -114,7 +114,6 @@ android:id="@+id/groupFinish" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="@color/colorButton" android:text="Fertig" /> diff --git a/app/src/main/res/layout/add_item_dialog.xml b/app/src/main/res/layout/add_item_dialog.xml index ab176bc..6fb0b47 100644 --- a/app/src/main/res/layout/add_item_dialog.xml +++ b/app/src/main/res/layout/add_item_dialog.xml @@ -121,7 +121,6 @@ android:id="@+id/itemFinish" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="@color/colorButton" android:text="Fertig" /> diff --git a/app/src/main/res/layout/add_share.xml b/app/src/main/res/layout/add_share.xml index b3048c2..24c06ce 100644 --- a/app/src/main/res/layout/add_share.xml +++ b/app/src/main/res/layout/add_share.xml @@ -101,7 +101,6 @@ android:id="@+id/delShare" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:background="@color/colorButton" android:text=" Share Aufheben" /> diff --git a/app/src/main/res/layout/add_share_link.xml b/app/src/main/res/layout/add_share_link.xml index b379c78..f7c2e97 100644 --- a/app/src/main/res/layout/add_share_link.xml +++ b/app/src/main/res/layout/add_share_link.xml @@ -71,7 +71,6 @@ android:id="@+id/shareAddFinish" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:background="@color/colorButton" android:text="Fertig" /> diff --git a/app/src/main/res/layout/add_shoppinglist_dialog.xml b/app/src/main/res/layout/add_shoppinglist_dialog.xml index ee4801c..436021f 100644 --- a/app/src/main/res/layout/add_shoppinglist_dialog.xml +++ b/app/src/main/res/layout/add_shoppinglist_dialog.xml @@ -151,8 +151,7 @@ android:id="@+id/addFertig" android:layout_width="match_parent" android:layout_height="wrap_content" - android:text="Fertig" - app:backgroundTint="@color/colorButton" /> + android:text="Fertig" /> diff --git a/app/src/main/res/layout/cardviewgroup.xml b/app/src/main/res/layout/cardviewgroup.xml index 9f6af95..fe8ab12 100644 --- a/app/src/main/res/layout/cardviewgroup.xml +++ b/app/src/main/res/layout/cardviewgroup.xml @@ -68,8 +68,8 @@ diff --git a/app/src/main/res/layout/edit_share_member.xml b/app/src/main/res/layout/edit_share_member.xml index 828a4de..405b92c 100644 --- a/app/src/main/res/layout/edit_share_member.xml +++ b/app/src/main/res/layout/edit_share_member.xml @@ -79,7 +79,6 @@ android:id="@+id/delShare" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:background="@color/colorButton" android:text="Listen Sharing beenden!" /> diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 47fe75a..2fd853e 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -3,5 +3,5 @@ #FFFFFF #00574B #880e4f - @color/fui_linkColor + diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml index 085c866..9b4547f 100644 --- a/app/src/main/res/values/dimens.xml +++ b/app/src/main/res/values/dimens.xml @@ -1,5 +1,5 @@ 16dp 8dp - 40dp + 30dp