CringeStudios/Teraplex
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/JG-Cody/Terraplex into zwicki_branch

Browse Source 
 Conflicts:
	app/src/main/java/de/jg_cody/Teraplex/ui/Flur/FlurFragment.java
This commit is contained in:
zwicki 2021-06-27 16:57:02 +02:00
commit d54807ab8b
13 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/src/main/java/de/jg_cody/Teraplex/ui/rooms/ListAdapter.java
View File

@ -1,5 +1,6 @@
package de.jg_cody.Teraplex.ui.rooms;
import android.annotation.SuppressLint;
import android.content.Context;
import android.view.LayoutInflater;
import android.view.View;
@ -7,6 +8,8 @@ import android.view.ViewGroup;
import android.widget.ArrayAdapter;
import android.widget.Button;
import org.jetbrains.annotations.NotNull;
import java.util.ArrayList;
import de.jg_cody.Teraplex.R;
@ -36,8 +39,10 @@ public class ListAdapter extends ArrayAdapter {
this.objects = objects;
}
@SuppressLint("InflateParams")
@NotNull
@Override
public View getView(int position, View convertView, ViewGroup parent) {
public View getView(int position, View convertView, @NotNull ViewGroup parent) {
IViewHolder viewHolder= null;
ListItem listViewItem = objects.get(position);
@ -76,10 +81,6 @@ public class ListAdapter extends ArrayAdapter {
//convertView.setTag(viewHolder);
}
else if(listViewItemType == OPTION3BUTTON)
{
}
}
else{

3
app/src/main/java/de/jg_cody/Teraplex/ui/rooms/ViewHolderDoubleButton.java
View File

@ -39,8 +39,7 @@ public class ViewHolderDoubleButton implements IViewHolder{
@Override
public View[] getViews()
{
View[] views = {getbLeft(),getbRight()};
return views;
return new View[]{getbLeft(),getbRight()};
}

3
app/src/main/java/de/jg_cody/Teraplex/ui/rooms/ViewHolderSingleButton.java
View File

@ -32,8 +32,7 @@ public class ViewHolderSingleButton implements IViewHolder {
@Override
public View[] getViews()
{
View[] views = {getbRun(),};
return views;
return new View[]{getbRun(),};
}

BIN
app/src/main/res/drawable-night/fog_background.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 85 KiB

BIN
app/src/main/res/drawable/fog_background.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.5 MiB

2
app/src/main/res/layout/fragment_credits.xml
View File

@ -10,7 +10,7 @@
android:layout_width="0dp"
android:layout_height="0dp"
android:scaleType="centerCrop"
android:src="@drawable/background"
android:src="@drawable/fog_background"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.0"

2
app/src/main/res/layout/fragment_einstellungen.xml
View File

@ -10,7 +10,7 @@
android:layout_width="0dp"
android:layout_height="0dp"
android:scaleType="centerCrop"
android:src="@drawable/background"
android:src="@drawable/fog_background"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.0"

2
app/src/main/res/layout/fragment_home.xml
View File

@ -15,7 +15,7 @@
android:layout_height="0dp"
android:background="#80FFFFFF"
android:scaleType="centerCrop"
android:src="@drawable/background"
android:src="@drawable/fog_background"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.5"

2
app/src/main/res/layout/fragment_konsole.xml
View File

@ -13,7 +13,7 @@
android:layout_width="0dp"
android:layout_height="0dp"
android:scaleType="centerCrop"
android:src="@drawable/background"
android:src="@drawable/fog_background"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.5"

2
app/src/main/res/layout/fragment_kueche.xml
View File

@ -13,7 +13,7 @@
android:layout_width="0dp"
android:layout_height="0dp"
android:scaleType="centerCrop"
android:src="@drawable/background"
android:src="@drawable/fog_background"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.5"

2
app/src/main/res/layout/fragment_main.xml
View File

@ -13,7 +13,7 @@
android:layout_width="0dp"
android:layout_height="0dp"
android:scaleType="centerCrop"
android:src="@drawable/background"
android:src="@drawable/fog_background"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.5"

2
app/src/main/res/layout/fragment_schlafzimmer.xml
View File

@ -13,7 +13,7 @@
android:layout_width="0dp"
android:layout_height="0dp"
android:scaleType="centerCrop"
android:src="@drawable/background"
android:src="@drawable/fog_background"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.5"

2
app/src/main/res/layout/fragment_zeitsteuerung.xml
View File

@ -13,7 +13,7 @@
android:layout_width="0dp"
android:layout_height="0dp"
android:scaleType="centerCrop"
android:src="@drawable/background"
android:src="@drawable/fog_background"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="1.0"