Fixes
Button Farbe wieder normal Min SDK 23 --> Android 6.0
This commit is contained in:
parent
9fc3c9d70c
commit
9c8065b798
BIN
.idea/caches/gradle_models.ser
generated
BIN
.idea/caches/gradle_models.ser
generated
Binary file not shown.
@ -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 {
|
||||||
|
Binary file not shown.
Binary file not shown.
@ -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":{}}]
|
|
@ -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
|
||||||
|
@ -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" />
|
||||||
|
@ -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" />
|
||||||
|
|
||||||
|
@ -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" />
|
||||||
|
|
||||||
|
@ -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>
|
||||||
|
@ -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>
|
||||||
|
@ -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>
|
||||||
|
|
||||||
|
@ -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>
|
||||||
|
|
||||||
|
@ -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>
|
||||||
|
@ -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"
|
||||||
|
@ -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>
|
||||||
|
@ -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>
|
||||||
|
|
||||||
|
@ -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>
|
||||||
|
@ -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>
|
||||||
|
Loading…
x
Reference in New Issue
Block a user