From b8aed86609702416325ae9a38ec65a63e1963c18 Mon Sep 17 00:00:00 2001 From: JG-Cody Date: Mon, 14 Jun 2021 20:02:19 +0200 Subject: [PATCH 1/4] ... --- app/src/main/res/drawable/graphite_logo.xml | 14 +++++ app/src/main/res/drawable/sidemenu.xml | 12 ++-- app/src/main/res/drawable/teraplex_logo.xml | 58 ++++++++++++++++++++ app/src/main/res/layout/activity_main.xml | 7 ++- app/src/main/res/layout/app_bar_main.xml | 28 +++++----- app/src/main/res/layout/fragment_credits.xml | 9 ++- app/src/main/res/layout/nav_header_main.xml | 9 ++- app/src/main/res/layout/only_color.xml | 7 +++ app/src/main/res/layout/singlebutton.xml | 6 +- app/src/main/res/values-night/themes.xml | 1 + app/src/main/res/values/themes.xml | 48 ++++++++-------- 11 files changed, 143 insertions(+), 56 deletions(-) create mode 100644 app/src/main/res/drawable/graphite_logo.xml create mode 100644 app/src/main/res/drawable/teraplex_logo.xml create mode 100644 app/src/main/res/layout/only_color.xml diff --git a/app/src/main/res/drawable/graphite_logo.xml b/app/src/main/res/drawable/graphite_logo.xml new file mode 100644 index 0000000..7625f43 --- /dev/null +++ b/app/src/main/res/drawable/graphite_logo.xml @@ -0,0 +1,14 @@ + + + + diff --git a/app/src/main/res/drawable/sidemenu.xml b/app/src/main/res/drawable/sidemenu.xml index 22f7ff5..de8bbf2 100644 --- a/app/src/main/res/drawable/sidemenu.xml +++ b/app/src/main/res/drawable/sidemenu.xml @@ -11,16 +11,16 @@ android:startColor="?attr/colorSecondary" /> + android:topRightRadius="0dp" /> + android:top="0dp"> + android:topRightRadius="0dp" /> \ No newline at end of file diff --git a/app/src/main/res/drawable/teraplex_logo.xml b/app/src/main/res/drawable/teraplex_logo.xml new file mode 100644 index 0000000..fae2fc0 --- /dev/null +++ b/app/src/main/res/drawable/teraplex_logo.xml @@ -0,0 +1,58 @@ + + + + + + + + + + + + + + + diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 2d8660e..f1d39e3 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -11,14 +11,14 @@ + android:layout_height="match_parent"/> + diff --git a/app/src/main/res/layout/app_bar_main.xml b/app/src/main/res/layout/app_bar_main.xml index f03a3ee..13f8299 100644 --- a/app/src/main/res/layout/app_bar_main.xml +++ b/app/src/main/res/layout/app_bar_main.xml @@ -18,19 +18,19 @@ android:id="@+id/include" layout="@layout/content_main" /> - + - + - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_credits.xml b/app/src/main/res/layout/fragment_credits.xml index 08b0336..dad2717 100644 --- a/app/src/main/res/layout/fragment_credits.xml +++ b/app/src/main/res/layout/fragment_credits.xml @@ -189,6 +189,7 @@ android:id="@+id/MatzeZ" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:alpha="@color/mtrl_btn_text_color_selector" android:gravity="center_horizontal" android:text="Julian G. | Matze Z." android:textAlignment="center" @@ -242,7 +243,8 @@ android:id="@+id/imageView3" android:layout_width="130dp" android:layout_height="50dp" - android:src="@drawable/jg_cody_white" + android:src="@drawable/teraplex_logo" + app:tint="@color/mtrl_btn_text_color_selector" app:layout_constraintEnd_toEndOf="@+id/team" app:layout_constraintStart_toStartOf="@+id/team" app:layout_constraintTop_toBottomOf="@+id/julianG" /> @@ -251,10 +253,11 @@ android:id="@+id/imageView5" android:layout_width="130dp" android:layout_height="50dp" - android:src="@drawable/graphite_raw" + android:src="@drawable/graphite_logo" app:layout_constraintEnd_toEndOf="@+id/supporter1" app:layout_constraintStart_toStartOf="@+id/supporter1" - app:layout_constraintTop_toBottomOf="@+id/supporter1" /> + app:layout_constraintTop_toBottomOf="@+id/supporter1" + app:tint="@color/mtrl_btn_text_color_selector" /> + android:src="@drawable/teraplex_logo" + app:tint="@color/mtrl_btn_text_color_selector"/> + android:textAppearance="@style/TextAppearance.AppCompat.Body1" + android:textColor="@color/mtrl_btn_text_color_selector" /> + android:text="www.jg-cody.de" + android:textColor="@color/mtrl_btn_text_color_selector" /> \ No newline at end of file diff --git a/app/src/main/res/layout/only_color.xml b/app/src/main/res/layout/only_color.xml new file mode 100644 index 0000000..27ac52a --- /dev/null +++ b/app/src/main/res/layout/only_color.xml @@ -0,0 +1,7 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/singlebutton.xml b/app/src/main/res/layout/singlebutton.xml index 2b96f2b..59a69d0 100644 --- a/app/src/main/res/layout/singlebutton.xml +++ b/app/src/main/res/layout/singlebutton.xml @@ -9,7 +9,7 @@