diff --git a/app/src/main/java/de/jg_cody/Teraplex/AddButtonDialogSingle.java b/app/src/main/java/de/jg_cody/Teraplex/AddButtonDialogSingle.java index c864b4f..cf7c9a3 100644 --- a/app/src/main/java/de/jg_cody/Teraplex/AddButtonDialogSingle.java +++ b/app/src/main/java/de/jg_cody/Teraplex/AddButtonDialogSingle.java @@ -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; diff --git a/app/src/main/java/de/jg_cody/Teraplex/AddButtonsDialogDouble.java b/app/src/main/java/de/jg_cody/Teraplex/AddButtonsDialogDouble.java index b2b2eeb..d08b0e9 100644 --- a/app/src/main/java/de/jg_cody/Teraplex/AddButtonsDialogDouble.java +++ b/app/src/main/java/de/jg_cody/Teraplex/AddButtonsDialogDouble.java @@ -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 { diff --git a/app/src/main/java/de/jg_cody/Teraplex/AddHeadlineDialog.java b/app/src/main/java/de/jg_cody/Teraplex/AddHeadlineDialog.java index 8c7ffa3..d03ee2f 100644 --- a/app/src/main/java/de/jg_cody/Teraplex/AddHeadlineDialog.java +++ b/app/src/main/java/de/jg_cody/Teraplex/AddHeadlineDialog.java @@ -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; diff --git a/app/src/main/java/de/jg_cody/Teraplex/Cricketer.java b/app/src/main/java/de/jg_cody/Teraplex/Cricketer.java index 048086f..9ca6f1d 100644 --- a/app/src/main/java/de/jg_cody/Teraplex/Cricketer.java +++ b/app/src/main/java/de/jg_cody/Teraplex/Cricketer.java @@ -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; - } } \ No newline at end of file diff --git a/app/src/main/java/de/jg_cody/Teraplex/MainActivity.java b/app/src/main/java/de/jg_cody/Teraplex/MainActivity.java index ca8735b..45176c3 100644 --- a/app/src/main/java/de/jg_cody/Teraplex/MainActivity.java +++ b/app/src/main/java/de/jg_cody/Teraplex/MainActivity.java @@ -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); } diff --git a/app/src/main/java/de/jg_cody/Teraplex/ui/Einstellungen/EinstellungenViewModel.java b/app/src/main/java/de/jg_cody/Teraplex/ui/Einstellungen/EinstellungenViewModel.java deleted file mode 100644 index f61a044..0000000 --- a/app/src/main/java/de/jg_cody/Teraplex/ui/Einstellungen/EinstellungenViewModel.java +++ /dev/null @@ -1,8 +0,0 @@ -package de.jg_cody.Teraplex.ui.Einstellungen; - -import androidx.lifecycle.ViewModel; - -public class EinstellungenViewModel extends ViewModel { - - -} \ No newline at end of file diff --git a/app/src/main/java/de/jg_cody/Teraplex/ui/Credits/CreditsFragment.java b/app/src/main/java/de/jg_cody/Teraplex/ui/credits/CreditsFragment.java similarity index 93% rename from app/src/main/java/de/jg_cody/Teraplex/ui/Credits/CreditsFragment.java rename to app/src/main/java/de/jg_cody/Teraplex/ui/credits/CreditsFragment.java index 3ee19ea..e980edc 100644 --- a/app/src/main/java/de/jg_cody/Teraplex/ui/Credits/CreditsFragment.java +++ b/app/src/main/java/de/jg_cody/Teraplex/ui/credits/CreditsFragment.java @@ -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; diff --git a/app/src/main/java/de/jg_cody/Teraplex/ui/Credits/CreditsViewModel.java b/app/src/main/java/de/jg_cody/Teraplex/ui/credits/CreditsViewModel.java similarity index 69% rename from app/src/main/java/de/jg_cody/Teraplex/ui/Credits/CreditsViewModel.java rename to app/src/main/java/de/jg_cody/Teraplex/ui/credits/CreditsViewModel.java index 0c0a5ac..b6e8dab 100644 --- a/app/src/main/java/de/jg_cody/Teraplex/ui/Credits/CreditsViewModel.java +++ b/app/src/main/java/de/jg_cody/Teraplex/ui/credits/CreditsViewModel.java @@ -1,4 +1,4 @@ -package de.jg_cody.Teraplex.ui.Credits; +package de.jg_cody.Teraplex.ui.credits; import androidx.lifecycle.ViewModel; diff --git a/app/src/main/java/de/jg_cody/Teraplex/ui/rooms/RoomFragment.java b/app/src/main/java/de/jg_cody/Teraplex/ui/rooms/RoomFragment.java deleted file mode 100644 index 0679fa5..0000000 --- a/app/src/main/java/de/jg_cody/Teraplex/ui/rooms/RoomFragment.java +++ /dev/null @@ -1,6 +0,0 @@ -package de.jg_cody.Teraplex.ui.rooms; - -import androidx.fragment.app.Fragment; - -public class RoomFragment extends Fragment { -} diff --git a/app/src/main/java/de/jg_cody/Teraplex/ui/Einstellungen/EinstellungenFragment.java b/app/src/main/java/de/jg_cody/Teraplex/ui/settings/SettingsFragment.java similarity index 96% rename from app/src/main/java/de/jg_cody/Teraplex/ui/Einstellungen/EinstellungenFragment.java rename to app/src/main/java/de/jg_cody/Teraplex/ui/settings/SettingsFragment.java index 9fe3324..2d1d5af 100644 --- a/app/src/main/java/de/jg_cody/Teraplex/ui/Einstellungen/EinstellungenFragment.java +++ b/app/src/main/java/de/jg_cody/Teraplex/ui/settings/SettingsFragment.java @@ -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) { diff --git a/app/src/main/java/de/jg_cody/Teraplex/ui/settings/SettingsViewModel.java b/app/src/main/java/de/jg_cody/Teraplex/ui/settings/SettingsViewModel.java new file mode 100644 index 0000000..416f384 --- /dev/null +++ b/app/src/main/java/de/jg_cody/Teraplex/ui/settings/SettingsViewModel.java @@ -0,0 +1,8 @@ +package de.jg_cody.Teraplex.ui.settings; + +import androidx.lifecycle.ViewModel; + +public class SettingsViewModel extends ViewModel { + + +} \ No newline at end of file diff --git a/app/src/main/java/de/jg_cody/Teraplex/ui/rooms/CommandExecutor.java b/app/src/main/java/de/jg_cody/Teraplex/ui/tabs/CommandExecutor.java similarity index 96% rename from app/src/main/java/de/jg_cody/Teraplex/ui/rooms/CommandExecutor.java rename to app/src/main/java/de/jg_cody/Teraplex/ui/tabs/CommandExecutor.java index bd4431f..edb7862 100644 --- a/app/src/main/java/de/jg_cody/Teraplex/ui/rooms/CommandExecutor.java +++ b/app/src/main/java/de/jg_cody/Teraplex/ui/tabs/CommandExecutor.java @@ -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; diff --git a/app/src/main/java/de/jg_cody/Teraplex/ui/rooms/IViewHolder.java b/app/src/main/java/de/jg_cody/Teraplex/ui/tabs/IViewHolder.java similarity index 78% rename from app/src/main/java/de/jg_cody/Teraplex/ui/rooms/IViewHolder.java rename to app/src/main/java/de/jg_cody/Teraplex/ui/tabs/IViewHolder.java index fc65987..4b20780 100644 --- a/app/src/main/java/de/jg_cody/Teraplex/ui/rooms/IViewHolder.java +++ b/app/src/main/java/de/jg_cody/Teraplex/ui/tabs/IViewHolder.java @@ -1,4 +1,4 @@ -package de.jg_cody.Teraplex.ui.rooms; +package de.jg_cody.Teraplex.ui.tabs; import android.view.View; diff --git a/app/src/main/java/de/jg_cody/Teraplex/ui/rooms/ListAdapter.java b/app/src/main/java/de/jg_cody/Teraplex/ui/tabs/ListAdapter.java similarity index 99% rename from app/src/main/java/de/jg_cody/Teraplex/ui/rooms/ListAdapter.java rename to app/src/main/java/de/jg_cody/Teraplex/ui/tabs/ListAdapter.java index b52d0f1..4351e3b 100644 --- a/app/src/main/java/de/jg_cody/Teraplex/ui/rooms/ListAdapter.java +++ b/app/src/main/java/de/jg_cody/Teraplex/ui/tabs/ListAdapter.java @@ -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; diff --git a/app/src/main/java/de/jg_cody/Teraplex/ui/rooms/ListItem.java b/app/src/main/java/de/jg_cody/Teraplex/ui/tabs/ListItem.java similarity index 93% rename from app/src/main/java/de/jg_cody/Teraplex/ui/rooms/ListItem.java rename to app/src/main/java/de/jg_cody/Teraplex/ui/tabs/ListItem.java index d0afea6..75cd4c4 100644 --- a/app/src/main/java/de/jg_cody/Teraplex/ui/rooms/ListItem.java +++ b/app/src/main/java/de/jg_cody/Teraplex/ui/tabs/ListItem.java @@ -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; diff --git a/app/src/main/java/de/jg_cody/Teraplex/ui/rooms/ListItemDouble.java b/app/src/main/java/de/jg_cody/Teraplex/ui/tabs/ListItemDouble.java similarity index 97% rename from app/src/main/java/de/jg_cody/Teraplex/ui/rooms/ListItemDouble.java rename to app/src/main/java/de/jg_cody/Teraplex/ui/tabs/ListItemDouble.java index 0136789..095173c 100644 --- a/app/src/main/java/de/jg_cody/Teraplex/ui/rooms/ListItemDouble.java +++ b/app/src/main/java/de/jg_cody/Teraplex/ui/tabs/ListItemDouble.java @@ -1,4 +1,4 @@ -package de.jg_cody.Teraplex.ui.rooms; +package de.jg_cody.Teraplex.ui.tabs; public class ListItemDouble extends ListItem{ diff --git a/app/src/main/java/de/jg_cody/Teraplex/ui/rooms/ListItemHeadline.java b/app/src/main/java/de/jg_cody/Teraplex/ui/tabs/ListItemHeadline.java similarity index 91% rename from app/src/main/java/de/jg_cody/Teraplex/ui/rooms/ListItemHeadline.java rename to app/src/main/java/de/jg_cody/Teraplex/ui/tabs/ListItemHeadline.java index 9eb751a..36f97a8 100644 --- a/app/src/main/java/de/jg_cody/Teraplex/ui/rooms/ListItemHeadline.java +++ b/app/src/main/java/de/jg_cody/Teraplex/ui/tabs/ListItemHeadline.java @@ -1,4 +1,4 @@ -package de.jg_cody.Teraplex.ui.rooms; +package de.jg_cody.Teraplex.ui.tabs; public class ListItemHeadline extends ListItem{ diff --git a/app/src/main/java/de/jg_cody/Teraplex/ui/rooms/ListItemSingle.java b/app/src/main/java/de/jg_cody/Teraplex/ui/tabs/ListItemSingle.java similarity index 96% rename from app/src/main/java/de/jg_cody/Teraplex/ui/rooms/ListItemSingle.java rename to app/src/main/java/de/jg_cody/Teraplex/ui/tabs/ListItemSingle.java index 5dbd41b..b018194 100644 --- a/app/src/main/java/de/jg_cody/Teraplex/ui/rooms/ListItemSingle.java +++ b/app/src/main/java/de/jg_cody/Teraplex/ui/tabs/ListItemSingle.java @@ -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; diff --git a/app/src/main/java/de/jg_cody/Teraplex/ui/rooms/ListItemSpace.java b/app/src/main/java/de/jg_cody/Teraplex/ui/tabs/ListItemSpace.java similarity index 85% rename from app/src/main/java/de/jg_cody/Teraplex/ui/rooms/ListItemSpace.java rename to app/src/main/java/de/jg_cody/Teraplex/ui/tabs/ListItemSpace.java index 1b8b315..730fa29 100644 --- a/app/src/main/java/de/jg_cody/Teraplex/ui/rooms/ListItemSpace.java +++ b/app/src/main/java/de/jg_cody/Teraplex/ui/tabs/ListItemSpace.java @@ -1,4 +1,4 @@ -package de.jg_cody.Teraplex.ui.rooms; +package de.jg_cody.Teraplex.ui.tabs; public class ListItemSpace extends ListItem { diff --git a/app/src/main/java/de/jg_cody/Teraplex/ui/Tabs/TabsFragment.java b/app/src/main/java/de/jg_cody/Teraplex/ui/tabs/TabsFragment.java similarity index 95% rename from app/src/main/java/de/jg_cody/Teraplex/ui/Tabs/TabsFragment.java rename to app/src/main/java/de/jg_cody/Teraplex/ui/tabs/TabsFragment.java index 6e18449..7c20556 100644 --- a/app/src/main/java/de/jg_cody/Teraplex/ui/Tabs/TabsFragment.java +++ b/app/src/main/java/de/jg_cody/Teraplex/ui/tabs/TabsFragment.java @@ -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; diff --git a/app/src/main/java/de/jg_cody/Teraplex/ui/Tabs/TabsViewModel.java b/app/src/main/java/de/jg_cody/Teraplex/ui/tabs/TabsViewModel.java similarity index 91% rename from app/src/main/java/de/jg_cody/Teraplex/ui/Tabs/TabsViewModel.java rename to app/src/main/java/de/jg_cody/Teraplex/ui/tabs/TabsViewModel.java index 39753ba..6eb51e8 100644 --- a/app/src/main/java/de/jg_cody/Teraplex/ui/Tabs/TabsViewModel.java +++ b/app/src/main/java/de/jg_cody/Teraplex/ui/tabs/TabsViewModel.java @@ -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; diff --git a/app/src/main/java/de/jg_cody/Teraplex/ui/rooms/ViewHolderDoubleButton.java b/app/src/main/java/de/jg_cody/Teraplex/ui/tabs/ViewHolderDoubleButton.java similarity index 97% rename from app/src/main/java/de/jg_cody/Teraplex/ui/rooms/ViewHolderDoubleButton.java rename to app/src/main/java/de/jg_cody/Teraplex/ui/tabs/ViewHolderDoubleButton.java index 9004962..5f1aae2 100644 --- a/app/src/main/java/de/jg_cody/Teraplex/ui/rooms/ViewHolderDoubleButton.java +++ b/app/src/main/java/de/jg_cody/Teraplex/ui/tabs/ViewHolderDoubleButton.java @@ -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; diff --git a/app/src/main/java/de/jg_cody/Teraplex/ui/rooms/ViewHolderSingleButton.java b/app/src/main/java/de/jg_cody/Teraplex/ui/tabs/ViewHolderSingleButton.java similarity index 95% rename from app/src/main/java/de/jg_cody/Teraplex/ui/rooms/ViewHolderSingleButton.java rename to app/src/main/java/de/jg_cody/Teraplex/ui/tabs/ViewHolderSingleButton.java index 3c82b5c..fa18745 100644 --- a/app/src/main/java/de/jg_cody/Teraplex/ui/rooms/ViewHolderSingleButton.java +++ b/app/src/main/java/de/jg_cody/Teraplex/ui/tabs/ViewHolderSingleButton.java @@ -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; diff --git a/app/src/main/java/de/jg_cody/Teraplex/ui/Terminal/Terminal.java b/app/src/main/java/de/jg_cody/Teraplex/ui/terminal/Terminal.java similarity index 95% rename from app/src/main/java/de/jg_cody/Teraplex/ui/Terminal/Terminal.java rename to app/src/main/java/de/jg_cody/Teraplex/ui/terminal/Terminal.java index 21351bf..28d65b6 100644 --- a/app/src/main/java/de/jg_cody/Teraplex/ui/Terminal/Terminal.java +++ b/app/src/main/java/de/jg_cody/Teraplex/ui/terminal/Terminal.java @@ -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 { diff --git a/app/src/main/java/de/jg_cody/Teraplex/ui/Terminal/TerminalFragment.java b/app/src/main/java/de/jg_cody/Teraplex/ui/terminal/TerminalFragment.java similarity index 95% rename from app/src/main/java/de/jg_cody/Teraplex/ui/Terminal/TerminalFragment.java rename to app/src/main/java/de/jg_cody/Teraplex/ui/terminal/TerminalFragment.java index c8a836c..7395020 100644 --- a/app/src/main/java/de/jg_cody/Teraplex/ui/Terminal/TerminalFragment.java +++ b/app/src/main/java/de/jg_cody/Teraplex/ui/terminal/TerminalFragment.java @@ -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; diff --git a/app/src/main/java/de/jg_cody/Teraplex/ui/Terminal/TerminalViewModel.java b/app/src/main/java/de/jg_cody/Teraplex/ui/terminal/TerminalViewModel.java similarity index 69% rename from app/src/main/java/de/jg_cody/Teraplex/ui/Terminal/TerminalViewModel.java rename to app/src/main/java/de/jg_cody/Teraplex/ui/terminal/TerminalViewModel.java index 46a8d3b..8eee136 100644 --- a/app/src/main/java/de/jg_cody/Teraplex/ui/Terminal/TerminalViewModel.java +++ b/app/src/main/java/de/jg_cody/Teraplex/ui/terminal/TerminalViewModel.java @@ -1,4 +1,4 @@ -package de.jg_cody.Teraplex.ui.Terminal; +package de.jg_cody.Teraplex.ui.terminal; import androidx.lifecycle.ViewModel; diff --git a/app/src/main/java/de/jg_cody/Teraplex/ui/zeitsteuerung/ZeitsteuerungFragment.java b/app/src/main/java/de/jg_cody/Teraplex/ui/zeitsteuerung/ZeitsteuerungFragment.java deleted file mode 100644 index 3151a0d..0000000 --- a/app/src/main/java/de/jg_cody/Teraplex/ui/zeitsteuerung/ZeitsteuerungFragment.java +++ /dev/null @@ -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; - } -} \ No newline at end of file diff --git a/app/src/main/java/de/jg_cody/Teraplex/ui/zeitsteuerung/ZeitsteuerungViewModel.java b/app/src/main/java/de/jg_cody/Teraplex/ui/zeitsteuerung/ZeitsteuerungViewModel.java deleted file mode 100644 index 8eda28b..0000000 --- a/app/src/main/java/de/jg_cody/Teraplex/ui/zeitsteuerung/ZeitsteuerungViewModel.java +++ /dev/null @@ -1,8 +0,0 @@ -package de.jg_cody.Teraplex.ui.zeitsteuerung; - -import androidx.lifecycle.ViewModel; - -public class ZeitsteuerungViewModel extends ViewModel { - - -} \ No newline at end of file diff --git a/app/src/main/res/drawable/background.jpg b/app/src/main/res/drawable/background.jpg deleted file mode 100644 index 6086202..0000000 Binary files a/app/src/main/res/drawable/background.jpg and /dev/null differ diff --git a/app/src/main/res/drawable/desktop_access_disabled_black_24dp.xml b/app/src/main/res/drawable/desktop_access_disabled_black_24dp.xml deleted file mode 100644 index 85c3900..0000000 --- a/app/src/main/res/drawable/desktop_access_disabled_black_24dp.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/desktop_windows_black_24dp.xml b/app/src/main/res/drawable/desktop_windows_black_24dp.xml deleted file mode 100644 index beb7bc0..0000000 --- a/app/src/main/res/drawable/desktop_windows_black_24dp.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/kodi.xml b/app/src/main/res/drawable/kodi.xml deleted file mode 100644 index 1024e38..0000000 --- a/app/src/main/res/drawable/kodi.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - diff --git a/app/src/main/res/drawable/kodi_aus_1_.xml b/app/src/main/res/drawable/kodi_aus_1_.xml deleted file mode 100644 index ae582f9..0000000 --- a/app/src/main/res/drawable/kodi_aus_1_.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - diff --git a/app/src/main/res/drawable/main_drawler.xml b/app/src/main/res/drawable/main_drawler.xml index 297c278..05c7ade 100644 --- a/app/src/main/res/drawable/main_drawler.xml +++ b/app/src/main/res/drawable/main_drawler.xml @@ -25,8 +25,6 @@ - - - diff --git a/app/src/main/res/drawable/shape.xml b/app/src/main/res/drawable/shape.xml deleted file mode 100644 index 929fbde..0000000 --- a/app/src/main/res/drawable/shape.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - diff --git a/app/src/main/res/drawable/side_nav_bar.xml b/app/src/main/res/drawable/side_nav_bar.xml deleted file mode 100644 index 6d81870..0000000 --- a/app/src/main/res/drawable/side_nav_bar.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/spinning_logo.gif b/app/src/main/res/drawable/spinning_logo.gif deleted file mode 100644 index b4a54d0..0000000 Binary files a/app/src/main/res/drawable/spinning_logo.gif and /dev/null differ diff --git a/app/src/main/res/drawable/teraplex_login.jpg b/app/src/main/res/drawable/teraplex_login.jpg deleted file mode 100644 index 5d861f4..0000000 Binary files a/app/src/main/res/drawable/teraplex_login.jpg and /dev/null differ diff --git a/app/src/main/res/layout/fragment_credits.xml b/app/src/main/res/layout/fragment_credits.xml index bf287f6..ea9f754 100644 --- a/app/src/main/res/layout/fragment_credits.xml +++ b/app/src/main/res/layout/fragment_credits.xml @@ -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"> + tools:context=".ui.credits.CreditsFragment"> + tools:context=".ui.terminal.TerminalFragment"> - - - - - - - - - - - - -