dergeorg/SmartShopperAndroid
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixes

Browse Source 
Button Farbe wieder normal
Min SDK 23 --> Android 6.0
This commit is contained in:
Georg Reisinger
2019-03-26 20:35:21 +01:00
parent 9fc3c9d70c
commit 9c8065b798
19 changed files with 22 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
.idea/caches/gradle_models.ser generated
View File

Binary file not shown.

6
app/build.gradle
View File

@@ -5,10 +5,10 @@ android {
compileSdkVersion 28 compileSdkVersion 28
defaultConfig { defaultConfig {
applicationId "at.smartshopper.smartshopperapp" applicationId "at.smartshopper.smartshopperapp"
minSdkVersion 19 minSdkVersion 23
targetSdkVersion 28 targetSdkVersion 28
versionCode 10 versionCode 11
versionName "4" versionName "4.1"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
} }
buildTypes { buildTypes {

BIN
app/release/app-release.apk
View File

Binary file not shown.

BIN
app/release/app.aab
View File

Binary file not shown.

1
app/release/output.json
View File

@@ -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":{}}]

2
app/src/main/java/at/smartshopper/smartshopperapp/activitys/EditUser.java
View File

@@ -125,7 +125,7 @@ public class EditUser extends Activity {
userbild.setImageDrawable(LoadImageFromWebOperations(photoUrl)); userbild.setImageDrawable(LoadImageFromWebOperations(photoUrl));
editname.setText(name); editname.setText(name);
EnableRuntimePermission(); // EnableRuntimePermission();
chooseImg.setOnClickListener(new View.OnClickListener() { chooseImg.setOnClickListener(new View.OnClickListener() {
@Override @Override

6
app/src/main/res/layout/activity_dash.xml
View File

@@ -18,8 +18,8 @@
<View <View
android:id="@+id/pfeilnachunten3" android:id="@+id/pfeilnachunten3"
android:layout_width="60dp" android:layout_width="50dp"
android:layout_height="190dp" android:layout_height="150dp"
android:layout_marginEnd="8dp" android:layout_marginEnd="8dp"
android:layout_marginBottom="8dp" android:layout_marginBottom="8dp"
android:background="@drawable/pfeil" android:background="@drawable/pfeil"
@@ -126,7 +126,7 @@
android:layout_marginEnd="8dp" android:layout_marginEnd="8dp"
android:layout_marginBottom="8dp" android:layout_marginBottom="8dp"
android:clickable="true" android:clickable="true"
app:backgroundTint="@color/colorButton" app:backgroundTint="@color/fui_linkColor"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="@+id/tabHost1" app:layout_constraintEnd_toEndOf="@+id/tabHost1"
app:srcCompat="@drawable/addoutline" /> app:srcCompat="@drawable/addoutline" />

6
app/src/main/res/layout/activity_item_list.xml
View File

@@ -125,8 +125,8 @@
<View <View
android:id="@+id/pfeilnachunten2" android:id="@+id/pfeilnachunten2"
android:layout_width="60dp" android:layout_width="50dp"
android:layout_height="190dp" android:layout_height="150dp"
android:layout_marginBottom="60dp" android:layout_marginBottom="60dp"
android:background="@drawable/pfeil" android:background="@drawable/pfeil"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
@@ -144,7 +144,7 @@
android:layout_marginBottom="8dp" android:layout_marginBottom="8dp"
android:clickable="true" android:clickable="true"
android:src="@drawable/addoutline" android:src="@drawable/addoutline"
app:backgroundTint="@color/colorButton" app:backgroundTint="@color/fui_linkColor"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" /> app:layout_constraintEnd_toEndOf="parent" />

6
app/src/main/res/layout/activity_shoppinglist_details.xml
View File

@@ -19,8 +19,8 @@
<View <View
android:id="@+id/pfeilnachunten" android:id="@+id/pfeilnachunten"
android:layout_width="60dp" android:layout_width="50dp"
android:layout_height="190dp" android:layout_height="150dp"
android:layout_marginEnd="8dp" android:layout_marginEnd="8dp"
android:layout_marginBottom="8dp" android:layout_marginBottom="8dp"
android:background="@drawable/pfeil" android:background="@drawable/pfeil"
@@ -58,7 +58,7 @@
android:layout_marginBottom="8dp" android:layout_marginBottom="8dp"
android:clickable="true" android:clickable="true"
android:src="@drawable/addoutline" android:src="@drawable/addoutline"
app:backgroundTint="@color/colorButton" app:backgroundTint="@color/fui_linkColor"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" /> app:layout_constraintEnd_toEndOf="parent" />

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

@@ -114,7 +114,6 @@
android:id="@+id/groupFinish" android:id="@+id/groupFinish"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@color/colorButton"
android:text="Fertig" /> android:text="Fertig" />
</LinearLayout> </LinearLayout>
</TableRow> </TableRow>

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

@@ -121,7 +121,6 @@
android:id="@+id/itemFinish" android:id="@+id/itemFinish"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@color/colorButton"
android:text="Fertig" /> android:text="Fertig" />
</LinearLayout> </LinearLayout>
</TableRow> </TableRow>

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

@@ -101,7 +101,6 @@
android:id="@+id/delShare" android:id="@+id/delShare"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@color/colorButton"
android:text=" Share Aufheben" /> android:text=" Share Aufheben" />
</TableRow> </TableRow>

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

@@ -71,7 +71,6 @@
android:id="@+id/shareAddFinish" android:id="@+id/shareAddFinish"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@color/colorButton"
android:text="Fertig" /> android:text="Fertig" />
</TableRow> </TableRow>

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

@@ -151,8 +151,7 @@
android:id="@+id/addFertig" android:id="@+id/addFertig"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="Fertig" android:text="Fertig" />
app:backgroundTint="@color/colorButton" />
</LinearLayout> </LinearLayout>
</TableRow> </TableRow>
</TableLayout> </TableLayout>

8
app/src/main/res/layout/cardviewgroup.xml
View File

@@ -68,8 +68,8 @@
<ImageButton <ImageButton
android:id="@+id/deleteGroup" android:id="@+id/deleteGroup"
android:layout_width="wrap_content" android:layout_width="@dimen/buttonSize"
android:layout_height="wrap_content" android:layout_height="@dimen/buttonSize"
android:layout_marginTop="8dp" android:layout_marginTop="8dp"
android:layout_marginEnd="8dp" android:layout_marginEnd="8dp"
android:background="@android:color/transparent" android:background="@android:color/transparent"
@@ -79,8 +79,8 @@
<ImageButton <ImageButton
android:id="@+id/editGroup" android:id="@+id/editGroup"
android:layout_width="wrap_content" android:layout_width="@dimen/buttonSize"
android:layout_height="wrap_content" android:layout_height="@dimen/buttonSize"
android:layout_marginTop="8dp" android:layout_marginTop="8dp"
android:layout_marginEnd="8dp" android:layout_marginEnd="8dp"
android:background="@android:color/transparent" android:background="@android:color/transparent"

4
app/src/main/res/layout/cardviewitem.xml
View File

@@ -72,8 +72,8 @@
<ImageView <ImageView
android:id="@+id/itemDel" android:id="@+id/itemDel"
android:layout_width="wrap_content" android:layout_width="@dimen/buttonSize"
android:layout_height="wrap_content" android:layout_height="@dimen/buttonSize"
android:layout_weight="1" android:layout_weight="1"
app:srcCompat="@drawable/delete" /> app:srcCompat="@drawable/delete" />
</LinearLayout> </LinearLayout>

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

@@ -79,7 +79,6 @@
android:id="@+id/delShare" android:id="@+id/delShare"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@color/colorButton"
android:text="Listen Sharing beenden!" /> android:text="Listen Sharing beenden!" />
</TableRow> </TableRow>

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

@@ -3,5 +3,5 @@
<color name="colorPrimary">#FFFFFF</color> <color name="colorPrimary">#FFFFFF</color>
<color name="colorPrimaryDark">#00574B</color> <color name="colorPrimaryDark">#00574B</color>
<color name="colorAccent">#880e4f</color> <color name="colorAccent">#880e4f</color>
<color name="colorButton">@color/fui_linkColor</color> <color name="colorButton"></color>
</resources> </resources>

2
app/src/main/res/values/dimens.xml
View File

@@ -1,5 +1,5 @@
<resources> <resources>
<dimen name="fab_margin">16dp</dimen> <dimen name="fab_margin">16dp</dimen>
<dimen name="item_spacing">8dp</dimen> <dimen name="item_spacing">8dp</dimen>
<dimen name="buttonSize">40dp</dimen> <dimen name="buttonSize">30dp</dimen>
</resources> </resources>