Code bereinigt

Texte in Strings geschrieben
Eingangsanimation überarbeitet
This commit is contained in:
JG-Cody 2021-06-02 10:19:46 +02:00
parent ba63df8864
commit c7201049c5
19 changed files with 103 additions and 176 deletions

View File

@ -4,12 +4,9 @@ import android.os.Bundle;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.widget.TextView;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.fragment.app.Fragment; import androidx.fragment.app.Fragment;
import androidx.lifecycle.Observer;
import androidx.lifecycle.ViewModelProvider; import androidx.lifecycle.ViewModelProvider;
import de.jg_cody.Teraplex.R; import de.jg_cody.Teraplex.R;
@ -23,13 +20,7 @@ public class CreditsFragment extends Fragment {
creditsViewModel = creditsViewModel =
new ViewModelProvider(this).get(CreditsViewModel.class); new ViewModelProvider(this).get(CreditsViewModel.class);
View root = inflater.inflate(R.layout.fragment_credits, container, false); View root = inflater.inflate(R.layout.fragment_credits, container, false);
final TextView textView = root.findViewById(R.id.text_toilette);
creditsViewModel.getText().observe(getViewLifecycleOwner(), new Observer<String>() {
@Override
public void onChanged(@Nullable String s) {
textView.setText(s);
}
});
return root; return root;
} }
} }

View File

@ -1,6 +1,5 @@
package de.jg_cody.Teraplex.ui.Credits; package de.jg_cody.Teraplex.ui.Credits;
import androidx.lifecycle.LiveData;
import androidx.lifecycle.MutableLiveData; import androidx.lifecycle.MutableLiveData;
import androidx.lifecycle.ViewModel; import androidx.lifecycle.ViewModel;
@ -8,12 +7,5 @@ public class CreditsViewModel extends ViewModel {
private MutableLiveData<String> mText; private MutableLiveData<String> mText;
public CreditsViewModel() {
mText = new MutableLiveData<>();
mText.setValue("CREDITS");
}
public LiveData<String> getText() {
return mText;
}
} }

View File

