aufräumarbeiten ;)

This commit is contained in:
JG-Cody 2021-07-19 19:37:07 +02:00
parent c5e1b8b986
commit c690cbfde7
47 changed files with 61 additions and 426 deletions

View File

@ -17,7 +17,7 @@ import org.jetbrains.annotations.NotNull;
import java.util.Objects;
import de.jg_cody.Teraplex.ui.Tabs.TabsFragment;
import de.jg_cody.Teraplex.ui.tabs.TabsFragment;
public class AddButtonDialogSingle extends DialogFragment {
private EditText editText_command, editText_name, editText_button_name;

View File

@ -16,7 +16,7 @@ import org.jetbrains.annotations.NotNull;
import java.util.Objects;
import de.jg_cody.Teraplex.ui.Tabs.TabsFragment;
import de.jg_cody.Teraplex.ui.tabs.TabsFragment;
public class AddButtonsDialogDouble extends DialogFragment {

View File

@ -16,7 +16,7 @@ import org.jetbrains.annotations.NotNull;
import java.util.Objects;
import de.jg_cody.Teraplex.ui.Tabs.TabsFragment;
import de.jg_cody.Teraplex.ui.tabs.TabsFragment;
public class AddHeadlineDialog extends DialogFragment {
private AddHeadlineDialogListener listener;

View File

@ -20,15 +20,7 @@ public class Cricketer implements Serializable {
return cricketerName;
}
public void setCricketerName(String cricketerName) {
this.cricketerName = cricketerName;
}
public String getTeamName() {
return teamName;
}
public void setTeamName(String teamName) {
this.teamName = teamName;
}
}

View File

@ -63,11 +63,11 @@ import java.util.Locale;
import java.util.Map;
import java.util.Objects;
import de.jg_cody.Teraplex.ui.Credits.CreditsFragment;
import de.jg_cody.Teraplex.ui.Einstellungen.EinstellungenFragment;
import de.jg_cody.Teraplex.ui.Tabs.TabsFragment;
import de.jg_cody.Teraplex.ui.rooms.ListAdapter;
import de.jg_cody.Teraplex.ui.rooms.ListItem;
import de.jg_cody.Teraplex.ui.credits.CreditsFragment;
import de.jg_cody.Teraplex.ui.settings.SettingsFragment;
import de.jg_cody.Teraplex.ui.tabs.TabsFragment;
import de.jg_cody.Teraplex.ui.tabs.ListAdapter;
import de.jg_cody.Teraplex.ui.tabs.ListItem;
public class MainActivity extends AppCompatActivity {
@ -141,13 +141,13 @@ public class MainActivity extends AppCompatActivity {
// Passing each menu ID as a set of Ids because each
// menu should be considered as top level destinations.
mAppBarConfiguration = new AppBarConfiguration.Builder(
R.id.nav_home, R.id.nav_einstellungen, R.id.nav_zeitsteuerung, R.id.nav_tabs, R.id.nav_über, R.id.nav_terminal)
R.id.nav_home, R.id.nav_settings, R.id.nav_tabs, R.id.nav_über, R.id.nav_terminal)
.setOpenableLayout(drawer)
.build();
NavController navController = Navigation.findNavController(this, R.id.nav_host_fragment);
NavigationUI.setupActionBarWithNavController(this, navController, mAppBarConfiguration);
NavigationUI.setupWithNavController(navigationView, navController);
((Switch) navigationView.getMenu().getItem(3).getActionView().findViewById(R.id.switch_editmode)).setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
((Switch) navigationView.getMenu().getItem(2).getActionView().findViewById(R.id.switch_editmode)).setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
@Override
public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
Vibrator vr = (Vibrator) getSystemService(Context.VIBRATOR_SERVICE);
@ -166,11 +166,11 @@ public class MainActivity extends AppCompatActivity {
}
}
navigationView.getMenu().getItem(3).setVisible(editmode);
navigationView.getMenu().getItem(4).setVisible(editmode);
navigationView.getMenu().getItem(5).setVisible(editmode);
}
});
navigationView.getMenu().getItem(4).setOnMenuItemClickListener(new MenuItem.OnMenuItemClickListener() {
navigationView.getMenu().getItem(3).setOnMenuItemClickListener(new MenuItem.OnMenuItemClickListener() {
@Override
public boolean onMenuItemClick(MenuItem item) {
Vibrator vr = (Vibrator) getSystemService(Context.VIBRATOR_SERVICE);
@ -283,7 +283,7 @@ public class MainActivity extends AppCompatActivity {
return true;
}
});
navigationView.getMenu().getItem(5).setOnMenuItemClickListener(new MenuItem.OnMenuItemClickListener() {
navigationView.getMenu().getItem(4).setOnMenuItemClickListener(new MenuItem.OnMenuItemClickListener() {
@Override
public boolean onMenuItemClick(MenuItem item) {
Vibrator vr = (Vibrator) getSystemService(Context.VIBRATOR_SERVICE);
@ -440,12 +440,12 @@ public class MainActivity extends AppCompatActivity {
}
public void menurighttopeinstellungen(MenuItem i) {
public void menurighttopsettings(MenuItem i) {
Vibrator vr = (Vibrator) getSystemService(Context.VIBRATOR_SERVICE);
vr.vibrate(100);
Fragment currentFragment = getSupportFragmentManager().findFragmentById(R.id.nav_host_fragment);
NavHostFragment nhf = (NavHostFragment) currentFragment;
nhf.getChildFragmentManager().beginTransaction().replace(R.id.nav_host_fragment, new EinstellungenFragment()).commit();
nhf.getChildFragmentManager().beginTransaction().replace(R.id.nav_host_fragment, new SettingsFragment()).commit();
Objects.requireNonNull(getSupportActionBar()).setTitle(R.string.menu_settings);
}

View File

@ -1,8 +0,0 @@
package de.jg_cody.Teraplex.ui.Einstellungen;
import androidx.lifecycle.ViewModel;
public class EinstellungenViewModel extends ViewModel {
}

View File

@ -1,10 +1,9 @@
package de.jg_cody.Teraplex.ui.Credits;
package de.jg_cody.Teraplex.ui.credits;
import android.app.Activity;
import android.content.SharedPreferences;
import android.graphics.BitmapFactory;
import android.graphics.drawable.BitmapDrawable;
import android.os.Build;
import android.os.Bundle;
import android.util.Base64;
import android.view.LayoutInflater;
@ -13,7 +12,6 @@ import android.view.ViewGroup;
import android.widget.ImageView;
import androidx.annotation.NonNull;
import androidx.annotation.RequiresApi;
import androidx.fragment.app.Fragment;
import androidx.lifecycle.ViewModelProvider;

View File

@ -1,4 +1,4 @@
package de.jg_cody.Teraplex.ui.Credits;
package de.jg_cody.Teraplex.ui.credits;
import androidx.lifecycle.ViewModel;

View File

@ -1,6 +0,0 @@
package de.jg_cody.Teraplex.ui.rooms;
import androidx.fragment.app.Fragment;
public class RoomFragment extends Fragment {
}

View File

@ -1,4 +1,4 @@
package de.jg_cody.Teraplex.ui.Einstellungen;
package de.jg_cody.Teraplex.ui.settings;
import android.app.Activity;
import android.app.AlertDialog;
@ -10,7 +10,6 @@ import android.content.res.Configuration;
import android.graphics.BitmapFactory;
import android.graphics.drawable.BitmapDrawable;
import android.media.MediaPlayer;
import android.os.Build;
import android.os.Bundle;
import android.os.Vibrator;
import android.util.Base64;
@ -21,7 +20,6 @@ import android.widget.Button;
import android.widget.ImageView;
import androidx.annotation.NonNull;
import androidx.annotation.RequiresApi;
import androidx.fragment.app.Fragment;
import androidx.lifecycle.ViewModelProvider;
@ -33,15 +31,15 @@ import de.jg_cody.Teraplex.R;
import static android.content.Context.MODE_PRIVATE;
public class EinstellungenFragment extends Fragment {
public class SettingsFragment extends Fragment {
private EinstellungenViewModel einstellungenViewModel;
private SettingsViewModel settingsViewModel;
public View onCreateView(@NonNull LayoutInflater inflater,
ViewGroup container, Bundle savedInstanceState) {
einstellungenViewModel =
new ViewModelProvider(this).get(EinstellungenViewModel.class);
View root = inflater.inflate(R.layout.fragment_einstellungen, container, false);
settingsViewModel =
new ViewModelProvider(this).get(SettingsViewModel.class);
View root = inflater.inflate(R.layout.fragment_settings, container, false);
SharedPreferences p = requireContext().getSharedPreferences("appsettings", Activity.MODE_PRIVATE);
String Background = p.getString("Background", null);
if (Background != null) {

View File

@ -0,0 +1,8 @@
package de.jg_cody.Teraplex.ui.settings;
import androidx.lifecycle.ViewModel;
public class SettingsViewModel extends ViewModel {
}

View File

@ -1,4 +1,4 @@
package de.jg_cody.Teraplex.ui.rooms;
package de.jg_cody.Teraplex.ui.tabs;
import android.content.Context;
import android.content.SharedPreferences;

View File

@ -1,4 +1,4 @@
package de.jg_cody.Teraplex.ui.rooms;
package de.jg_cody.Teraplex.ui.tabs;
import android.view.View;

View File

@ -1,4 +1,4 @@
package de.jg_cody.Teraplex.ui.rooms;
package de.jg_cody.Teraplex.ui.tabs;
import android.content.Context;
import android.view.LayoutInflater;

View File

@ -1,8 +1,4 @@
package de.jg_cody.Teraplex.ui.rooms;
import android.os.Build;
import androidx.annotation.RequiresApi;
package de.jg_cody.Teraplex.ui.tabs;
import org.json.JSONArray;
import org.json.JSONException;

View File

@ -1,4 +1,4 @@
package de.jg_cody.Teraplex.ui.rooms;
package de.jg_cody.Teraplex.ui.tabs;
public class ListItemDouble extends ListItem{

View File

@ -1,4 +1,4 @@
package de.jg_cody.Teraplex.ui.rooms;
package de.jg_cody.Teraplex.ui.tabs;
public class ListItemHeadline extends ListItem{

View File

@ -1,4 +1,4 @@
package de.jg_cody.Teraplex.ui.rooms;
package de.jg_cody.Teraplex.ui.tabs;
public class ListItemSingle extends ListItem{
String buttonName;

View File

@ -1,4 +1,4 @@
package de.jg_cody.Teraplex.ui.rooms;
package de.jg_cody.Teraplex.ui.tabs;
public class ListItemSpace extends ListItem {

View File

@ -1,4 +1,4 @@
package de.jg_cody.Teraplex.ui.Tabs;
package de.jg_cody.Teraplex.ui.tabs;
import android.app.Activity;
import android.app.AlertDialog;
@ -6,7 +6,6 @@ import android.content.DialogInterface;
import android.content.SharedPreferences;
import android.graphics.BitmapFactory;
import android.graphics.drawable.BitmapDrawable;
import android.os.Build;
import android.os.Bundle;
import android.util.Base64;
import android.view.LayoutInflater;
@ -15,7 +14,6 @@ import android.view.ViewGroup;
import android.widget.ImageView;
import androidx.annotation.NonNull;
import androidx.annotation.RequiresApi;
import androidx.fragment.app.Fragment;
import androidx.lifecycle.ViewModelProvider;
import androidx.recyclerview.widget.ItemTouchHelper;
@ -38,12 +36,6 @@ import de.jg_cody.Teraplex.AddHeadlineDialog;
import de.jg_cody.Teraplex.Cricketer;
import de.jg_cody.Teraplex.MainActivity;
import de.jg_cody.Teraplex.R;
import de.jg_cody.Teraplex.ui.rooms.ListAdapter;
import de.jg_cody.Teraplex.ui.rooms.ListItem;
import de.jg_cody.Teraplex.ui.rooms.ListItemDouble;
import de.jg_cody.Teraplex.ui.rooms.ListItemHeadline;
import de.jg_cody.Teraplex.ui.rooms.ListItemSingle;
import de.jg_cody.Teraplex.ui.rooms.ListItemSpace;
import static android.content.Context.MODE_PRIVATE;

View File

@ -1,4 +1,4 @@
package de.jg_cody.Teraplex.ui.Tabs;
package de.jg_cody.Teraplex.ui.tabs;
import androidx.lifecycle.LiveData;
import androidx.lifecycle.MutableLiveData;

View File

@ -1,4 +1,4 @@
package de.jg_cody.Teraplex.ui.rooms;
package de.jg_cody.Teraplex.ui.tabs;
import android.view.View;
import android.widget.Button;

View File

@ -1,4 +1,4 @@
package de.jg_cody.Teraplex.ui.rooms;
package de.jg_cody.Teraplex.ui.tabs;
import android.view.View;
import android.widget.Button;

View File

@ -1,4 +1,4 @@
package de.jg_cody.Teraplex.ui.Terminal;
package de.jg_cody.Teraplex.ui.terminal;
/* -*-mode:java; c-basic-offset:2; indent-tabs-mode:nil -*- */
/**
@ -68,7 +68,7 @@ public class Terminal {
}
public String getTerminalOutput(){
return new String(Output.toByteArray());
return new String(Output.toByteArray()).replaceAll("(\u001B\\[\\d+;\\d+m)+", "").replaceAll("\u2584", "");
}
public void sendTerminalCommand(String terminalcommand){
try {

View File

@ -1,4 +1,4 @@
package de.jg_cody.Teraplex.ui.Terminal;
package de.jg_cody.Teraplex.ui.terminal;
import android.content.Context;
import android.content.SharedPreferences;
@ -60,8 +60,8 @@ public class TerminalFragment extends Fragment {
public void run() {
terminal = new Terminal();
boolean isFragmentActive = true;
while (isFragmentActive == true) {
Fragment myFragment = (Fragment) getActivity().getSupportFragmentManager().findFragmentById(R.id.fragment_terminal);
while (isFragmentActive) {
Fragment myFragment = (Fragment) requireActivity().getSupportFragmentManager().findFragmentById(R.id.fragment_terminal);
if (myFragment == null) {
isFragmentActive = false;

View File

@ -1,4 +1,4 @@
package de.jg_cody.Teraplex.ui.Terminal;
package de.jg_cody.Teraplex.ui.terminal;
import androidx.lifecycle.ViewModel;

View File

@ -1,48 +0,0 @@
package de.jg_cody.Teraplex.ui.zeitsteuerung;
import android.app.Activity;
import android.content.SharedPreferences;
import android.graphics.BitmapFactory;
import android.graphics.drawable.BitmapDrawable;
import android.os.Build;
import android.os.Bundle;
import android.util.Base64;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.ImageView;
import android.widget.TimePicker;
import androidx.annotation.NonNull;
import androidx.annotation.RequiresApi;
import androidx.fragment.app.Fragment;
import androidx.lifecycle.ViewModelProvider;
import java.util.Objects;
import de.jg_cody.Teraplex.MainActivity;
import de.jg_cody.Teraplex.R;
public class ZeitsteuerungFragment extends Fragment {
private ZeitsteuerungViewModel zeitsteuerungViewModel;
TimePicker timePicker;
public View onCreateView(@NonNull LayoutInflater inflater,
ViewGroup container, Bundle savedInstanceState) {
zeitsteuerungViewModel =
new ViewModelProvider(this).get(ZeitsteuerungViewModel.class);
View root = inflater.inflate(R.layout.fragment_zeitsteuerung, container, false);
SharedPreferences p = requireContext().getSharedPreferences("appsettings", Activity.MODE_PRIVATE);
String Background = p.getString("Background", null);
if (Background != null) {
ImageView I = root.findViewById(R.id.Background);
byte[] BA = Base64.decode(Background, Base64.DEFAULT);
I.setImageDrawable(new BitmapDrawable(getResources(), MainActivity.scaleCenterCrop(BitmapFactory.decodeByteArray(BA, 0, BA.length), MainActivity.getScreenHeight(), MainActivity.getScreenWidth())));
I.setScaleType(ImageView.ScaleType.CENTER_CROP);
}
TimePicker timePicker = (TimePicker) root.findViewById(R.id.timePicker);
timePicker.setIs24HourView(true);
return root;
}
}

View File

@ -1,8 +0,0 @@
package de.jg_cody.Teraplex.ui.zeitsteuerung;
import androidx.lifecycle.ViewModel;
public class ZeitsteuerungViewModel extends ViewModel {
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 182 KiB

View File

@ -1,9 +0,0 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:pathData="M23,16c0,1.1 -0.9,2 -2,2h-1l-2,-2h3L21,4L6,4L4,2h17c1.1,0 2,0.9 2,2v12zM17.5,18l-2,-2zM14.9,18l6,6 1.3,-1.3 -4.7,-4.7 -2,-2L1.2,1.8 0,3.1l1,1L1,16c0,1.1 0.9,2 2,2h7v2L8,20v2h8v-2h-2v-2h0.9zM3,16L3,6.1l9.9,9.9L3,16z"
android:fillColor="#000000"/>
</vector>

View File

@ -1,9 +0,0 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:pathData="M21,2L3,2c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h7v2L8,20v2h8v-2h-2v-2h7c1.1,0 2,-0.9 2,-2L23,4c0,-1.1 -0.9,-2 -2,-2zM21,16L3,16L3,4h18v12z"
android:fillColor="#000000"/>
</vector>

View File

@ -1,22 +0,0 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="225"
android:viewportHeight="225">
<path
android:pathData="M90,20.5l-19.5,19.5 -0.3,42.8c-0.3,42.5 0.1,48.2 3,48.2 0.8,-0 19.9,-18.6 42.6,-41.3 38.3,-38.4 41.2,-41.5 41.2,-44.7 0,-3.1 -1.8,-5.2 -20.3,-23.7 -18.6,-18.6 -20.5,-20.3 -23.7,-20.3 -3.2,-0 -5.1,1.6 -23,19.5z"
android:fillColor="#000000"
android:strokeColor="#00000000"/>
<path
android:pathData="M176.5,69.9c-1.6,1 -11.4,10.4 -21.7,20.8 -18.9,19.1 -20.4,21.2 -17.9,25.1 0.5,0.8 9.8,10.3 20.7,21.3 18.3,18.4 20.1,19.9 23.3,19.9 3.3,-0 5.1,-1.5 23.2,-19.8 10.8,-11 20,-20.9 20.4,-22.1 0.4,-1.2 0.4,-3.2 0.1,-4.4 -0.8,-3.1 -39.5,-41.5 -42.6,-42.2 -1.6,-0.3 -3.6,0.2 -5.5,1.4z"
android:fillColor="#000000"
android:strokeColor="#00000000"/>
<path
android:pathData="M19.7,90.8c-14.6,14.7 -19.7,20.4 -19.7,22.2 0,1.8 5,7.4 19.2,21.7 10.6,10.6 19.8,19.3 20.4,19.3 0.7,-0 1.5,-0.7 1.8,-1.6 0.3,-0.9 0.6,-19 0.6,-40.4 0,-30.8 -0.3,-39 -1.3,-39.8 -1,-0.9 -5.7,3.3 -21,18.6z"
android:fillColor="#000000"
android:strokeColor="#00000000"/>
<path
android:pathData="M89.3,156.3c-18.5,18.5 -20.3,20.6 -20.3,23.7 0,3.1 1.8,5.2 20.3,23.7 19.3,19.4 20.4,20.3 24.1,20.3 3.7,-0 4.8,-0.9 22.3,-18.2 20.2,-20.1 22.9,-23.4 21.8,-27.6 -0.4,-1.7 -7.8,-9.7 -20.8,-22.4 -18.4,-18 -20.5,-19.8 -23.7,-19.8 -3.2,-0 -5.1,1.7 -23.7,20.3z"
android:fillColor="#000000"
android:strokeColor="#00000000"/>
</vector>

View File

@ -1,22 +0,0 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="225"
android:viewportHeight="225">
<path
android:pathData="M90.1,20.4l-19.4,19.4 -0.5,7.2 -0.5,7.2 -26.1,-26.1 -26.1,-26.1 -6.9,6.9 -6.9,7 33.1,33.6 33.2,33.7 0,21.3c0,20.9 0.7,26.5 3.2,26.5 0.7,-0 6.1,-4.8 12,-10.7l10.8,-10.8 56,56 56,56 7,-7 7,-7 -44.7,-45c-24.7,-24.7 -49.7,-50.1 -55.8,-56.2l-11,-11.3 23.3,-23.3c21.2,-21.3 23.2,-23.6 23.2,-26.7 0,-3.1 -1.8,-5.2 -20.3,-23.7 -18.6,-18.6 -20.5,-20.3 -23.7,-20.3 -3.2,-0 -5.1,1.6 -22.9,19.4z"
android:fillColor="#000000"
android:strokeColor="#00000000"/>
<path
android:pathData="M176.5,69.9c-1.6,1 -11.4,10.4 -21.7,20.8 -18.9,19.1 -20.4,21.2 -17.9,25.1 0.5,0.8 9.8,10.3 20.7,21.3 18.3,18.4 20.1,19.9 23.3,19.9 3.3,-0 5.1,-1.5 23.2,-19.8 10.8,-11 20,-20.9 20.4,-22.1 0.4,-1.2 0.4,-3.2 0.1,-4.4 -0.8,-3.1 -39.5,-41.5 -42.6,-42.2 -1.6,-0.3 -3.6,0.2 -5.5,1.4z"
android:fillColor="#000000"
android:strokeColor="#00000000"/>
<path
android:pathData="M19.7,90.8c-14.6,14.7 -19.7,20.4 -19.7,22.2 0,1.8 5,7.4 19.2,21.7 10.6,10.6 19.8,19.3 20.4,19.3 0.7,-0 1.5,-0.7 1.8,-1.6 0.3,-0.9 0.6,-19 0.6,-40.4 0,-30.8 -0.3,-39 -1.3,-39.8 -1,-0.9 -5.7,3.3 -21,18.6z"
android:fillColor="#000000"
android:strokeColor="#00000000"/>
<path
android:pathData="M89.3,156.3c-18.5,18.5 -20.3,20.6 -20.3,23.7 0,3.1 1.8,5.2 20.3,23.7 19.3,19.4 20.4,20.3 24.1,20.3 3.7,-0 4.8,-0.9 22.3,-18.2 20.2,-20.1 22.9,-23.4 21.8,-27.6 -0.4,-1.7 -7.8,-9.7 -20.8,-22.4 -18.4,-18 -20.5,-19.8 -23.7,-19.8 -3.2,-0 -5.1,1.7 -23.7,20.3z"
android:fillColor="#000000"
android:strokeColor="#00000000"/>
</vector>

View File

@ -25,8 +25,6 @@
<stroke
android:width="0dp"
android:color="#FFFFFF" />
<solid
android:color="@drawable/background"/>
<corners
android:bottomLeftRadius="0dp"

View File

@ -1,9 +0,0 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="#FF000000"
android:pathData="M24,8.98C20.93,5.9 16.69,4 12,4C7.31,4 3.07,5.9 0,8.98L12,21v0l0,0L24,8.98zM2.92,9.07C5.51,7.08 8.67,6 12,6s6.49,1.08 9.08,3.07l-1.43,1.43C17.5,8.94 14.86,8 12,8s-5.5,0.94 -7.65,2.51L2.92,9.07z"/>
</vector>

View File

@ -1,14 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android" >
<stroke android:width="2dp"
android:color="#FFFFFF"/>
<gradient
android:angle="225"
android:startColor="#DD2ECCFA"
android:endColor="#DD000000"/>
<corners
android:bottomLeftRadius="20dp"
android:bottomRightRadius="20dp"
android:topLeftRadius="20dp"
android:topRightRadius="20dp" />
</shape>

View File

@ -1,9 +0,0 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<gradient
android:angle="135"
android:centerColor="#009688"
android:endColor="#00695C"
android:startColor="#4DB6AC"
android:type="linear" />
</shape>

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.7 MiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 784 KiB

View File

@ -27,7 +27,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:clickable="true"
tools:context=".ui.Credits.CreditsFragment">
tools:context=".ui.credits.CreditsFragment">
<ImageView
android:id="@drawable/backgroundoverlay"

View File

@ -27,7 +27,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:clickable="true"
tools:context=".ui.Credits.CreditsFragment">
tools:context=".ui.credits.CreditsFragment">
<ImageView
android:id="@drawable/backgroundoverlay"

View File

@ -7,7 +7,7 @@
android:clickable="true"
android:id="@+id/fragment_terminal"
android:layout_height="match_parent"
tools:context=".ui.Terminal.TerminalFragment">
tools:context=".ui.terminal.TerminalFragment">
<ScrollView
android:id="@+id/scrollView"

View File

@ -1,128 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:clickable="true"
android:layout_height="match_parent"
tools:context=".ui.zeitsteuerung.ZeitsteuerungFragment">
<ImageView
android:id="@+id/Background"
android:layout_width="0dp"
android:layout_height="0dp"
android:scaleType="centerCrop"
android:src="@drawable/fog_background"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="1.0"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="1.0" />
<ImageView
android:id="@drawable/backgroundoverlay"
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_marginStart="-25dp"
android:layout_marginLeft="-25dp"
android:layout_marginTop="-25dp"
android:layout_marginEnd="-25dp"
android:layout_marginRight="-25dp"
android:layout_marginBottom="-25dp"
android:scaleType="centerCrop"
android:src="@drawable/backgroundoverlay"
app:layout_constraintBottom_toBottomOf="@+id/sendtimedcommand"
app:layout_constraintEnd_toEndOf="@+id/divider10"
app:layout_constraintStart_toStartOf="@+id/divider10"
app:layout_constraintTop_toTopOf="@+id/textView10" />
<EditText
android:id="@+id/befehlInput2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:backgroundTint="@color/mtrl_btn_text_color_selector"
android:ems="10"
android:inputType="text"
android:textColor="@color/mtrl_btn_text_color_selector"
android:textColorHint="@color/mtrl_btn_text_color_selector"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.497"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/textView8" />
<TextView
android:id="@+id/textView8"
android:layout_width="253dp"
android:layout_height="wrap_content"
android:layout_marginTop="25dp"
android:gravity="center_horizontal"
android:text="@string/command"
android:textAlignment="center"
android:textColor="@color/mtrl_btn_text_color_selector"
android:textSize="20sp"
app:layout_constraintBottom_toTopOf="@+id/befehlInput2"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.506"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/divider10" />
<TextView
android:id="@+id/textView10"
android:layout_width="253dp"
android:layout_height="wrap_content"
android:gravity="center_horizontal"
android:text="@string/timed_commands"
android:textAlignment="center"
android:textColor="@color/mtrl_btn_text_color_selector"
android:textSize="20sp"
app:layout_constraintBottom_toTopOf="@+id/timePicker"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.506"
app:layout_constraintStart_toStartOf="parent" />
<Button
android:id="@+id/sendtimedcommand"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="25dp"
android:background="@drawable/button_round"
android:hapticFeedbackEnabled="true"
android:text="@string/send_timed_command"
app:backgroundTint="@null"
app:icon="@drawable/send_24px"
app:layout_constraintEnd_toEndOf="@+id/befehlInput2"
app:layout_constraintStart_toStartOf="@+id/befehlInput2"
app:layout_constraintTop_toBottomOf="@+id/befehlInput2" />
<TimePicker
android:id="@+id/timePicker"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="125dp"
android:amPmTextColor="@color/mtrl_btn_text_color_selector"
android:numbersSelectorColor="@color/mtrl_btn_text_color_selector"
android:timePickerMode="spinner"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.5"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<View
android:id="@+id/divider10"
android:layout_width="0dp"
android:layout_height="2dp"
android:layout_marginStart="50dp"
android:layout_marginLeft="50dp"
android:layout_marginEnd="50dp"
android:layout_marginRight="50dp"
android:background="@drawable/background_full"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.0"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/timePicker" />
</androidx.constraintlayout.widget.ConstraintLayout>

View File

@ -1,46 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:orientation="horizontal"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<EditText
android:id="@+id/edit_cricketer_name"
android:layout_width="match_parent"
android:layout_height="40dp"
android:layout_marginLeft="10dp"
android:layout_marginRight="5dp"
android:layout_weight="1"
android:background="@drawable/side_nav_bar"
android:hint="Cricketer Name"
android:paddingLeft="10dp"
android:textColor="@color/black"
android:textSize="14sp"></EditText>
<FrameLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@android:drawable/arrow_down_float">
<androidx.appcompat.widget.AppCompatSpinner
android:id="@+id/spinner_team"
android:layout_width="150dp"
android:layout_height="40dp"
android:background="@drawable/side_nav_bar"></androidx.appcompat.widget.AppCompatSpinner>
</FrameLayout>
<ImageView
android:id="@+id/image_remove"
android:layout_width="25dp"
android:layout_height="25dp"
android:layout_gravity="center_vertical"
android:layout_marginLeft="5dp"
android:layout_marginRight="10dp"
android:src="@drawable/restart_alt_24px"
app:tint="@color/black">
</ImageView>
</LinearLayout>

View File

@ -17,10 +17,7 @@
android:id="@+id/nav_terminal"
android:icon="@drawable/code_black_24dp"
android:title="@string/menu_terminal" />
<item
android:id="@+id/nav_zeitsteuerung"
android:icon="@drawable/schedule_black_24dp"
android:title="@string/menu_zeitsteuerung" />
</group>
<group

View File

@ -11,9 +11,9 @@
app:iconTint="?attr/colorOnPrimary"
app:showAsAction="ifRoom" />
<item
android:id="@+id/einstellungen"
android:id="@+id/settings"
android:icon="@drawable/ic_menu_share"
android:onClick="menurighttopeinstellungen"
android:onClick="menurighttopsettings"
android:orderInCategory="100"
android:title="@string/menu_settings"
app:showAsAction="never" />

View File

@ -14,31 +14,25 @@
<fragment
android:id="@+id/nav_terminal"
android:name="de.jg_cody.Teraplex.ui.Terminal.TerminalFragment"
android:name="de.jg_cody.Teraplex.ui.terminal.TerminalFragment"
android:label="@string/menu_terminal"
tools:layout="@layout/fragment_terminal" />
<fragment
android:id="@+id/nav_einstellungen"
android:name="de.jg_cody.Teraplex.ui.Einstellungen.EinstellungenFragment"
android:id="@+id/nav_settings"
android:name="de.jg_cody.Teraplex.ui.settings.SettingsFragment"
android:label="@string/menu_settings"
tools:layout="@layout/fragment_einstellungen" />
<fragment
android:id="@+id/nav_zeitsteuerung"
android:name="de.jg_cody.Teraplex.ui.zeitsteuerung.ZeitsteuerungFragment"
android:label="@string/menu_zeitsteuerung"
tools:layout="@layout/fragment_zeitsteuerung" />
tools:layout="@layout/fragment_settings" />
<fragment
android:id="@+id/nav_tabs"
android:name="de.jg_cody.Teraplex.ui.Tabs.TabsFragment"
android:name="de.jg_cody.Teraplex.ui.tabs.TabsFragment"
android:label="@string/menu_tabs"
tools:layout="@layout/fragment_tabs" />
<fragment
android:id="@+id/nav_über"
android:name="de.jg_cody.Teraplex.ui.Credits.CreditsFragment"
android:name="de.jg_cody.Teraplex.ui.credits.CreditsFragment"
android:label="@string/menu_about"
tools:layout="@layout/fragment_credits" />
</navigation>