diff --git a/app/src/main/java/com/example/dcav2gui/ui/settings/SettingsData.java b/app/src/main/java/com/example/dcav2gui/ui/settings/SettingsData.java index be275cd..d1b167d 100644 --- a/app/src/main/java/com/example/dcav2gui/ui/settings/SettingsData.java +++ b/app/src/main/java/com/example/dcav2gui/ui/settings/SettingsData.java @@ -5,6 +5,8 @@ public class SettingsData { public String profileName; public String apiUrl; public String apiKey; + public boolean useEarn; + public String earnApiKey; public boolean useTelegram; public String botToken; public String chatId; @@ -16,6 +18,8 @@ public class SettingsData { String profileName, String apiUrl, String apiKey, + boolean useEarn, + String earnApiKey, boolean useTelegram, String botToken, String chatId, @@ -26,6 +30,8 @@ public class SettingsData { this.profileName = profileName; this.apiUrl = apiUrl; this.apiKey = apiKey; + this.useEarn = useEarn; + this.earnApiKey = earnApiKey; this.useTelegram = useTelegram; this.botToken = botToken; this.chatId = chatId; diff --git a/app/src/main/java/com/example/dcav2gui/ui/settings/SettingsFragment.java b/app/src/main/java/com/example/dcav2gui/ui/settings/SettingsFragment.java index 2addd20..8102b00 100644 --- a/app/src/main/java/com/example/dcav2gui/ui/settings/SettingsFragment.java +++ b/app/src/main/java/com/example/dcav2gui/ui/settings/SettingsFragment.java @@ -30,6 +30,8 @@ public class SettingsFragment extends Fragment { EditText editProfileName = root.findViewById(R.id.editProfileName); EditText editApiUrl = root.findViewById(R.id.editApiUrl); EditText editApiKey = root.findViewById(R.id.editApiKey); + CheckBox useEarn = root.findViewById(R.id.useEarn); + EditText editEarnApiKey = root.findViewById(R.id.earnApiKey); CheckBox checkBox = root.findViewById(R.id.useTelegram); EditText editBotToken = root.findViewById(R.id.editBotToken); EditText editChatId = root.findViewById(R.id.editChatId); @@ -46,6 +48,8 @@ public class SettingsFragment extends Fragment { editProfileName.setText(settingsData.profileName); editApiUrl.setText(settingsData.apiUrl); editApiKey.setText(settingsData.apiKey); + useEarn.setChecked(settingsData.useEarn); + editEarnApiKey.setText(settingsData.earnApiKey); checkBox.setChecked(settingsData.useTelegram); editBotToken.setText(settingsData.botToken); editChatId.setText(settingsData.chatId); @@ -72,6 +76,8 @@ public class SettingsFragment extends Fragment { String profileName = editProfileName.getText().toString(); String apiUrl = editApiUrl.getText().toString(); String apiKey = editApiKey.getText().toString(); + boolean useEarn = checkBox.isChecked(); + String earnApiKey = editEarnApiKey.getText().toString(); boolean useTelegram = checkBox.isChecked(); String botToken = editBotToken.getText().toString(); String chatId = editChatId.getText().toString(); @@ -119,6 +125,8 @@ public class SettingsFragment extends Fragment { profileName, apiUrl, apiKey, + useEarn, + earnApiKey, useTelegram, botToken, chatId, diff --git a/app/src/main/java/com/example/dcav2gui/ui/settings/SettingsViewModel.java b/app/src/main/java/com/example/dcav2gui/ui/settings/SettingsViewModel.java index 20a6a77..3c0bfd7 100644 --- a/app/src/main/java/com/example/dcav2gui/ui/settings/SettingsViewModel.java +++ b/app/src/main/java/com/example/dcav2gui/ui/settings/SettingsViewModel.java @@ -17,6 +17,8 @@ public class SettingsViewModel extends ViewModel { public String profileName; public String apiUrl; public String apiKey; + public boolean useEarn; + public String earnApiKey; public boolean useTelegram; public String botToken; public String chatId; @@ -29,6 +31,8 @@ public class SettingsViewModel extends ViewModel { String profileName, String apiUrl, String apiKey, + boolean useEarn, + String earnApiKey, boolean useTelegram, String botToken, String chatId, @@ -41,6 +45,8 @@ public class SettingsViewModel extends ViewModel { this.profileName = profileName; this.apiUrl = apiUrl; this.apiKey = apiKey; + this.useEarn = useEarn; + this.earnApiKey = earnApiKey; this.useTelegram = useTelegram; this.botToken = botToken; this.chatId = chatId; @@ -54,6 +60,8 @@ public class SettingsViewModel extends ViewModel { profileName, apiUrl, apiKey, + useEarn, + earnApiKey, useTelegram, botToken, chatId, diff --git a/app/src/main/res/layout/fragment_settings.xml b/app/src/main/res/layout/fragment_settings.xml index cac33f7..3aa2f6d 100644 --- a/app/src/main/res/layout/fragment_settings.xml +++ b/app/src/main/res/layout/fragment_settings.xml @@ -69,6 +69,20 @@ android:inputType="text" android:textSize="16sp"/> + + + Enter the profile name Enter the API URL - Enter the API Key + Enter the API key + Enter the Earn API key Use Telegram Enter the bot token Enter the chat ID