made checkboxes and radiobuttons stylable

8 files changed, 20 insertions, 2 deletions

diff --git a/src/main/java/de/pixart/messenger/ui/JoinConferenceDialog.java b/src/main/java/de/pixart/messenger/ui/JoinConferenceDialog.java
index c35a95438..a8702ebb6 100644
--- a/src/main/java/de/pixart/messenger/ui/JoinConferenceDialog.java
+++ b/src/main/java/de/pixart/messenger/ui/JoinConferenceDialog.java
@@ -18,7 +18,7 @@ import java.util.Collection;
 import java.util.List;
 
 import de.pixart.messenger.R;
-import de.pixart.messenger.databinding.JoinConferenceDialogBinding;
+import de.pixart.messenger.databinding.DialogJoinConferenceBinding;
 import de.pixart.messenger.services.XmppConnectionService;
 import de.pixart.messenger.ui.adapter.KnownHostsAdapter;
 import de.pixart.messenger.ui.interfaces.OnBackendConnected;
@@ -55,7 +55,7 @@ public class JoinConferenceDialog extends DialogFragment implements OnBackendCon
     public Dialog onCreateDialog(Bundle savedInstanceState) {
         final AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
         builder.setTitle(R.string.join_conference);
-        JoinConferenceDialogBinding binding = DataBindingUtil.inflate(getActivity().getLayoutInflater(), R.layout.join_conference_dialog, null, false);
+        DialogJoinConferenceBinding binding = DataBindingUtil.inflate(getActivity().getLayoutInflater(), R.layout.dialog_join_conference, null, false);
         DelayedHintHelper.setHint(R.string.conference_address_example, binding.jid);
         this.knownHostsAdapter = new KnownHostsAdapter(getActivity(), R.layout.simple_list_item);
         binding.jid.setAdapter(knownHostsAdapter);
diff --git a/src/main/res/layout/activity_contact_details.xml b/src/main/res/layout/activity_contact_details.xml
index e82a950cc..93fdffbe9 100644
--- a/src/main/res/layout/activity_contact_details.xml
+++ b/src/main/res/layout/activity_contact_details.xml
@@ -136,6 +136,7 @@
 
                             <CheckBox
                                 android:id="@+id/details_send_presence"
+                                style="@style/Widget.Conversations.CheckBox"
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
                                 android:layout_alignParentLeft="true"
@@ -147,6 +148,7 @@
 
                             <CheckBox
                                 android:id="@+id/details_receive_presence"
+                                style="@style/Widget.Conversations.CheckBox"
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
                                 android:layout_alignParentLeft="true"
diff --git a/src/main/res/layout/activity_edit_account.xml b/src/main/res/layout/activity_edit_account.xml
index 3ffb2ff5d..f47bcc5bb 100644
--- a/src/main/res/layout/activity_edit_account.xml
+++ b/src/main/res/layout/activity_edit_account.xml
@@ -157,6 +157,7 @@
 
                             <CheckBox
                                 android:id="@+id/account_register_new"
+                                style="@style/Widget.Conversations.CheckBox"
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
                                 android:layout_marginTop="8dp"
diff --git a/src/main/res/layout/dialog_block_contact.xml b/src/main/res/layout/dialog_block_contact.xml
index d4cc284eb..097d00bfb 100644
--- a/src/main/res/layout/dialog_block_contact.xml
+++ b/src/main/res/layout/dialog_block_contact.xml
@@ -18,6 +18,7 @@
 
         <CheckBox
             android:id="@+id/report_spam"
+            style="@style/Widget.Conversations.CheckBox"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="8dp"
diff --git a/src/main/res/layout/dialog_clear_history.xml b/src/main/res/layout/dialog_clear_history.xml
index 7c3ebfcbc..9f3f6d436 100644
--- a/src/main/res/layout/dialog_clear_history.xml
+++ b/src/main/res/layout/dialog_clear_history.xml
@@ -17,6 +17,7 @@
 
     <CheckBox
         android:id="@+id/end_conversation_checkbox"
+        style="@style/Widget.Conversations.CheckBox"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="@string/also_end_conversation"
diff --git a/src/main/res/layout/join_conference_dialog.xml b/src/main/res/layout/dialog_join_conference.xml
index 3f46e31cc..1a35a81e6 100644
--- a/src/main/res/layout/join_conference_dialog.xml
+++ b/src/main/res/layout/dialog_join_conference.xml
@@ -43,6 +43,7 @@
 
         <CheckBox
             android:id="@+id/bookmark"
+            style="@style/Widget.Conversations.CheckBox"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="8dp"
diff --git a/src/main/res/layout/dialog_presence.xml b/src/main/res/layout/dialog_presence.xml
index 5ae9ec9de..72abb9305 100644
--- a/src/main/res/layout/dialog_presence.xml
+++ b/src/main/res/layout/dialog_presence.xml
@@ -19,24 +19,28 @@
 
             <RadioButton
                 android:id="@+id/online"
+                style="@style/Widget.Conversations.RadioButton"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:text="@string/presence_online" />
 
             <RadioButton
                 android:id="@+id/away"
+                style="@style/Widget.Conversations.RadioButton"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:text="@string/presence_away" />
 
             <RadioButton
                 android:id="@+id/xa"
+                style="@style/Widget.Conversations.RadioButton"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:text="@string/presence_xa" />
 
             <RadioButton
                 android:id="@+id/dnd"
+                style="@style/Widget.Conversations.RadioButton"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:text="@string/presence_dnd" />
diff --git a/src/main/res/values/styles.xml b/src/main/res/values/styles.xml
index abf61f8ce..f68544de7 100644
--- a/src/main/res/values/styles.xml
+++ b/src/main/res/values/styles.xml
@@ -25,6 +25,14 @@
         <item name="android:textSize">?TextSizeInput</item>
     </style>
 
+    <style name="Widget.Conversations.CheckBox" parent="Widget.AppCompat.CompoundButton.CheckBox">
+        <item name="android:textSize">?TextSizeBody1</item>
+    </style>
+
+    <style name="Widget.Conversations.RadioButton" parent="Widget.AppCompat.CompoundButton.RadioButton">
+        <item name="android:textSize">?TextSizeBody1</item>
+    </style>
+
     <style name="TextAppearance.Conversations.Design.Hint" parent="TextAppearance.Design.Hint">
         <item name="android:textSize">?TextSizeCaption</item>
     </style>