colors and themes fixed

added strings and translation
This commit is contained in:
JG-Cody 2023-06-24 18:43:23 +02:00
parent d267b393fc
commit c86b75eac4
7 changed files with 79 additions and 10 deletions

View File

@ -29,6 +29,8 @@
android:layout_marginEnd="@dimen/fab_margin" android:layout_marginEnd="@dimen/fab_margin"
android:layout_marginBottom="16dp" android:layout_marginBottom="16dp"
app:srcCompat="@drawable/baseline_edit_24" app:srcCompat="@drawable/baseline_edit_24"
app:tint="@color/white"
android:backgroundTint="?attr/colorTheme1"
android:visibility="gone" /> android:visibility="gone" />
<com.google.android.material.floatingactionbutton.FloatingActionButton <com.google.android.material.floatingactionbutton.FloatingActionButton
@ -39,6 +41,8 @@
android:layout_marginEnd="@dimen/fab_margin" android:layout_marginEnd="@dimen/fab_margin"
android:layout_marginBottom="16dp" android:layout_marginBottom="16dp"
app:srcCompat="@drawable/baseline_qr_code_scanner_24" app:srcCompat="@drawable/baseline_qr_code_scanner_24"
app:tint="@color/white"
android:backgroundTint="?attr/colorTheme1"
android:visibility="gone" /> android:visibility="gone" />
<com.google.android.material.floatingactionbutton.FloatingActionButton <com.google.android.material.floatingactionbutton.FloatingActionButton
@ -48,6 +52,8 @@
android:layout_gravity="bottom|end" android:layout_gravity="bottom|end"
android:layout_marginEnd="@dimen/fab_margin" android:layout_marginEnd="@dimen/fab_margin"
android:layout_marginBottom="16dp" android:layout_marginBottom="16dp"
app:srcCompat="@drawable/baseline_menu_24" /> app:srcCompat="@drawable/baseline_menu_24"
app:tint="@color/white"
android:backgroundTint="?attr/colorTheme1"/>
</androidx.coordinatorlayout.widget.CoordinatorLayout> </androidx.coordinatorlayout.widget.CoordinatorLayout>

View File

@ -0,0 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="app_name">Cringe Authenticator</string>
<string name="action_settings">Einstellungen</string>
<string name="next">Weiter</string>
<string name="previous">Zurück</string>
<string name="edit">Editieren</string>
<string name="choose_language">Sprachauswahl</string>
<string name="cancel">Abbrechen</string>
<string name="add">hinzufügen</string>
<string name="no">nein</string>
<string name="yes">ja</string>
<string name="invalid_input">ungültige Eingabe</string>
<string name="about">über</string>
<string name="haptic_feedback">vibration</string>
<string name="reset_app">App zurücksetzen</string>
<string name="import_export">importieren / exportieren</string>
<string name="language">Sprache</string>
</resources>

View File

@ -3,6 +3,7 @@
<!-- Customize your dark theme here. --> <!-- Customize your dark theme here. -->
<!-- <item name="colorPrimary">@color/my_dark_primary</item> --> <!-- <item name="colorPrimary">@color/my_dark_primary</item> -->
<item name="android:textColor">@color/white</item> <item name="android:textColor">@color/white</item>
<item name="colorOnBackground">#393740</item> <item name="colorOnBackground">@color/background_grey</item>
</style> </style>
</resources> </resources>

View File

@ -1,11 +1,19 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources> <resources>
<color name="black">#FF000000</color> <color name="black">#FF000000</color>
<color name="background_grey">#222222</color>
<color name="background_light_grey">#DCDCDC</color>
<color name="white">#FFFFFFFF</color> <color name="white">#FFFFFFFF</color>
<color name="colorPrimary">#008BFF</color> <color name="colorPrimary">#008BFF</color>
<color name="colorSecondary">#90D14C</color> <color name="colorSecondary">#90D14C</color>
<!-- Theme colors --> <!-- Theme colors -->
<color name="color_blue_green_1">#008BFF</color> <color name="color_blue">#008BFF</color>
<color name="color_blue_green_2">#90D14C</color> <color name="color_light_green">#90D14C</color>
<color name="color_pink">#D900FF</color>
<color name="color_orange">#FF7700</color>
<color name="color_red">#DA0303</color>
<color name="color_yellow">#FFE500</color>
<color name="color_turquoise">#00FFF7</color>
<color name="color_green">#00FF0A</color>
</resources> </resources>

View File

