Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-18 21:59:54 +01:00
Code Issues Projects Releases Wiki Activity

Use SwitchCompat instead of Switch

Browse Source
This commit is contained in:
Sebastian Kürten
2021-01-14 12:12:42 +01:00
parent 8d2640f459
commit 787348042e
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationSettingsFragment.java
View File

@@ -8,7 +8,6 @@ import android.view.MenuInflater;
import android.view.MenuItem; import android.view.MenuItem;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.widget.Switch;
import android.widget.TextView; import android.widget.TextView;
import org.briarproject.bramble.api.db.DatabaseExecutor; import org.briarproject.bramble.api.db.DatabaseExecutor;
@@ -26,6 +25,7 @@ import java.util.logging.Logger;
import javax.annotation.Nullable; import javax.annotation.Nullable;
import javax.inject.Inject; import javax.inject.Inject;
import androidx.appcompat.widget.SwitchCompat;
import androidx.lifecycle.ViewModelProvider; import androidx.lifecycle.ViewModelProvider;
import androidx.lifecycle.ViewModelProviders; import androidx.lifecycle.ViewModelProviders;
@@ -56,7 +56,7 @@ public class ConversationSettingsFragment extends BaseFragment {
private ConversationSettingsActivity listener; private ConversationSettingsActivity listener;
private ConversationViewModel viewModel; private ConversationViewModel viewModel;
private Switch switchDisappearingMessages; private SwitchCompat switchDisappearingMessages;
private volatile boolean disappearingMessages = false; private volatile boolean disappearingMessages = false;
@Override @Override

3
briar-android/src/main/res/layout/fragment_conversation_settings.xml
View File

@@ -20,7 +20,6 @@
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
app:tint="?attr/colorControlNormal" /> app:tint="?attr/colorControlNormal" />
<TextView <TextView
android:id="@+id/buttonLearnMore" android:id="@+id/buttonLearnMore"
android:layout_width="wrap_content" android:layout_width="wrap_content"
@@ -68,7 +67,7 @@
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/headlineSetting" /> app:layout_constraintTop_toBottomOf="@+id/headlineSetting" />
<Switch <androidx.appcompat.widget.SwitchCompat
android:id="@+id/switchDisappearingMessages" android:id="@+id/switchDisappearingMessages"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"