sem/Next-Location
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 4 Wiki Activity

Merge develop into master #1

Merged
SemvdH merged 297 commits from develop into main 2021-01-06 22:20:51 +00:00
Conversation 6 Commits 297 Files Changed 143 +5 -7
5 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit ca8d291262 - Show all commits

4
app/src/main/java/com/a1/nextlocation/fragments/LocationDetailFragment.java
View File

@@ -49,4 +49,8 @@ public class LocationDetailFragment extends Fragment {
}
return view;
}
public void setLocation(Location location) {
this.location = location;
}
}

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

@@ -35,7 +35,6 @@
android:layout_width="match_parent"
android:layout_height="200dp"
android:layout_margin="20dp"
android:layout_height="wrap_content"
android:background="@color/secondaryColour"
android:text=""
app:layout_constraintEnd_toEndOf="parent"
@@ -47,7 +46,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/secondaryColour"
android:text="@string/locatie_detail_tekst"
android:text=""
/>
</ScrollView>

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

@@ -14,7 +14,6 @@
android:layout_height="wrap_content"
android:layout_margin="10dp"
android:background="@drawable/ic_back_button_24"
android:text="@string/terug"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />

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

@@ -160,7 +160,6 @@
app:layout_constraintTop_toTopOf="parent" />
<androidx.appcompat.widget.SwitchCompat
android:id="@+id/settingsOldButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/BigFont"

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

@@ -202,7 +202,6 @@
android:id="@+id/couponAmount"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/couponAmount"
android:text=""
android:textColor="@color/black"
android:textSize="20sp"
@@ -218,7 +217,6 @@
android:layout_marginEnd="20dp"
android:background="@drawable/ic_back_button_24"
android:scaleX="-1"
android:text="@string/terug"
app:layout_constraintBottom_toBottomOf="@+id/couponAmount"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="@+id/couponAmount" />
@@ -234,7 +232,6 @@
android:background="@drawable/ic_back_button_24"
android:backgroundTint="@color/buttonColour"
android:src="@drawable/ic_back_button_24"
android:text="@string/terug"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />