From e673ca3fb0f0a52a99d96e036dcd96c8b8c365c6 Mon Sep 17 00:00:00 2001 From: JG-Cody Date: Mon, 31 May 2021 19:25:14 +0200 Subject: [PATCH] added Colorpicker --- app/build.gradle | 1 + .../Einstellungen/EinstellungenFragment.java | 27 ++++ .../res/layout/fragment_einstellungen.xml | 12 +- app/src/main/res/layout/fragment_kueche.xml | 119 +----------------- app/src/main/res/values/strings.xml | 3 + gradle/wrapper/gradle-wrapper.properties | 1 + 6 files changed, 46 insertions(+), 117 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 5b776d0..e6f6f0e 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -44,6 +44,7 @@ dependencies { androidTestImplementation 'androidx.test.ext:junit:1.1.2' androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0' implementation fileTree(include: ['*.jar'], dir: 'libs') + implementation 'com.github.martin-stone:hsv-alpha-color-picker-android:3.0.1' } repositories { maven { url "https://jitpack.io" } 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 6fa77a1..6676545 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 @@ -1,10 +1,14 @@ package de.jg_cody.Teraplex.ui.Einstellungen; +import android.app.AlertDialog; +import android.content.DialogInterface; import android.os.Bundle; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; +import android.widget.Button; import android.widget.TextView; +import android.widget.Toast; import androidx.annotation.NonNull; import androidx.annotation.Nullable; @@ -12,11 +16,14 @@ import androidx.fragment.app.Fragment; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; +import com.rarepebble.colorpicker.ColorPickerView; + import de.jg_cody.Teraplex.R; public class EinstellungenFragment extends Fragment { private EinstellungenViewModel einstellungenViewModel; + Button button_colorpicker; public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { @@ -30,6 +37,26 @@ public class EinstellungenFragment extends Fragment { textView.setText(s); } }); + button_colorpicker = (Button) root.findViewById(R.id.button_colorpicker); + button_colorpicker.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + + try { + Toast.makeText(getContext(), "Colorpicker", Toast.LENGTH_SHORT).show(); + final ColorPickerView picker = new ColorPickerView(getContext()); + picker.setColor(0xff12345); + 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) { + + } + }).show(); + } catch (Exception e) { + } + } + }); + return root; } } \ 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 dba8de1..d427e14 100644 --- a/app/src/main/res/layout/fragment_einstellungen.xml +++ b/app/src/main/res/layout/fragment_einstellungen.xml @@ -38,7 +38,7 @@ android:id="@+id/background" android:layout_width="193dp" android:layout_height="33dp" - android:layout_marginTop="50dp" + android:layout_marginTop="100dp" android:gravity="center_horizontal" android:text="HINTERGRUND" android:textAlignment="center" @@ -137,9 +137,19 @@ android:layout_height="wrap_content" android:text="RESET" app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintHorizontal_bias="0.498" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/reset_settings" /> +