mirror of
https://github.com/oxen-io/session-android.git
synced 2025-12-08 01:02:20 +00:00
feat: testnet clearing network data on delete and differentiating dialogs
This commit is contained in:
@@ -185,6 +185,16 @@
|
||||
android:textStyle="bold"
|
||||
android:gravity="center"
|
||||
android:text="@string/activity_settings_clear_all_data_button_title" />
|
||||
<TextView
|
||||
android:id="@+id/clearAllDataAndNetworkButton"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="@dimen/setting_button_height"
|
||||
android:background="@drawable/setting_button_background"
|
||||
android:textColor="@color/destructive"
|
||||
android:textSize="@dimen/medium_font_size"
|
||||
android:textStyle="bold"
|
||||
android:gravity="center"
|
||||
android:text="@string/activity_settings_clear_all_data_and_network_button_title" />
|
||||
|
||||
<View
|
||||
android:layout_width="match_parent"
|
||||
|
||||
@@ -1,8 +1,9 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<LinearLayout
|
||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
xmlns:tools="http://schemas.android.com/tools"
|
||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||
android:background="@drawable/default_dialog_background_inset"
|
||||
android:gravity="center_horizontal"
|
||||
android:orientation="vertical"
|
||||
@@ -36,6 +37,7 @@
|
||||
android:orientation="horizontal">
|
||||
|
||||
<Button
|
||||
tools:visibility="gone"
|
||||
style="@style/Widget.Session.Button.Dialog.Unimportant"
|
||||
android:id="@+id/cancelButton"
|
||||
android:layout_width="0dp"
|
||||
@@ -44,6 +46,7 @@
|
||||
android:text="@string/cancel" />
|
||||
|
||||
<Button
|
||||
tools:visibility="gone"
|
||||
style="@style/Widget.Session.Button.Dialog.Destructive"
|
||||
android:id="@+id/clearAllDataButton"
|
||||
android:layout_width="0dp"
|
||||
@@ -52,6 +55,17 @@
|
||||
android:layout_marginStart="@dimen/medium_spacing"
|
||||
android:text="@string/delete" />
|
||||
|
||||
<com.github.ybq.android.spinkit.SpinKitView
|
||||
style="@style/SpinKitView.Small.ThreeBounce"
|
||||
android:layout_marginVertical="@dimen/small_spacing"
|
||||
android:id="@+id/progressBar"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="@dimen/small_button_height"
|
||||
android:layout_weight="1"
|
||||
app:SpinKit_Color="@color/accent"
|
||||
android:visibility="gone"
|
||||
/>
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
</LinearLayout>
|
||||
@@ -755,6 +755,7 @@
|
||||
<string name="activity_settings_invite_button_title">Invite</string>
|
||||
<string name="activity_settings_recovery_phrase_button_title">Recovery Phrase</string>
|
||||
<string name="activity_settings_clear_all_data_button_title">Clear Data</string>
|
||||
<string name="activity_settings_clear_all_data_and_network_button_title">Clear Data Including Network</string>
|
||||
<string name="activity_settings_help_translate_session">Help us Translate Session</string>
|
||||
|
||||
<string name="activity_notification_settings_title">Notifications</string>
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
<domain-config cleartextTrafficPermitted="true">
|
||||
<domain includeSubdomains="true">127.0.0.1</domain>
|
||||
</domain-config>
|
||||
<domain-config cleartextTrafficPermitted="false">
|
||||
<domain-config cleartextTrafficPermitted="true">
|
||||
<domain includeSubdomains="false">public.loki.foundation</domain>
|
||||
<trust-anchors>
|
||||
<certificates src="@raw/lf_session_cert"/>
|
||||
|
||||
Reference in New Issue
Block a user