@ -9,13 +9,10 @@ import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.widget.Button; import android.widget.Button;
import android.widget.TextView;
import android.widget.Toast; import android.widget.Toast;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.fragment.app.Fragment; import androidx.fragment.app.Fragment;
import androidx.lifecycle.Observer;
import androidx.lifecycle.ViewModelProvider; import androidx.lifecycle.ViewModelProvider;
import com.rarepebble.colorpicker.ColorPickerView; import com.rarepebble.colorpicker.ColorPickerView;
@ -36,13 +33,6 @@ public class EinstellungenFragment extends Fragment {
einstellungenViewModel = einstellungenViewModel =
new ViewModelProvider(this).get(EinstellungenViewModel.class); new ViewModelProvider(this).get(EinstellungenViewModel.class);
View root = inflater.inflate(R.layout.fragment_einstellungen, container, false); View root = inflater.inflate(R.layout.fragment_einstellungen, container, false);
final TextView textView = root.findViewById(R.id.text_einstellungen);
einstellungenViewModel.getText().observe(getViewLifecycleOwner(), new Observer<String>() {
@Override
public void onChanged(@Nullable String s) {
textView.setText(s);
}
});
button_colorpicker = (Button) root.findViewById(R.id.button_colorpicker); button_colorpicker = (Button) root.findViewById(R.id.button_colorpicker);
button_colorpicker.setOnClickListener(new View.OnClickListener() { button_colorpicker.setOnClickListener(new View.OnClickListener() {
@Override @Override

View File

@ -1,6 +1,5 @@
package de.jg_cody.Teraplex.ui.Einstellungen; package de.jg_cody.Teraplex.ui.Einstellungen;
import androidx.lifecycle.LiveData;
import androidx.lifecycle.MutableLiveData; import androidx.lifecycle.MutableLiveData;
import androidx.lifecycle.ViewModel; import androidx.lifecycle.ViewModel;
@ -8,12 +7,5 @@ public class EinstellungenViewModel extends ViewModel {
private MutableLiveData<String> mText; private MutableLiveData<String> mText;
public EinstellungenViewModel() {
mText = new MutableLiveData<>();
mText.setValue("EINSTELLUNGEN");
}
public LiveData<String> getText() {
return mText;
}
} }

View File

@ -8,13 +8,10 @@ import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.widget.Button; import android.widget.Button;
import android.widget.EditText; import android.widget.EditText;
import android.widget.TextView;
import android.widget.Toast; import android.widget.Toast;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.fragment.app.Fragment; import androidx.fragment.app.Fragment;
import androidx.lifecycle.Observer;
import androidx.lifecycle.ViewModelProvider; import androidx.lifecycle.ViewModelProvider;
import de.jg_cody.Teraplex.R; import de.jg_cody.Teraplex.R;
@ -40,13 +37,6 @@ public class KonsoleFragment extends Fragment {
konsoleViewModel = konsoleViewModel =
new ViewModelProvider(this).get(KonsoleViewModel.class); new ViewModelProvider(this).get(KonsoleViewModel.class);
View root = inflater.inflate(R.layout.fragment_konsole, container, false); View root = inflater.inflate(R.layout.fragment_konsole, container, false);
final TextView textView = root.findViewById(R.id.text_konsole);
konsoleViewModel.getText().observe(getViewLifecycleOwner(), new Observer<String>() {
@Override
public void onChanged(@Nullable String s) {
textView.setText(s);
}
});
befehlInput = (EditText) root.findViewById(R.id.befehlInput); befehlInput = (EditText) root.findViewById(R.id.befehlInput);
SendCommandButton = (Button) root.findViewById(R.id.SendCommandButton); SendCommandButton = (Button) root.findViewById(R.id.SendCommandButton);
SendCommandButton.setOnClickListener(new View.OnClickListener() { SendCommandButton.setOnClickListener(new View.OnClickListener() {

View File

@ -1,19 +1,8 @@
package de.jg_cody.Teraplex.ui.Konsole; package de.jg_cody.Teraplex.ui.Konsole;
import androidx.lifecycle.LiveData;
import androidx.lifecycle.MutableLiveData;
import androidx.lifecycle.ViewModel; import androidx.lifecycle.ViewModel;
public class KonsoleViewModel extends ViewModel { public class KonsoleViewModel extends ViewModel {
private MutableLiveData<String> mText;
public KonsoleViewModel() {
mText = new MutableLiveData<>();
mText.setValue("KONSOLE");
}
public LiveData<String> getText() {
return mText;
}
} }

View File

@ -10,7 +10,7 @@ public class HomeViewModel extends ViewModel {
public HomeViewModel() { public HomeViewModel() {
mText = new MutableLiveData<>(); mText = new MutableLiveData<>();
mText.setValue("Welcome to your HOMEAUTOMATION-APP"); mText.setValue("R.string.Welcome_to_your_HOMEAUTOMATION_APP");
} }

View File

@ -4,13 +4,10 @@ import android.os.Bundle;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.widget.TextView;
import android.widget.TimePicker; import android.widget.TimePicker;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.fragment.app.Fragment; import androidx.fragment.app.Fragment;
import androidx.lifecycle.Observer;
import androidx.lifecycle.ViewModelProvider; import androidx.lifecycle.ViewModelProvider;
import de.jg_cody.Teraplex.R; import de.jg_cody.Teraplex.R;
@ -25,13 +22,6 @@ public class ZeitsteuerungFragment extends Fragment {
zeitsteuerungViewModel = zeitsteuerungViewModel =
new ViewModelProvider(this).get(ZeitsteuerungViewModel.class); new ViewModelProvider(this).get(ZeitsteuerungViewModel.class);
View root = inflater.inflate(R.layout.fragment_zeitsteuerung, container, false); View root = inflater.inflate(R.layout.fragment_zeitsteuerung, container, false);
final TextView textView = root.findViewById(R.id.text_zeitsteuerung);
zeitsteuerungViewModel.getText().observe(getViewLifecycleOwner(), new Observer<String>() {
@Override
public void onChanged(@Nullable String s) {
textView.setText(s);
}
});
TimePicker timePicker = (TimePicker) root.findViewById(R.id.timePicker); TimePicker timePicker = (TimePicker) root.findViewById(R.id.timePicker);
timePicker.setIs24HourView(true); timePicker.setIs24HourView(true);
return root; return root;

View File

@ -1,19 +1,8 @@
package de.jg_cody.Teraplex.ui.zeitsteuerung; package de.jg_cody.Teraplex.ui.zeitsteuerung;
import androidx.lifecycle.LiveData;
import androidx.lifecycle.MutableLiveData;
import androidx.lifecycle.ViewModel; import androidx.lifecycle.ViewModel;
public class ZeitsteuerungViewModel extends ViewModel { public class ZeitsteuerungViewModel extends ViewModel {
private MutableLiveData<String> mText;
public ZeitsteuerungViewModel() {
mText = new MutableLiveData<>();
mText.setValue("WOHNZIMMER");
}
public LiveData<String> getText() {
return mText;
}
} }

View File

@ -101,20 +101,6 @@
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/supportedby" /> app:layout_constraintTop_toBottomOf="@+id/supportedby" />
<TextView
android:id="@+id/text_toilette"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:layout_marginEnd="8dp"
android:gravity="center_horizontal"
android:textAlignment="center"
android:textColor="#FFFFFF"
android:textSize="20sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" />
<ImageView <ImageView
android:id="@+id/imageView3" android:id="@+id/imageView3"
android:layout_width="117dp" android:layout_width="117dp"

View File

@ -15,24 +15,10 @@
android:src="@drawable/background" android:src="@drawable/background"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="1.0" app:layout_constraintHorizontal_bias="0.727"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="1.0" /> app:layout_constraintVertical_bias="0.0" />
<TextView
android:id="@+id/text_einstellungen"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:layout_marginEnd="8dp"
android:textAlignment="center"
android:textColor="#FFFFFF"
android:textSize="20sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
android:gravity="center_horizontal" />
<TextView <TextView
android:id="@+id/background" android:id="@+id/background"
@ -40,7 +26,7 @@
android:layout_height="33dp" android:layout_height="33dp"
android:layout_marginTop="50dp" android:layout_marginTop="50dp"
android:gravity="center_horizontal" android:gravity="center_horizontal"
android:text="HINTERGRUND" android:text="@string/hintergrund"
android:textAlignment="center" android:textAlignment="center"
android:textColor="#FFFFFF" android:textColor="#FFFFFF"
android:textSize="20dp" android:textSize="20dp"
@ -54,7 +40,7 @@
android:layout_height="33dp" android:layout_height="33dp"
android:layout_marginTop="75dp" android:layout_marginTop="75dp"
android:gravity="center_horizontal" android:gravity="center_horizontal"
android:text="FARBEN" android:text="@string/farben"
android:textAlignment="center" android:textAlignment="center"
android:textColor="#FFFFFF" android:textColor="#FFFFFF"
android:textSize="20dp" android:textSize="20dp"
@ -67,7 +53,7 @@
android:layout_width="193dp" android:layout_width="193dp"
android:layout_height="33dp" android:layout_height="33dp"
android:gravity="center_horizontal" android:gravity="center_horizontal"
android:text="SPRACHE" android:text="@string/sprache"
android:textAlignment="center" android:textAlignment="center"
android:textColor="#FFFFFF" android:textColor="#FFFFFF"
android:textSize="20dp" android:textSize="20dp"
@ -81,7 +67,7 @@
android:layout_width="225dp" android:layout_width="225dp"
android:layout_height="51dp" android:layout_height="51dp"
android:gravity="center_horizontal" android:gravity="center_horizontal"
android:text="EINSTELLUNGEN ZURÜCKSETZEN" android:text="@string/einstellungen_zurücksetzen"
android:textAlignment="center" android:textAlignment="center"
android:textColor="#FFFFFF" android:textColor="#FFFFFF"
android:textSize="20dp" android:textSize="20dp"
@ -96,7 +82,7 @@
android:layout_height="31dp" android:layout_height="31dp"
android:layout_marginTop="50dp" android:layout_marginTop="50dp"
android:gravity="center_horizontal" android:gravity="center_horizontal"
android:text="FARBSCHEMA" android:text="@string/farbschema"
android:textAlignment="center" android:textAlignment="center"
android:textColor="#FFFFFF" android:textColor="#FFFFFF"
android:textSize="20dp" android:textSize="20dp"
@ -108,7 +94,7 @@
android:id="@+id/button_reset" android:id="@+id/button_reset"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="RESET" android:text="@string/button_zurücksetzen"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.498" app:layout_constraintHorizontal_bias="0.498"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
@ -127,7 +113,7 @@
android:id="@+id/button_language" android:id="@+id/button_language"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="SPRACHE" android:text="@string/sprache"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/sprache" /> app:layout_constraintTop_toBottomOf="@+id/sprache" />
@ -136,7 +122,7 @@
android:id="@+id/button_pickimage2" android:id="@+id/button_pickimage2"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="GRAFIK WÄHLEN" android:text="@string/button_hintergrund_wählen"
app:layout_constraintBottom_toTopOf="@+id/sprache" app:layout_constraintBottom_toTopOf="@+id/sprache"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.498" app:layout_constraintHorizontal_bias="0.498"
@ -150,8 +136,8 @@
android:layout_marginStart="75dp" android:layout_marginStart="75dp"
android:layout_marginLeft="75dp" android:layout_marginLeft="75dp"
android:layout_marginTop="10dp" android:layout_marginTop="10dp"
android:text="GREEN" android:text="@string/grün"
app:backgroundTint="#00FF73" app:backgroundTint="#00FF0A"
app:layout_constraintEnd_toStartOf="@+id/button_reset3" app:layout_constraintEnd_toStartOf="@+id/button_reset3"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/button_reset4" /> app:layout_constraintTop_toBottomOf="@+id/button_reset4" />
@ -163,9 +149,9 @@
android:layout_marginTop="10dp" android:layout_marginTop="10dp"
android:layout_marginEnd="75dp" android:layout_marginEnd="75dp"
android:layout_marginRight="75dp" android:layout_marginRight="75dp"
android:text="DARK" android:text="@string/gelb"
android:textColor="#FFFFFF" android:textColor="#000000"
app:backgroundTint="#001932" app:backgroundTint="#FFE500"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@+id/button_reset2" app:layout_constraintStart_toEndOf="@+id/button_reset2"
app:layout_constraintTop_toBottomOf="@+id/button_reset6" /> app:layout_constraintTop_toBottomOf="@+id/button_reset6" />
@ -176,7 +162,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginEnd="75dp" android:layout_marginEnd="75dp"
android:layout_marginRight="75dp" android:layout_marginRight="75dp"
android:text="RED" android:text="@string/rot"
app:backgroundTint="#FF0000" app:backgroundTint="#FF0000"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@+id/button_reset4" app:layout_constraintStart_toEndOf="@+id/button_reset4"
@ -188,8 +174,8 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="75dp" android:layout_marginStart="75dp"
android:layout_marginLeft="75dp" android:layout_marginLeft="75dp"
android:text="BLUE" android:text="@string/blau"
app:backgroundTint="#00A6FF" app:backgroundTint="#008EFF"
app:layout_constraintEnd_toStartOf="@+id/button_reset6" app:layout_constraintEnd_toStartOf="@+id/button_reset6"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/nightmode" /> app:layout_constraintTop_toBottomOf="@+id/nightmode" />

View File

@ -97,7 +97,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:hapticFeedbackEnabled="true" android:hapticFeedbackEnabled="true"
android:text="Login" android:text="@string/login"
app:icon="@drawable/login_24px" app:icon="@drawable/login_24px"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
@ -108,7 +108,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:hapticFeedbackEnabled="true" android:hapticFeedbackEnabled="true"
android:text="AN" android:text="@string/an"
app:icon="@drawable/signal_wifi_statusbar_4_bar_24px" app:icon="@drawable/signal_wifi_statusbar_4_bar_24px"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@+id/wlan_aus" app:layout_constraintStart_toEndOf="@+id/wlan_aus"
@ -119,7 +119,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:hapticFeedbackEnabled="true" android:hapticFeedbackEnabled="true"
android:text="AN" android:text="@string/an"
app:icon="@drawable/kodi" app:icon="@drawable/kodi"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.483" app:layout_constraintHorizontal_bias="0.483"
@ -131,7 +131,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:hapticFeedbackEnabled="true" android:hapticFeedbackEnabled="true"
android:text="AUS" android:text="@string/aus"
app:icon="@drawable/signal_wifi_off_24px" app:icon="@drawable/signal_wifi_off_24px"
app:layout_constraintEnd_toStartOf="@+id/wlan_an" app:layout_constraintEnd_toStartOf="@+id/wlan_an"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
@ -142,7 +142,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:hapticFeedbackEnabled="true" android:hapticFeedbackEnabled="true"
android:text="AUS" android:text="@string/aus"
app:icon="@drawable/kodi_aus_1_" app:icon="@drawable/kodi_aus_1_"
app:layout_constraintEnd_toStartOf="@+id/wlan_an" app:layout_constraintEnd_toStartOf="@+id/wlan_an"
app:layout_constraintHorizontal_bias="0.496" app:layout_constraintHorizontal_bias="0.496"
@ -154,16 +154,16 @@
android:layout_width="376dp" android:layout_width="376dp"
android:layout_height="28dp" android:layout_height="28dp"
android:gravity="center_horizontal" android:gravity="center_horizontal"
android:text="WLAN" android:text="@string/wlan"
android:textAlignment="center" android:textAlignment="center"
android:textColor="#FFFFFF" android:textColor="#FFFFFF"
android:textSize="20sp" android:textSize="20sp"
app:layout_constraintBottom_toTopOf="@+id/textView7" app:layout_constraintBottom_toTopOf="@+id/textView7"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.542" app:layout_constraintHorizontal_bias="0.485"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/loginButton" app:layout_constraintTop_toBottomOf="@+id/loginButton"
app:layout_constraintVertical_bias="0.33" /> app:layout_constraintVertical_bias="0.333" />
<TextView <TextView
android:id="@+id/textView7" android:id="@+id/textView7"
@ -171,7 +171,7 @@
android:layout_height="28dp" android:layout_height="28dp"
android:layout_marginBottom="116dp" android:layout_marginBottom="116dp"
android:gravity="center_horizontal" android:gravity="center_horizontal"
android:text="KODI" android:text="@string/kodi"
android:textAlignment="center" android:textAlignment="center"
android:textColor="#FFFFFF" android:textColor="#FFFFFF"
android:textSize="20sp" android:textSize="20sp"

View File

@ -20,26 +20,12 @@
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.0" /> app:layout_constraintVertical_bias="0.0" />
<TextView
android:id="@+id/text_konsole"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:layout_marginEnd="8dp"
android:gravity="center_horizontal"
android:textAlignment="center"
android:textColor="#FFFFFF"
android:textSize="20sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" />
<Button <Button
android:id="@+id/shutdown" android:id="@+id/shutdown"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:hapticFeedbackEnabled="true" android:hapticFeedbackEnabled="true"
android:text="SHUTDOWN" android:text="@string/shutdown"
app:icon="@drawable/power_settings_new_24px" app:icon="@drawable/power_settings_new_24px"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@+id/reboot" app:layout_constraintStart_toEndOf="@+id/reboot"
@ -50,7 +36,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:hapticFeedbackEnabled="true" android:hapticFeedbackEnabled="true"
android:text="REBOOT" android:text="@string/reboot"
app:icon="@drawable/restart_alt_24px" app:icon="@drawable/restart_alt_24px"
app:layout_constraintEnd_toStartOf="@+id/shutdown" app:layout_constraintEnd_toStartOf="@+id/shutdown"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
@ -76,7 +62,7 @@
android:layout_width="253dp" android:layout_width="253dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="center_horizontal" android:gravity="center_horizontal"
android:text="KONSOLE" android:text="@string/konsole"
android:textAlignment="center" android:textAlignment="center"
android:textColor="#FFFFFF" android:textColor="#FFFFFF"
android:textSize="20sp" android:textSize="20sp"
@ -90,7 +76,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="100dp" android:layout_marginTop="100dp"
android:gravity="center_horizontal" android:gravity="center_horizontal"
android:text="SERVERBEFEHLE" android:text="@string/serverbefehle"
android:textAlignment="center" android:textAlignment="center"
android:textColor="#FFFFFF" android:textColor="#FFFFFF"
android:textSize="20sp" android:textSize="20sp"
@ -103,7 +89,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:hapticFeedbackEnabled="true" android:hapticFeedbackEnabled="true"
android:text="SEND COMMAND" android:text="@string/button_send_command"
app:icon="@drawable/send_24px" app:icon="@drawable/send_24px"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"

View File

@ -39,7 +39,7 @@
android:layout_width="253dp" android:layout_width="253dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="center_horizontal" android:gravity="center_horizontal"
android:text="KOMMANDO" android:text="@string/befehl"
android:textAlignment="center" android:textAlignment="center"
android:textColor="#FFFFFF" android:textColor="#FFFFFF"
android:textSize="20sp" android:textSize="20sp"
@ -54,7 +54,7 @@
android:layout_width="253dp" android:layout_width="253dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="center_horizontal" android:gravity="center_horizontal"
android:text="ZEITGESTEUERTE KOMMANDOS" android:text="@string/zeitgesteuerte_kommandos"
android:textAlignment="center" android:textAlignment="center"
android:textColor="#FFFFFF" android:textColor="#FFFFFF"
android:textSize="20sp" android:textSize="20sp"
@ -68,26 +68,12 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:hapticFeedbackEnabled="true" android:hapticFeedbackEnabled="true"
android:text="SEND TIMED COMMAND" android:text="@string/send_timed_command"
app:icon="@drawable/send_24px" app:icon="@drawable/send_24px"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/befehlInput2" /> app:layout_constraintTop_toBottomOf="@+id/befehlInput2" />
<TextView
android:id="@+id/text_zeitsteuerung"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:layout_marginEnd="8dp"
android:gravity="center_horizontal"
android:textAlignment="center"
android:textColor="#FFFFFF"
android:textSize="20sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" />
<TimePicker <TimePicker
android:id="@+id/timePicker" android:id="@+id/timePicker"
android:layout_width="wrap_content" android:layout_width="wrap_content"

View File

@ -25,7 +25,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingTop="@dimen/nav_header_vertical_spacing" android:paddingTop="@dimen/nav_header_vertical_spacing"
android:text="HOMEAUTOMATION" android:text="@string/ssh_remote"
android:textAppearance="@style/TextAppearance.AppCompat.Body1" /> android:textAppearance="@style/TextAppearance.AppCompat.Body1" />
<TextView <TextView

Binary file not shown.

View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources> <resources>
<string name="app_name">Teraplex</string> <string name="app_name">TERAPLEX</string>
</resources> </resources>

View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources> <resources>
<string name="app_name">Teraplex</string> <string name="app_name">TERAPLEX</string>
<string name="navigation_drawer_open">NAVIGATION ÖFFNEN</string> <string name="navigation_drawer_open">NAVIGATION ÖFFNEN</string>
<string name="navigation_drawer_close">NAVIGATION SCHLIESSEN</string> <string name="navigation_drawer_close">NAVIGATION SCHLIESSEN</string>
<string name="nav_header_title">ANDROID STUDIO</string> <string name="nav_header_title">ANDROID STUDIO</string>
@ -10,11 +10,11 @@
<string name="menu_home">HOME</string> <string name="menu_home">HOME</string>
<string name="menu_konsole">KONSOLE</string> <string name="menu_konsole">KONSOLE</string>
<string name="menu_kueche">KÜCHE</string> <string name="menu_kueche">KÜCHE</string>
<string name="menu_zeitsteuerung">AUSLOGGEN</string> <string name="menu_zeitsteuerung">ZEITSTEUERUNG</string>
<string name="menu_schlafzimmer">SCHLAFZIMMER</string> <string name="menu_schlafzimmer">SCHLAFZIMMER</string>
<string name="menu_flur">FLUR</string> <string name="menu_flur">FLUR</string>
<string name="menu_küche">KÜCHE</string> <string name="menu_küche">KÜCHE</string>
<string name="menu_einstellungen">EINSTELLUNG</string> <string name="menu_einstellungen">EINSTELLUNGEN</string>
<string name="menu_frage">FRAGE</string> <string name="menu_frage">FRAGE</string>
<string name="menu_credits">CREDITS</string> <string name="menu_credits">CREDITS</string>
<string name="menu_logout">AUSLOGGEN</string> <string name="menu_logout">AUSLOGGEN</string>
@ -23,4 +23,30 @@
<string name="colorpicker">WÄHLE DEINE FARBE</string> <string name="colorpicker">WÄHLE DEINE FARBE</string>
<string name="ok">OK</string> <string name="ok">OK</string>
<string name="action_logout">AUSLOGGEN</string> <string name="action_logout">AUSLOGGEN</string>
<string name="Welcome_to_your_HOMEAUTOMATION_APP">Willkommen in ihrer Homeautomation-App</string>
<string name="login">EINLOGGEN</string>
<string name="wlan">WLAN</string>
<string name="kodi">KODI</string>
<string name="aus">AUS</string>
<string name="an">AN</string>
<string name="konsole">KONSOLE</string>
<string name="button_send_command">BEFEHL SENDEN</string>
<string name="serverbefehle">SERVERBEFEHLE</string>
<string name="reboot">NEUSTARTEN</string>
<string name="shutdown">HERUNTERFAHREN</string>
<string name="zeitgesteuerte_kommandos">ZEITGESTEUERTE KOMMANDOS</string>
<string name="befehl">BEFEHL</string>
<string name="send_timed_command">ZEITGESTEUERTER BEFEHL</string>
<string name="farben">FARBEN</string>
<string name="hintergrund">HINTERGRUND</string>
<string name="sprache">SPRACHE</string>
<string name="einstellungen_zurücksetzen">EINSTELLUNGEN ZURÜCKSETZEN</string>
<string name="farbschema">FARBSCHEMA</string>
<string name="blau">BLAU</string>
<string name="rot">ROT</string>
<string name="grün">GRÜN</string>
<string name="gelb">GELB</string>
<string name="button_zurücksetzen">ZURÜCKSETZEN</string>
<string name="button_hintergrund_wählen">HINTERGRUND WÄHLEN</string>
<string name="ssh_remote">SSH-FERNBEDIENUNG</string>
</resources> </resources>

View File

@ -1,5 +1,5 @@
<resources> <resources>
<string name="app_name">Teraplex</string> <string name="app_name">TERAPLEX</string>
<string name="navigation_drawer_open">Open navigation drawer</string> <string name="navigation_drawer_open">Open navigation drawer</string>
<string name="navigation_drawer_close">Close navigation drawer</string> <string name="navigation_drawer_close">Close navigation drawer</string>
<string name="nav_header_title">Android Studio</string> <string name="nav_header_title">Android Studio</string>
@ -10,10 +10,44 @@
<string name="SSH_Password">Navigation header</string> <string name="SSH_Password">Navigation header</string>
<string name="SSH_Command">Navigation header</string> <string name="SSH_Command">Navigation header</string>
<string name="action_logout">logout</string> <string name="action_logout">logout</string>
<string name="ssh_remote">SSH-REMOTE</string>
//home
<string name="Welcome_to_your_HOMEAUTOMATION_APP">Welcome to your HOMEAUTOMATION-APP</string>
<string name="login_ipadresse">IP-ADDRESS</string> <string name="login_ipadresse">IP-ADDRESS</string>
<string name="login_benutzername">USERNAME</string> <string name="login_benutzername">USERNAME</string>
<string name="login_passwort">PASSWORD</string> <string name="login_passwort">PASSWORD</string>
<string name="login">LOGIN</string>
<string name="wlan">WLAN</string>
<string name="kodi">KODI</string>
<string name="aus">OFF</string>
<string name="an">ON</string>
//konsole
<string name="konsole">CONSOLE</string>
<string name="button_send_command">SEND COMMAND</string>
<string name="serverbefehle">SERVERCOMMANDS</string>
<string name="reboot">REBOOT</string>
<string name="shutdown">SHUTDOWN</string>
//zeitgesteuerte kommandos
<string name="zeitgesteuerte_kommandos">TIMED COMMANDS</string>
<string name="befehl">COMMAND</string>
<string name="send_timed_command">SET TIMED COMMAND</string>
//settings
<string name="farben">COLORS</string>
<string name="hintergrund">BACKGROUND</string>
<string name="button_hintergrund_wählen">CHOOSE BACKGROUND</string>
<string name="sprache">LANGUAGE</string>
<string name="einstellungen_zurücksetzen">RESET SETTINGS</string>
<string name="button_zurücksetzen">RESET</string>
<string name="farbschema">COLORSCHEME</string>
<string name="blau">BLUE</string>
<string name="rot">RED</string>
<string name="grün">GREEN</string>
<string name="gelb">YELLOW</string>
<string name="menu_home">HOME</string> <string name="menu_home">HOME</string>
<string name="menu_konsole">CONSOLE</string> <string name="menu_konsole">CONSOLE</string>