From e17596951c8162f9a4062a789b6abc02af4a346b Mon Sep 17 00:00:00 2001 From: JG-Cody Date: Mon, 7 Jun 2021 20:48:51 +0200 Subject: [PATCH] made statusbar and toolbar (bottom) black and some bugfixes --- .../de/jg_cody/Teraplex/MainActivity.java | 13 +++++ .../Einstellungen/EinstellungenFragment.java | 21 ++++++-- .../ui/Schlafzimmer/SchlafzimmerFragment.java | 12 ++--- .../Teraplex/ui/home/HomeFragment.java | 26 +++++----- app/src/main/res/drawable/toolbardown.xml | 39 +++++++++++++++ app/src/main/res/layout/activity_main.xml | 3 +- app/src/main/res/layout/content_main.xml | 3 +- app/src/main/res/layout/fragment_credits.xml | 48 ++++++++++--------- .../res/layout/fragment_einstellungen.xml | 8 ++-- app/src/main/res/layout/fragment_home.xml | 3 +- app/src/main/res/values-night/themes.xml | 6 ++- app/src/main/res/values/themes.xml | 4 ++ 12 files changed, 133 insertions(+), 53 deletions(-) create mode 100644 app/src/main/res/drawable/toolbardown.xml 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 21e5d07..cfb9b1e 100644 --- a/app/src/main/java/de/jg_cody/Teraplex/MainActivity.java +++ b/app/src/main/java/de/jg_cody/Teraplex/MainActivity.java @@ -12,7 +12,9 @@ import android.database.Cursor; import android.graphics.Bitmap; import android.graphics.BitmapFactory; import android.graphics.Canvas; +import android.graphics.Color; import android.graphics.RectF; +import android.graphics.drawable.ColorDrawable; import android.net.Uri; import android.os.Build; import android.os.Bundle; @@ -22,6 +24,7 @@ import android.text.style.ForegroundColorSpan; import android.util.TypedValue; import android.view.Menu; import android.view.MenuItem; +import android.view.WindowManager; import android.widget.ImageView; import androidx.annotation.RequiresApi; @@ -50,9 +53,19 @@ public class MainActivity extends AppCompatActivity implements AddButtonDialog.A public static int RESULT_LOAD_IMAGE = 0; private AppBarConfiguration mAppBarConfiguration; + @RequiresApi(api = Build.VERSION_CODES.LOLLIPOP) @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); + getWindow().addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS); + getWindow().clearFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS); + getWindow().setStatusBarColor(Color.TRANSPARENT); + getWindow().setNavigationBarColor(Color.BLUE); + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) { + getWindow().setStatusBarContrastEnforced(false); + } + //getWindow().setBackgroundDrawableResource(R.drawable.toolbartop); + getWindow().setBackgroundDrawable(new ColorDrawable(Color.BLACK)); if (savedInstanceState == null) { /*getSupportFragmentManager().beginTransaction() .replace(android.R.id.content, new DemoPreferenceFragment()) 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/Einstellungen/EinstellungenFragment.java index 2764d49..f9a185b 100644 --- a/app/src/main/java/de/jg_cody/Teraplex/ui/Einstellungen/EinstellungenFragment.java +++ b/app/src/main/java/de/jg_cody/Teraplex/ui/Einstellungen/EinstellungenFragment.java @@ -156,9 +156,9 @@ public class EinstellungenFragment extends Fragment { } private void showChangeBackgroundDialog() { - final String[] listItems = {"FARBE", "GRAFIK", "RESET BACKGROUND"}; + final String[] listItems = {"FARBE","GRADIENT", "GRAFIK", "RESET BACKGROUND"}; AlertDialog.Builder mBuilder = new AlertDialog.Builder(getContext()); - mBuilder.setTitle("CHOOSE LANGUAGE"); + mBuilder.setTitle("CHOOSE BACKGROUND-TYPE"); mBuilder.setSingleChoiceItems(listItems, -5, new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialogInterface, int i) { @@ -178,10 +178,25 @@ public class EinstellungenFragment extends Fragment { } catch (Exception e) { } } else if (i == 1) { + try { + Toast.makeText(getContext(), "Colorpicker", Toast.LENGTH_SHORT).show(); + final ColorPickerView picker = new ColorPickerView(getContext()); + picker.setColor(0xff12345); + AlertDialog mDialog = new AlertDialog.Builder(getContext()).setView(picker).setTitle(R.string.colorpicker).setPositiveButton(R.string.ok, new DialogInterface.OnClickListener() { + @Override + public void onClick(DialogInterface dialog, int which) { + + } + }).create(); + mDialog.getWindow().setBackgroundDrawableResource(R.drawable.button_round); + mDialog.show(); + } catch (Exception e) { + } + } else if (i == 2) { Intent a = new Intent( Intent.ACTION_PICK, android.provider.MediaStore.Images.Media.EXTERNAL_CONTENT_URI); getActivity().startActivityForResult(a, MainActivity.RESULT_LOAD_IMAGE); - } else if (i == 2) { + } else if (i == 3) { getContext().getSharedPreferences("appsettings", Context.MODE_PRIVATE).edit().remove("Background").commit(); startActivity(getActivity().getIntent()); getActivity().finish(); diff --git a/app/src/main/java/de/jg_cody/Teraplex/ui/Schlafzimmer/SchlafzimmerFragment.java b/app/src/main/java/de/jg_cody/Teraplex/ui/Schlafzimmer/SchlafzimmerFragment.java index 716453f..ea7dfbd 100644 --- a/app/src/main/java/de/jg_cody/Teraplex/ui/Schlafzimmer/SchlafzimmerFragment.java +++ b/app/src/main/java/de/jg_cody/Teraplex/ui/Schlafzimmer/SchlafzimmerFragment.java @@ -59,7 +59,7 @@ public class SchlafzimmerFragment extends Fragment { } - schlafzimmeru1aus = (Button) root.findViewById(R.id.schlafzimmeru1an); + schlafzimmeru1aus = (Button) root.findViewById(R.id.schlafzimmeru1aus); schlafzimmeru1aus.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { @@ -72,7 +72,7 @@ public class SchlafzimmerFragment extends Fragment { } }); - schlafzimmeru1an = (Button) root.findViewById(R.id.schlafzimmeru1aus); + schlafzimmeru1an = (Button) root.findViewById(R.id.schlafzimmeru1an); schlafzimmeru1an.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { @@ -85,7 +85,7 @@ public class SchlafzimmerFragment extends Fragment { } }); - schlafzimmeru2aus = (Button) root.findViewById(R.id.schlafzimmeru2an); + schlafzimmeru2aus = (Button) root.findViewById(R.id.schlafzimmeru2aus); schlafzimmeru2aus.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { @@ -98,7 +98,7 @@ public class SchlafzimmerFragment extends Fragment { } }); - schlafzimmeru2an = (Button) root.findViewById(R.id.schlafzimmeru2aus); + schlafzimmeru2an = (Button) root.findViewById(R.id.schlafzimmeru2an); schlafzimmeru2an.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { @@ -111,7 +111,7 @@ public class SchlafzimmerFragment extends Fragment { } }); - schlafzimmeru3aus = (Button) root.findViewById(R.id.schlafzimmeru3an); + schlafzimmeru3aus = (Button) root.findViewById(R.id.schlafzimmeru3aus); schlafzimmeru3aus.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { @@ -124,7 +124,7 @@ public class SchlafzimmerFragment extends Fragment { } }); - schlafzimmeru3an = (Button) root.findViewById(R.id.schlafzimmeru3aus); + schlafzimmeru3an = (Button) root.findViewById(R.id.schlafzimmeru3an); schlafzimmeru3an.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { 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 07e5923..7f6c108 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 @@ -77,16 +77,17 @@ public class HomeFragment extends Fragment { SharedPreferences t = getContext().getSharedPreferences("appsettings", Context.MODE_PRIVATE); if (user == null || ip == null) { loginButton.setVisibility(View.VISIBLE); - } - else {loginButton.setVisibility(View.INVISIBLE); + } else { + loginButton.setVisibility(View.INVISIBLE); ipInput.setVisibility(View.GONE); userInput.setVisibility(View.GONE); - passwordInput.setVisibility(View.GONE);} + passwordInput.setVisibility(View.GONE); + } loginButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { if (userInput.getText().toString().trim().length() == 0 || ipInput.getText().toString().trim().length() == 0 || passwordInput.getText().toString().trim().length() == 0) { - Toast.makeText(getContext(),getString(R.string.felder_dürfen_nicht_leer_sein), Toast.LENGTH_SHORT).show(); + Toast.makeText(getContext(), getString(R.string.felder_dürfen_nicht_leer_sein), Toast.LENGTH_SHORT).show(); } else { user = userInput.getText().toString(); password = passwordInput.getText().toString(); @@ -113,17 +114,18 @@ public class HomeFragment extends Fragment { ipInput.setVisibility(View.VISIBLE); userInput.setVisibility(View.VISIBLE); passwordInput.setVisibility(View.VISIBLE); + } else { + logoutButton.setVisibility(View.VISIBLE); } - else {logoutButton.setVisibility(View.VISIBLE);} logoutButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - getContext().getSharedPreferences("appsettings", Context.MODE_PRIVATE).edit().remove("ip").remove("user").remove("password").commit(); - startActivity(getActivity().getIntent()); - getActivity().finish(); + getContext().getSharedPreferences("appsettings", Context.MODE_PRIVATE).edit().remove("ip").remove("user").remove("password").commit(); + startActivity(getActivity().getIntent()); + getActivity().finish(); } }); - wlan_aus_Button = (Button) root.findViewById(R.id.wlan_an); + wlan_aus_Button = (Button) root.findViewById(R.id.wlan_aus); wlan_aus_Button.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { @@ -135,7 +137,7 @@ public class HomeFragment extends Fragment { } } }); - wlan_an_Button = (Button) root.findViewById(R.id.wlan_aus); + wlan_an_Button = (Button) root.findViewById(R.id.wlan_an); wlan_an_Button.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { @@ -147,7 +149,7 @@ public class HomeFragment extends Fragment { } } }); - kodiaus = (Button) root.findViewById(R.id.kodian); + kodiaus = (Button) root.findViewById(R.id.kodiaus); kodiaus.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { @@ -160,7 +162,7 @@ public class HomeFragment extends Fragment { } }); - kodian = (Button) root.findViewById(R.id.kodiaus); + kodian = (Button) root.findViewById(R.id.kodian); kodian.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { diff --git a/app/src/main/res/drawable/toolbardown.xml b/app/src/main/res/drawable/toolbardown.xml new file mode 100644 index 0000000..1c6cb8d --- /dev/null +++ b/app/src/main/res/drawable/toolbardown.xml @@ -0,0 +1,39 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 391bfec..212bf51 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -1,6 +1,5 @@ - - - - + + + + + - - + app:layout_constraintTop_toTopOf="@+id/TERAPLEX_Version" /> - \ No newline at end of file + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_einstellungen.xml b/app/src/main/res/layout/fragment_einstellungen.xml index a0ace98..8a8a897 100644 --- a/app/src/main/res/layout/fragment_einstellungen.xml +++ b/app/src/main/res/layout/fragment_einstellungen.xml @@ -116,7 +116,7 @@