diff --git a/app/src/main/java/org/cuberite/android/fragments/ControlFragment.java b/app/src/main/java/org/cuberite/android/fragments/ControlFragment.java
index b789f4a..64eb350 100644
--- a/app/src/main/java/org/cuberite/android/fragments/ControlFragment.java
+++ b/app/src/main/java/org/cuberite/android/fragments/ControlFragment.java
@@ -109,7 +109,7 @@ public void onClick(View view) {
}
});
} else if (state == State.READY) {
- int colorTo = ContextCompat.getColor(getContext(), R.color.success);
+ int colorTo = ContextCompat.getColor(getContext(), R.color.accent);
animateColorChange(mainButton, mainButtonColor, colorTo);
mainButton.setText(getText(R.string.do_start_cuberite));
mainButton.setOnClickListener(new View.OnClickListener() {
@@ -119,7 +119,7 @@ public void onClick(View view) {
}
});
} else {
- int colorTo = ContextCompat.getColor(getContext(), R.color.primary);
+ int colorTo = ContextCompat.getColor(getContext(), R.color.accent);
animateColorChange(mainButton, mainButtonColor, colorTo);
mainButton.setText(getText(R.string.do_install_cuberite));
mainButton.setOnClickListener(new View.OnClickListener() {
diff --git a/app/src/main/res/color/menu_item_color.xml b/app/src/main/res/color/menu_item_color.xml
index 7d2b5ed..4beac88 100644
--- a/app/src/main/res/color/menu_item_color.xml
+++ b/app/src/main/res/color/menu_item_color.xml
@@ -1,5 +1,5 @@
-
+
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_cloud_download.xml b/app/src/main/res/drawable/ic_cloud_download.xml
index 97b5f12..f9ae553 100644
--- a/app/src/main/res/drawable/ic_cloud_download.xml
+++ b/app/src/main/res/drawable/ic_cloud_download.xml
@@ -4,6 +4,6 @@
android:viewportWidth="24"
android:viewportHeight="24">
diff --git a/app/src/main/res/drawable/ic_execute.xml b/app/src/main/res/drawable/ic_execute.xml
index b26af09..eba9008 100644
--- a/app/src/main/res/drawable/ic_execute.xml
+++ b/app/src/main/res/drawable/ic_execute.xml
@@ -4,6 +4,6 @@
android:viewportWidth="24"
android:viewportHeight="24">
diff --git a/app/src/main/res/drawable/ic_info.xml b/app/src/main/res/drawable/ic_info.xml
deleted file mode 100644
index 49ae96f..0000000
--- a/app/src/main/res/drawable/ic_info.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
diff --git a/app/src/main/res/drawable/ic_install.xml b/app/src/main/res/drawable/ic_install.xml
index ba4bdb8..e0ee3e0 100644
--- a/app/src/main/res/drawable/ic_install.xml
+++ b/app/src/main/res/drawable/ic_install.xml
@@ -4,6 +4,6 @@
android:viewportWidth="24"
android:viewportHeight="24">
diff --git a/app/src/main/res/drawable/ic_policy.xml b/app/src/main/res/drawable/ic_policy.xml
index b187a29..e6a1013 100644
--- a/app/src/main/res/drawable/ic_policy.xml
+++ b/app/src/main/res/drawable/ic_policy.xml
@@ -4,6 +4,6 @@
android:viewportWidth="24"
android:viewportHeight="24">
diff --git a/app/src/main/res/drawable/ic_webadmin.xml b/app/src/main/res/drawable/ic_webadmin.xml
index 3db85dd..d9f3536 100644
--- a/app/src/main/res/drawable/ic_webadmin.xml
+++ b/app/src/main/res/drawable/ic_webadmin.xml
@@ -4,6 +4,6 @@
android:viewportWidth="24"
android:viewportHeight="24">
diff --git a/app/src/main/res/layout/fragment_console.xml b/app/src/main/res/layout/fragment_console.xml
index 375ad8c..ea77170 100644
--- a/app/src/main/res/layout/fragment_console.xml
+++ b/app/src/main/res/layout/fragment_console.xml
@@ -54,7 +54,6 @@
android:contentDescription="@string/do_execute_line"
android:layout_alignParentEnd="true"
android:layout_alignParentRight="true"
- android:tint="@color/execute_button"
app:srcCompat="@drawable/ic_execute" />
diff --git a/app/src/main/res/layout/fragment_control.xml b/app/src/main/res/layout/fragment_control.xml
index fdcbcd2..5d833f7 100644
--- a/app/src/main/res/layout/fragment_control.xml
+++ b/app/src/main/res/layout/fragment_control.xml
@@ -14,7 +14,7 @@
android:insetBottom="0dp"
android:padding="6dp"
android:textAllCaps="false"
- android:textColor="@color/main_button_text"
+ android:textColor="@color/white"
app:elevation="0dp"
app:cornerRadius="75dp" />
diff --git a/app/src/main/res/layout/settings_description_icon.xml b/app/src/main/res/layout/settings_description_icon.xml
deleted file mode 100644
index 8534011..0000000
--- a/app/src/main/res/layout/settings_description_icon.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/app/src/main/res/values-night-v23/styles.xml b/app/src/main/res/values-night-v23/styles.xml
index e9b0582..d1f5d73 100644
--- a/app/src/main/res/values-night-v23/styles.xml
+++ b/app/src/main/res/values-night-v23/styles.xml
@@ -7,7 +7,7 @@
- @color/bg
- false
- @color/accent
- - ?android:attr/textColorSecondary
+ - @color/primary
- false
- true
diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml
index 75bc5ed..6926b49 100644
--- a/app/src/main/res/values-night/colors.xml
+++ b/app/src/main/res/values-night/colors.xml
@@ -1,12 +1,10 @@
#202124
- #1E9E73
+ #bdbdbe
#313236
- #c2c2c3
- #ffffff
- #1E9E73
- #1E9E73
+ #1E9E73
#ED9D56
#F65E5A
+ #ffffff
\ No newline at end of file
diff --git a/app/src/main/res/values-v23/styles.xml b/app/src/main/res/values-v23/styles.xml
index fd56ed5..0acd9ed 100644
--- a/app/src/main/res/values-v23/styles.xml
+++ b/app/src/main/res/values-v23/styles.xml
@@ -5,7 +5,7 @@
- @color/bg
- true
- @color/accent
- - ?android:attr/textColorSecondary
+ - @color/primary
- false
- true
diff --git a/app/src/main/res/values-v27/styles.xml b/app/src/main/res/values-v27/styles.xml
index 579d279..e55c8ba 100644
--- a/app/src/main/res/values-v27/styles.xml
+++ b/app/src/main/res/values-v27/styles.xml
@@ -7,7 +7,7 @@
- true
- true
- @color/accent
- - ?android:attr/textColorSecondary
+ - @color/primary
- false
- true
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index c9987a0..36e0928 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -1,12 +1,10 @@
#fafafa
- #378B6F
+ #737373
#fafafa
- #737373
- #ffffff
- #378B6F
- #378B6F
+ #378B6F
#ED9D57
#F0433F
+ #ffffff
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
deleted file mode 100644
index 47c8224..0000000
--- a/app/src/main/res/values/dimens.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
- 16dp
- 16dp
-
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index b24f7f9..93d908f 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -4,7 +4,7 @@
diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
old mode 100755
new mode 100644
index 9b235f7..a0cf39b
--- a/app/src/main/res/xml/preferences.xml
+++ b/app/src/main/res/xml/preferences.xml
@@ -1,86 +1,89 @@
-
+
+ app:title="@string/title_activity_settings">
+ app:title="@string/settings_webadmin_heading">
+ app:key="webadminDescription"
+ app:summary="@string/settings_webadmin_explanation"
+ app:icon="@drawable/ic_webadmin"
+ app:enableCopying="true"
+ app:selectable="false" />
+ app:key="webadminOpen"
+ app:title="@string/settings_webadmin_open" />
+ app:key="webadminLogin"
+ app:title="@string/settings_webadmin_login" />
+ app:title="@string/settings_install_update">
+ app:summary="@string/settings_install_update_explanation"
+ app:icon="@drawable/ic_cloud_download"
+ app:enableCopying="true"
+ app:selectable="false" />
+ app:key="installUpdateBinary"
+ app:title="@string/settings_install_update_binary" />
+ app:key="installUpdateServer"
+ app:title="@string/settings_install_update_server" />
+ app:title="@string/settings_install_no_sha">
+ app:summary="@string/settings_install_no_sha_explanation"
+ app:icon="@drawable/ic_policy"
+ app:enableCopying="true"
+ app:selectable="false" />
+ app:key="installNoShaButton"
+ app:title="@string/settings_install_no_sha_button" />
+ app:title="@string/settings_install_manually">
+ app:key="abiText"
+ app:summary="@string/settings_install_manually_explanation"
+ app:icon="@drawable/ic_install"
+ app:enableCopying="true"
+ app:selectable="false" />
+ app:key="installBinary"
+ app:title="@string/settings_install_select_binary" />
+ app:key="installServer"
+ app:title="@string/settings_install_select_server" />
+ app:title="@string/settings_troubleshooting_heading">
+ app:key="troubleshootingAuthenticationToggle"
+ app:title="@string/settings_authentication_toggle"
+ app:summary="@string/settings_authentication_errors_explanation" />
+ app:title="@string/settings_info_heading">
+ app:key="infoDebugInfo"
+ app:title="@string/settings_info_debug" />
+ app:key="thirdPartyLicenses"
+ app:title="@string/settings_info_libraries" />
+ app:key="version" />
\ No newline at end of file