@ -2,12 +2,12 @@
<string name="app_name">Cringe Authenticator</string> <string name="app_name">Cringe Authenticator</string>
<string name="action_settings">Settings</string> <string name="action_settings">Settings</string>
<!-- Strings used for fragments for navigation --> <!-- Strings used for fragments for navigation -->
<string name="first_fragment_label">First Fragment</string> <string name="first_fragment_label" translatable="false">First Fragment</string>
<string name="second_fragment_label">Second Fragment</string> <string name="second_fragment_label" translatable="false">Second Fragment</string>
<string name="next">Next</string> <string name="next">Next</string>
<string name="previous">Previous</string> <string name="previous">Previous</string>
<string name="lorem_ipsum"> <string name="lorem_ipsum" translatable="false">
Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nam in scelerisque sem. Mauris Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nam in scelerisque sem. Mauris
volutpat, dolor id interdum ullamcorper, risus dolor egestas lectus, sit amet mattis purus volutpat, dolor id interdum ullamcorper, risus dolor egestas lectus, sit amet mattis purus
dui nec risus. Maecenas non sodales nisi, vel dictum dolor. Class aptent taciti sociosqu ad dui nec risus. Maecenas non sodales nisi, vel dictum dolor. Class aptent taciti sociosqu ad
@ -43,4 +43,17 @@
libero vel nunc consequat, quis tincidunt nisl eleifend. Cras bibendum enim a justo luctus libero vel nunc consequat, quis tincidunt nisl eleifend. Cras bibendum enim a justo luctus
vestibulum. Fusce dictum libero quis erat maximus, vitae volutpat diam dignissim. vestibulum. Fusce dictum libero quis erat maximus, vitae volutpat diam dignissim.
</string> </string>
<string name="edit">Edit</string>
<string name="choose_language">choose Language</string>
<string name="cancel">cancel</string>
<string name="add">add</string>
<string name="ok" translatable="false">Ok</string>
<string name="no">no</string>
<string name="yes">yes</string>
<string name="invalid_input">invalid input</string>
<string name="about">about</string>
<string name="haptic_feedback">haptic feedback</string>
<string name="reset_app">reset app</string>
<string name="import_export">import / export</string>
<string name="language">language</string>
</resources> </resources>

View File

@ -3,6 +3,8 @@
<style name="Base.Theme.CringeAuthenticator_Base" parent="Theme.Material3.DayNight.NoActionBar"> <style name="Base.Theme.CringeAuthenticator_Base" parent="Theme.Material3.DayNight.NoActionBar">
<item name="colorTheme1">#FF00FF</item> <item name="colorTheme1">#FF00FF</item>
<item name="colorTheme2">#000000</item> <item name="colorTheme2">#000000</item>
<item name="android:textColor">@color/black</item>
<item name="colorOnBackground">@color/background_light_grey</item>
</style> </style>
<style name="Base.Theme.CringeAuthenticator" parent="Base.Theme.CringeAuthenticator_Base"> <style name="Base.Theme.CringeAuthenticator" parent="Base.Theme.CringeAuthenticator_Base">
@ -15,7 +17,27 @@
<style name="Theme.CringeAuthenticator.None" parent="Base.Theme.CringeAuthenticator" /> <style name="Theme.CringeAuthenticator.None" parent="Base.Theme.CringeAuthenticator" />
<style name="Theme.CringeAuthenticator.Blue_Green" parent="Base.Theme.CringeAuthenticator"> <style name="Theme.CringeAuthenticator.Blue_Green" parent="Base.Theme.CringeAuthenticator">
<item name="colorTheme1">@color/color_blue_green_1</item> <item name="colorTheme1">@color/color_blue</item>
<item name="colorTheme2">@color/color_blue_green_2</item> <item name="colorTheme2">@color/color_light_green</item>
</style>
<style name="Theme.CringeAuthenticator.Red_Blue" parent="Base.Theme.CringeAuthenticator">
<item name="colorTheme1">@color/color_red</item>
<item name="colorTheme2">@color/color_blue</item>
</style>
<style name="Theme.CringeAuthenticator.Pink_Green" parent="Base.Theme.CringeAuthenticator">
<item name="colorTheme1">@color/color_pink</item>
<item name="colorTheme2">@color/color_green</item>
</style>
<style name="Theme.CringeAuthenticator.Blue_Yellow" parent="Base.Theme.CringeAuthenticator">
<item name="colorTheme1">@color/color_blue</item>
<item name="colorTheme2">@color/color_yellow</item>
</style>
<style name="Theme.CringeAuthenticator.Green_Yellow" parent="Base.Theme.CringeAuthenticator">
<item name="colorTheme1">@color/color_green</item>
<item name="colorTheme2">@color/color_yellow</item>
</style>
<style name="Theme.CringeAuthenticator.Orange_Turquoise" parent="Base.Theme.CringeAuthenticator">
<item name="colorTheme1">@color/color_orange</item>
<item name="colorTheme2">@color/color_turquoise</item>
</style> </style>
</resources> </resources>