From 3961a880f19b1ef7636527e8d6fd1bf3790a5515 Mon Sep 17 00:00:00 2001 From: JG-Cody Date: Sat, 14 Aug 2021 15:33:52 +0200 Subject: [PATCH] huge code-cleanup --- .../Teraplex/AddButtonDialogSingle.java | 4 -- .../Teraplex/AddButtonsDialogDouble.java | 4 -- .../jg_cody/Teraplex/AddHeadlineDialog.java | 7 +-- .../de/jg_cody/Teraplex/IntroActivity.java | 3 -- .../de/jg_cody/Teraplex/MainActivity.java | 10 ---- .../Teraplex/MovableFloatingActionButton.java | 4 -- .../Teraplex/ui/credits/CreditsFragment.java | 5 +- .../Teraplex/ui/credits/CreditsViewModel.java | 8 --- .../Teraplex/ui/home/HomeFragment.java | 10 +--- .../Teraplex/ui/home/HomeViewModel.java | 7 --- .../Teraplex/ui/intro/IntroFragment.java | 5 +- .../Teraplex/ui/intro/IntroViewModel.java | 19 ------- .../ui/settings/SettingsFragment.java | 6 +-- .../ui/settings/SettingsViewModel.java | 8 --- .../jg_cody/Teraplex/ui/tabs/IViewHolder.java | 1 + .../jg_cody/Teraplex/ui/tabs/ListAdapter.java | 1 - .../Teraplex/ui/tabs/ListItemHeadline.java | 9 ---- .../Teraplex/ui/tabs/ListItemSingle.java | 24 --------- .../Teraplex/ui/tabs/TabsFragment.java | 9 ++-- .../Teraplex/ui/tabs/TabsViewModel.java | 19 ------- .../ui/tabs/ViewHolderDoubleButton.java | 23 -------- .../ui/tabs/ViewHolderSingleButton.java | 16 +----- .../ui/terminal/TerminalFragment.java | 6 +-- .../ui/terminal/TerminalViewModel.java | 8 --- app/src/main/res/layout/activity_intro.xml | 1 - .../res/layout/addbuttonsdialog_double.xml | 1 - app/src/main/res/layout/nav_header_main.xml | 1 - app/src/main/res/layout/row_cricketer.xml | 35 ------------ app/src/main/res/preferences.xml | 54 ------------------- 29 files changed, 13 insertions(+), 295 deletions(-) delete mode 100644 app/src/main/java/de/jg_cody/Teraplex/ui/credits/CreditsViewModel.java delete mode 100644 app/src/main/java/de/jg_cody/Teraplex/ui/home/HomeViewModel.java delete mode 100644 app/src/main/java/de/jg_cody/Teraplex/ui/intro/IntroViewModel.java delete mode 100644 app/src/main/java/de/jg_cody/Teraplex/ui/settings/SettingsViewModel.java delete mode 100644 app/src/main/java/de/jg_cody/Teraplex/ui/tabs/TabsViewModel.java delete mode 100644 app/src/main/java/de/jg_cody/Teraplex/ui/terminal/TerminalViewModel.java delete mode 100644 app/src/main/res/layout/row_cricketer.xml delete mode 100644 app/src/main/res/preferences.xml 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 e22ae16..d1af451 100644 --- a/app/src/main/java/de/jg_cody/Teraplex/AddButtonDialogSingle.java +++ b/app/src/main/java/de/jg_cody/Teraplex/AddButtonDialogSingle.java @@ -86,10 +86,6 @@ public class AddButtonDialogSingle extends DialogFragment { { this.frag = frag; } - public TabsFragment getFragment() - { - return frag; - } @Override public void onAttach(@NotNull Context context) { 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 a3bc1f7..19a6536 100644 --- a/app/src/main/java/de/jg_cody/Teraplex/AddButtonsDialogDouble.java +++ b/app/src/main/java/de/jg_cody/Teraplex/AddButtonsDialogDouble.java @@ -80,10 +80,6 @@ public class AddButtonsDialogDouble extends DialogFragment { this.frag = frag; } - public TabsFragment getFragment() { - return frag; - } - @Override public void onAttach(@NotNull Context context) { super.onAttach(context); 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 a489540..cc38d6d 100644 --- a/app/src/main/java/de/jg_cody/Teraplex/AddHeadlineDialog.java +++ b/app/src/main/java/de/jg_cody/Teraplex/AddHeadlineDialog.java @@ -8,7 +8,6 @@ import android.os.Bundle; import android.view.LayoutInflater; import android.view.View; import android.widget.EditText; -import android.widget.ImageView; import androidx.fragment.app.DialogFragment; @@ -23,7 +22,7 @@ public class AddHeadlineDialog extends DialogFragment { private EditText editText_name; private TabsFragment frag; - ImageView delete; + /** * * @param savedInstanceState @@ -77,10 +76,6 @@ public class AddHeadlineDialog extends DialogFragment { { this.frag = frag; } - public TabsFragment getFragment() - { - return frag; - } @Override public void onAttach(@NotNull Context context) { diff --git a/app/src/main/java/de/jg_cody/Teraplex/IntroActivity.java b/app/src/main/java/de/jg_cody/Teraplex/IntroActivity.java index acdac5e..0fb88d6 100644 --- a/app/src/main/java/de/jg_cody/Teraplex/IntroActivity.java +++ b/app/src/main/java/de/jg_cody/Teraplex/IntroActivity.java @@ -6,13 +6,10 @@ import android.os.Handler; import android.os.Looper; import androidx.appcompat.app.AppCompatActivity; -import androidx.navigation.ui.AppBarConfiguration; public class IntroActivity extends AppCompatActivity { -private AppBarConfiguration mAppBarConfiguration; - @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); 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 77382a3..98906b1 100644 --- a/app/src/main/java/de/jg_cody/Teraplex/MainActivity.java +++ b/app/src/main/java/de/jg_cody/Teraplex/MainActivity.java @@ -13,7 +13,6 @@ import android.graphics.Bitmap; import android.graphics.BitmapFactory; import android.graphics.Canvas; import android.graphics.Color; -import android.graphics.Paint; import android.graphics.RectF; import android.graphics.drawable.ColorDrawable; import android.media.MediaPlayer; @@ -599,14 +598,5 @@ public class MainActivity extends AppCompatActivity { return dest; } - public static Bitmap createImage(int width, int height, int color) { - Bitmap bitmap = Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888); - Canvas canvas = new Canvas(bitmap); - Paint paint = new Paint(); - paint.setColor(color); - canvas.drawRect(0F, 0F, (float) width, (float) height, paint); - return bitmap; - } - } diff --git a/app/src/main/java/de/jg_cody/Teraplex/MovableFloatingActionButton.java b/app/src/main/java/de/jg_cody/Teraplex/MovableFloatingActionButton.java index c766c8a..76dd521 100644 --- a/app/src/main/java/de/jg_cody/Teraplex/MovableFloatingActionButton.java +++ b/app/src/main/java/de/jg_cody/Teraplex/MovableFloatingActionButton.java @@ -122,10 +122,6 @@ public class MovableFloatingActionButton extends FloatingActionButton implements } - public void setCustomClickListener(CustomClickListener customClickListener) { - this.customClickListener = customClickListener; - } - public interface CustomClickListener { void onClick(View view); } 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 index e980edc..c80e354 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 @@ -13,19 +13,16 @@ import android.widget.ImageView; import androidx.annotation.NonNull; import androidx.fragment.app.Fragment; -import androidx.lifecycle.ViewModelProvider; import de.jg_cody.Teraplex.MainActivity; import de.jg_cody.Teraplex.R; public class CreditsFragment extends Fragment { - private CreditsViewModel creditsViewModel; public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { - creditsViewModel = - new ViewModelProvider(this).get(CreditsViewModel.class); + View root = inflater.inflate(R.layout.fragment_credits, container, false); SharedPreferences p = requireContext().getSharedPreferences("appsettings", Activity.MODE_PRIVATE); String Background = p.getString("Background", null); 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 deleted file mode 100644 index b6e8dab..0000000 --- a/app/src/main/java/de/jg_cody/Teraplex/ui/credits/CreditsViewModel.java +++ /dev/null @@ -1,8 +0,0 @@ -package de.jg_cody.Teraplex.ui.credits; - -import androidx.lifecycle.ViewModel; - -public class CreditsViewModel extends ViewModel { - - -} \ No newline at end of file diff --git a/app/src/main/java/de/jg_cody/Teraplex/ui/home/HomeFragment.java b/app/src/main/java/de/jg_cody/Teraplex/ui/home/HomeFragment.java index bd6c8a7..0252fde 100644 --- a/app/src/main/java/de/jg_cody/Teraplex/ui/home/HomeFragment.java +++ b/app/src/main/java/de/jg_cody/Teraplex/ui/home/HomeFragment.java @@ -26,7 +26,6 @@ import android.widget.Toast; import androidx.annotation.NonNull; import androidx.fragment.app.Fragment; -import androidx.lifecycle.ViewModelProvider; import com.jcraft.jsch.Channel; import com.jcraft.jsch.JSch; @@ -51,15 +50,10 @@ public class HomeFragment extends Fragment { Button shutdown_Button; Button loginButton; Button logoutButton; - Terminal terminal; - Button wlan_aus_Button; - Button wlan_an_Button; - Button kodian; - Button kodiaus; ImageView togglepassword; - private HomeViewModel homeViewModel; + @SuppressLint("ClickableViewAccessibility") public View onCreateView(@NonNull LayoutInflater inflater, @@ -69,8 +63,6 @@ public class HomeFragment extends Fragment { password = prefs.getString("password", null); ip = prefs.getString("ip", null); - homeViewModel = - new ViewModelProvider(this).get(HomeViewModel.class); View root = inflater.inflate(R.layout.fragment_home, container, false); SharedPreferences p = requireContext().getSharedPreferences("appsettings", Activity.MODE_PRIVATE); String Background = p.getString("Background", null); diff --git a/app/src/main/java/de/jg_cody/Teraplex/ui/home/HomeViewModel.java b/app/src/main/java/de/jg_cody/Teraplex/ui/home/HomeViewModel.java deleted file mode 100644 index 3bcf30f..0000000 --- a/app/src/main/java/de/jg_cody/Teraplex/ui/home/HomeViewModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package de.jg_cody.Teraplex.ui.home; - -import androidx.lifecycle.ViewModel; - -public class HomeViewModel extends ViewModel { - -} \ No newline at end of file diff --git a/app/src/main/java/de/jg_cody/Teraplex/ui/intro/IntroFragment.java b/app/src/main/java/de/jg_cody/Teraplex/ui/intro/IntroFragment.java index 7194a22..da24ede 100644 --- a/app/src/main/java/de/jg_cody/Teraplex/ui/intro/IntroFragment.java +++ b/app/src/main/java/de/jg_cody/Teraplex/ui/intro/IntroFragment.java @@ -10,7 +10,6 @@ import android.widget.VideoView; import androidx.annotation.NonNull; import androidx.fragment.app.Fragment; -import androidx.lifecycle.ViewModelProvider; import de.jg_cody.Teraplex.R; @@ -22,12 +21,10 @@ public class IntroFragment extends Fragment { MediaPlayer mMediaPlayer; int mCurrentVideoPosition; - private IntroViewModel introViewModel; public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { - introViewModel = - new ViewModelProvider(this).get(IntroViewModel.class); + View root = inflater.inflate(R.layout.fragment_intro, container, false); // Hook up the VideoView to our UI. diff --git a/app/src/main/java/de/jg_cody/Teraplex/ui/intro/IntroViewModel.java b/app/src/main/java/de/jg_cody/Teraplex/ui/intro/IntroViewModel.java deleted file mode 100644 index 2fa91de..0000000 --- a/app/src/main/java/de/jg_cody/Teraplex/ui/intro/IntroViewModel.java +++ /dev/null @@ -1,19 +0,0 @@ -package de.jg_cody.Teraplex.ui.intro; - -import androidx.lifecycle.LiveData; -import androidx.lifecycle.MutableLiveData; -import androidx.lifecycle.ViewModel; - -public class IntroViewModel extends ViewModel { - - private MutableLiveData mText; - - public IntroViewModel() { - mText = new MutableLiveData<>(); - mText.setValue("INTRO"); - } - - public LiveData getText() { - return mText; - } -} \ No newline at end of file diff --git a/app/src/main/java/de/jg_cody/Teraplex/ui/settings/SettingsFragment.java b/app/src/main/java/de/jg_cody/Teraplex/ui/settings/SettingsFragment.java index facf3f9..c63909b 100644 --- a/app/src/main/java/de/jg_cody/Teraplex/ui/settings/SettingsFragment.java +++ b/app/src/main/java/de/jg_cody/Teraplex/ui/settings/SettingsFragment.java @@ -22,7 +22,6 @@ import android.widget.ImageView; import androidx.annotation.NonNull; import androidx.fragment.app.Fragment; -import androidx.lifecycle.ViewModelProvider; import java.util.Locale; import java.util.Objects; @@ -35,12 +34,11 @@ import static android.content.Context.MODE_PRIVATE; public class SettingsFragment extends Fragment { private EditText editExportFile_name; - private SettingsViewModel settingsViewModel; + public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { - 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); 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 deleted file mode 100644 index 416f384..0000000 --- a/app/src/main/java/de/jg_cody/Teraplex/ui/settings/SettingsViewModel.java +++ /dev/null @@ -1,8 +0,0 @@ -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/tabs/IViewHolder.java b/app/src/main/java/de/jg_cody/Teraplex/ui/tabs/IViewHolder.java index 4b20780..4783290 100644 --- a/app/src/main/java/de/jg_cody/Teraplex/ui/tabs/IViewHolder.java +++ b/app/src/main/java/de/jg_cody/Teraplex/ui/tabs/IViewHolder.java @@ -4,5 +4,6 @@ import android.view.View; public interface IViewHolder { abstract public String getCommand(); + abstract public View[] getViews(); } diff --git a/app/src/main/java/de/jg_cody/Teraplex/ui/tabs/ListAdapter.java b/app/src/main/java/de/jg_cody/Teraplex/ui/tabs/ListAdapter.java index 1c1c7d8..9cc21c8 100644 --- a/app/src/main/java/de/jg_cody/Teraplex/ui/tabs/ListAdapter.java +++ b/app/src/main/java/de/jg_cody/Teraplex/ui/tabs/ListAdapter.java @@ -29,7 +29,6 @@ public class ListAdapter extends RecyclerView.Adapter items; - String tabname; @@ -64,8 +61,7 @@ public class TabsFragment extends Fragment implements AddButtonDialogSingle.AddB public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { - tabsViewModel = - new ViewModelProvider(this).get(TabsViewModel.class); + View root = inflater.inflate(R.layout.fragment_tabs, container, false); SharedPreferences p = requireContext().getSharedPreferences("appsettings", Activity.MODE_PRIVATE); String Background = p.getString("Background", null); @@ -249,7 +245,7 @@ public class TabsFragment extends Fragment implements AddButtonDialogSingle.AddB JSONObject item = listItems2.getJSONObject(i); listAdapter.add(ListItem.fromJson(item)); } - ; + } public static void save(String tabname, Context context, ListAdapter listAdapter) throws JSONException { @@ -261,6 +257,7 @@ public class TabsFragment extends Fragment implements AddButtonDialogSingle.AddB editor.putString("listItems." + tabname, listItems2.toString()); editor.apply(); } + public void save() throws JSONException { save(tabname, requireContext(), listAdapter); } 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 deleted file mode 100644 index 6eb51e8..0000000 --- a/app/src/main/java/de/jg_cody/Teraplex/ui/tabs/TabsViewModel.java +++ /dev/null @@ -1,19 +0,0 @@ -package de.jg_cody.Teraplex.ui.tabs; - -import androidx.lifecycle.LiveData; -import androidx.lifecycle.MutableLiveData; -import androidx.lifecycle.ViewModel; - -public class TabsViewModel extends ViewModel { - - private MutableLiveData mText; - - public TabsViewModel() { - mText = new MutableLiveData<>(); - mText.setValue("TABS"); - } - - public LiveData getText() { - return mText; - } -} \ No newline at end of file diff --git a/app/src/main/java/de/jg_cody/Teraplex/ui/tabs/ViewHolderDoubleButton.java b/app/src/main/java/de/jg_cody/Teraplex/ui/tabs/ViewHolderDoubleButton.java index 5f1aae2..7f20b5f 100644 --- a/app/src/main/java/de/jg_cody/Teraplex/ui/tabs/ViewHolderDoubleButton.java +++ b/app/src/main/java/de/jg_cody/Teraplex/ui/tabs/ViewHolderDoubleButton.java @@ -2,34 +2,11 @@ package de.jg_cody.Teraplex.ui.tabs; import android.view.View; import android.widget.Button; -import android.widget.Toast; public class ViewHolderDoubleButton implements IViewHolder{ String commandL; - String commandR; Button bLeft, bRight; - public ViewHolderDoubleButton(Button bLeft, Button bRight, String commandL, String commandR) { - this.bLeft = bLeft; - this.bRight = bRight; - this.commandL = commandL; - this.commandR = commandR; - - bLeft.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - Toast.makeText(bLeft.getContext(),commandL + " ON",Toast.LENGTH_SHORT).show(); - } - }); - bRight.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - Toast.makeText(bRight.getContext(),commandR + " OFF",Toast.LENGTH_SHORT).show(); - } - }); - - - } @Override public String getCommand() { return commandL; diff --git a/app/src/main/java/de/jg_cody/Teraplex/ui/tabs/ViewHolderSingleButton.java b/app/src/main/java/de/jg_cody/Teraplex/ui/tabs/ViewHolderSingleButton.java index fa18745..4858059 100644 --- a/app/src/main/java/de/jg_cody/Teraplex/ui/tabs/ViewHolderSingleButton.java +++ b/app/src/main/java/de/jg_cody/Teraplex/ui/tabs/ViewHolderSingleButton.java @@ -2,27 +2,13 @@ package de.jg_cody.Teraplex.ui.tabs; import android.view.View; import android.widget.Button; -import android.widget.Toast; public class ViewHolderSingleButton implements IViewHolder { String command; Button bRun; - public ViewHolderSingleButton(Button bRun, String command) { - this.bRun = bRun; - this.command = command; - - bRun.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - Toast.makeText(bRun.getContext(),command + " ON",Toast.LENGTH_SHORT).show(); - } - }); - - - } - @Override + @Override public String getCommand() { return command; } 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 index 21cf0ee..2adfedb 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 @@ -17,7 +17,6 @@ import android.widget.Toast; import androidx.annotation.NonNull; import androidx.fragment.app.Fragment; -import androidx.lifecycle.ViewModelProvider; import java.util.Objects; @@ -34,12 +33,11 @@ public class TerminalFragment extends Fragment { ScrollView scrollView; public static String user, password, ip; - private TerminalViewModel terminalViewModel; + public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { - terminalViewModel = - new ViewModelProvider(this).get(TerminalViewModel.class); + View root = inflater.inflate(R.layout.fragment_terminal, container, false); SharedPreferences prefs = requireContext().getSharedPreferences("appsettings", Context.MODE_PRIVATE); user = prefs.getString("user", null); 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 deleted file mode 100644 index 8eee136..0000000 --- a/app/src/main/java/de/jg_cody/Teraplex/ui/terminal/TerminalViewModel.java +++ /dev/null @@ -1,8 +0,0 @@ -package de.jg_cody.Teraplex.ui.terminal; - -import androidx.lifecycle.ViewModel; - -public class TerminalViewModel extends ViewModel { - - -} \ No newline at end of file diff --git a/app/src/main/res/layout/activity_intro.xml b/app/src/main/res/layout/activity_intro.xml index 3be6acf..6fc2259 100644 --- a/app/src/main/res/layout/activity_intro.xml +++ b/app/src/main/res/layout/activity_intro.xml @@ -1,6 +1,5 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/preferences.xml b/app/src/main/res/preferences.xml deleted file mode 100644 index 0228c1d..0000000 --- a/app/src/main/res/preferences.xml +++ /dev/null @@ -1,54 +0,0 @@ - - - - - - - - - - - - - - - - - - - \ No newline at end of file