some more bugfixes and translation
This commit is contained in:
parent
d129f43c33
commit
f2af9e8ab4
@ -43,9 +43,10 @@
|
|||||||
android:src="@drawable/backgroundoverlay"
|
android:src="@drawable/backgroundoverlay"
|
||||||
app:layout_constraintBottom_toBottomOf="@+id/button_reset"
|
app:layout_constraintBottom_toBottomOf="@+id/button_reset"
|
||||||
app:layout_constraintEnd_toEndOf="@+id/button_theme_red_blue"
|
app:layout_constraintEnd_toEndOf="@+id/button_theme_red_blue"
|
||||||
|
app:layout_constraintHorizontal_bias="1.0"
|
||||||
app:layout_constraintStart_toStartOf="@+id/themes"
|
app:layout_constraintStart_toStartOf="@+id/themes"
|
||||||
app:layout_constraintTop_toTopOf="@+id/button_theme_red_blue"
|
app:layout_constraintTop_toTopOf="@+id/button_theme_red_blue"
|
||||||
app:layout_constraintVertical_bias="0.0" />
|
app:layout_constraintVertical_bias="1.0" />
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
android:id="@+id/background"
|
android:id="@+id/background"
|
||||||
@ -62,8 +63,10 @@
|
|||||||
android:textSize="18sp"
|
android:textSize="18sp"
|
||||||
app:layout_constraintBottom_toTopOf="@+id/divider"
|
app:layout_constraintBottom_toTopOf="@+id/divider"
|
||||||
app:layout_constraintEnd_toStartOf="@+id/button_pickimage"
|
app:layout_constraintEnd_toStartOf="@+id/button_pickimage"
|
||||||
|
app:layout_constraintHorizontal_bias="0.0"
|
||||||
app:layout_constraintStart_toStartOf="parent"
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
app:layout_constraintTop_toTopOf="@+id/button_pickimage" />
|
app:layout_constraintTop_toTopOf="@+id/button_pickimage"
|
||||||
|
app:layout_constraintVertical_bias="0.45" />
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
android:id="@+id/themes"
|
android:id="@+id/themes"
|
||||||
@ -74,7 +77,7 @@
|
|||||||
android:layout_marginEnd="10dp"
|
android:layout_marginEnd="10dp"
|
||||||
android:layout_marginRight="10dp"
|
android:layout_marginRight="10dp"
|
||||||
android:gravity="center_horizontal|left"
|
android:gravity="center_horizontal|left"
|
||||||
android:text="@string/themes"
|
android:text="@string/color_scheme"
|
||||||
android:textAlignment="center"
|
android:textAlignment="center"
|
||||||
android:textColor="@color/mtrl_btn_text_color_selector"
|
android:textColor="@color/mtrl_btn_text_color_selector"
|
||||||
android:textSize="18sp"
|
android:textSize="18sp"
|
||||||
@ -137,7 +140,7 @@
|
|||||||
android:id="@+id/button_theme_red_blue"
|
android:id="@+id/button_theme_red_blue"
|
||||||
android:layout_width="140dp"
|
android:layout_width="140dp"
|
||||||
android:layout_height="55dp"
|
android:layout_height="55dp"
|
||||||
android:layout_marginTop="125dp"
|
android:layout_marginTop="100dp"
|
||||||
android:layout_marginEnd="35dp"
|
android:layout_marginEnd="35dp"
|
||||||
android:layout_marginRight="35dp"
|
android:layout_marginRight="35dp"
|
||||||
android:background="@drawable/button_theme_red_blue"
|
android:background="@drawable/button_theme_red_blue"
|
||||||
@ -264,7 +267,7 @@
|
|||||||
<Space
|
<Space
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginTop="75dp"
|
android:layout_marginTop="50dp"
|
||||||
app:layout_constraintBottom_toBottomOf="parent"
|
app:layout_constraintBottom_toBottomOf="parent"
|
||||||
app:layout_constraintEnd_toEndOf="parent"
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
app:layout_constraintStart_toStartOf="parent"
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
|
@ -30,7 +30,7 @@
|
|||||||
<item
|
<item
|
||||||
android:id="@+id/app_bar_switch"
|
android:id="@+id/app_bar_switch"
|
||||||
android:icon="@drawable/mode_edit_black_24dp"
|
android:icon="@drawable/mode_edit_black_24dp"
|
||||||
android:title="BEARBEITUNGSMODUS"
|
android:title="@strings/edit_mode"
|
||||||
app:actionLayout="@layout/switch_item"
|
app:actionLayout="@layout/switch_item"
|
||||||
app:showAsAction="always" />
|
app:showAsAction="always" />
|
||||||
<item
|
<item
|
||||||
|
@ -51,7 +51,7 @@
|
|||||||
<string name="menu_about">ÜBER</string>
|
<string name="menu_about">ÜBER</string>
|
||||||
<string name="login_saved">LOGIN_DATEN GESPEICHERT</string>
|
<string name="login_saved">LOGIN_DATEN GESPEICHERT</string>
|
||||||
<string name="felder_dürfen_nicht_leer_sein">FELDER DÜRFEN NICHT LEER SEIN!</string>
|
<string name="felder_dürfen_nicht_leer_sein">FELDER DÜRFEN NICHT LEER SEIN!</string>
|
||||||
<string name="themes">FARBSCHEMA</string>
|
<string name="color_scheme">FARBSCHEMA</string>
|
||||||
<string name="red_blue">ROT BLAU</string>
|
<string name="red_blue">ROT BLAU</string>
|
||||||
<string name="green_yellow">GRÜN GELB</string>
|
<string name="green_yellow">GRÜN GELB</string>
|
||||||
<string name="orange_turquoise">ORANGE TÜRKIS</string>
|
<string name="orange_turquoise">ORANGE TÜRKIS</string>
|
||||||
@ -65,4 +65,5 @@
|
|||||||
<string name="cooperation">IN KOOPERATION MIT</string>
|
<string name="cooperation">IN KOOPERATION MIT</string>
|
||||||
<string name="menu_add">TAB HINZUFÜGEN</string>
|
<string name="menu_add">TAB HINZUFÜGEN</string>
|
||||||
<string name="menu_remove">TABS ENTFERNEN</string>
|
<string name="menu_remove">TABS ENTFERNEN</string>
|
||||||
|
<string name="editmode">BEARBEITEN</string>
|
||||||
</resources>
|
</resources>
|
@ -6,6 +6,7 @@
|
|||||||
<string name="nav_header_subtitle">android.studio@android.com</string>
|
<string name="nav_header_subtitle">android.studio@android.com</string>
|
||||||
<string name="action_logout">LOGOUT</string>
|
<string name="action_logout">LOGOUT</string>
|
||||||
<string name="ssh_remote">SSH-REMOTE</string>
|
<string name="ssh_remote">SSH-REMOTE</string>
|
||||||
|
<string name="editmode">EDITMODE</string>
|
||||||
|
|
||||||
//home
|
//home
|
||||||
<string name="Welcome_to_your_HOMEAUTOMATION_APP">WELCOME TO TERAPLEX</string>
|
<string name="Welcome_to_your_HOMEAUTOMATION_APP">WELCOME TO TERAPLEX</string>
|
||||||
@ -42,7 +43,7 @@
|
|||||||
<string name="language">LANGUAGE</string>
|
<string name="language">LANGUAGE</string>
|
||||||
<string name="reset_settings">RESET SETTINGS</string>
|
<string name="reset_settings">RESET SETTINGS</string>
|
||||||
<string name="button_reset">RESET</string>
|
<string name="button_reset">RESET</string>
|
||||||
<string name="themes">COLORSCHEME</string>
|
<string name="color_scheme">COLORSCHEME</string>
|
||||||
<string name="red_blue">"RED\nBLUE"</string>
|
<string name="red_blue">"RED\nBLUE"</string>
|
||||||
<string name="green_yellow">"GREEN\nYELLOW"</string>
|
<string name="green_yellow">"GREEN\nYELLOW"</string>
|
||||||
<string name="orange_turquoise">"ORANGE\nTURQUOISE"</string>
|
<string name="orange_turquoise">"ORANGE\nTURQUOISE"</string>
|
||||||
|
Loading…
Reference in New Issue
Block a user