[tor-commits] [orbot/master] remove unused layouts for app-mini
n8fr8 at torproject.org
n8fr8 at torproject.org
Tue Apr 28 21:05:01 UTC 2020
commit 918bcca9eecc05690b567c0ec4f6687f184932be
Author: n8fr8 <nathan at guardianproject.info>
Date: Fri Sep 6 15:19:46 2019 -0400
remove unused layouts for app-mini
---
.../src/main/res/layout/activity_bridge_wizard.xml | 27 ---------
.../src/main/res/layout/content_bridge_wizard.xml | 66 ----------------------
.../res/layout/layout_activity_client_cookies.xml | 35 ------------
.../res/layout/layout_add_client_cookie_dialog.xml | 62 --------------------
.../res/layout/layout_client_cookie_list_item.xml | 24 --------
.../res/layout/layout_content_client_cookies.xml | 20 -------
.../src/main/res/layout/layout_cookie_actions.xml | 24 --------
7 files changed, 258 deletions(-)
diff --git a/app-mini/src/main/res/layout/activity_bridge_wizard.xml b/app-mini/src/main/res/layout/activity_bridge_wizard.xml
deleted file mode 100644
index 7ff470c9..00000000
--- a/app-mini/src/main/res/layout/activity_bridge_wizard.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:app="http://schemas.android.com/apk/res-auto"
- xmlns:tools="http://schemas.android.com/tools"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:background="@color/dark_purple"
-
- tools:context="org.torproject.android.ui.onboarding.BridgeWizardActivity">
-
- <android.support.design.widget.AppBarLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:theme="@style/DefaultTheme.AppBarOverlay">
-
- <android.support.v7.widget.Toolbar
- android:id="@+id/toolbar"
- android:layout_width="match_parent"
- android:layout_height="?attr/actionBarSize"
- android:background="?attr/colorPrimary"
- app:popupTheme="@style/DefaultTheme.PopupOverlay" />
-
- </android.support.design.widget.AppBarLayout>
-
- <include layout="@layout/content_bridge_wizard" />
-
-</android.support.design.widget.CoordinatorLayout>
diff --git a/app-mini/src/main/res/layout/content_bridge_wizard.xml b/app-mini/src/main/res/layout/content_bridge_wizard.xml
deleted file mode 100644
index a5b7995b..00000000
--- a/app-mini/src/main/res/layout/content_bridge_wizard.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:app="http://schemas.android.com/apk/res-auto"
- xmlns:tools="http://schemas.android.com/tools"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:orientation="vertical"
- app:layout_behavior="@string/appbar_scrolling_view_behavior"
- tools:context="org.torproject.android.ui.onboarding.BridgeWizardActivity"
- tools:showIn="@layout/activity_bridge_wizard">
-
- <TextView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_margin="12dp"
-
- android:text="@string/if_your_mobile_network_actively_blocks_tor_you_can_use_a_tor_bridge_to_access_the_network_another_way_to_get_bridges_is_to_send_an_email_to_bridges_torproject_org_please_note_that_you_must_send_the_email_using_an_address_from_one_of_the_following_email_providers_riseup_gmail_or_yahoo_"
- android:textColor="@color/panel_background_main"
- android:textSize="16sp"
- android:textStyle="bold" />
-
- <RadioGroup xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:orientation="vertical">
-
- <RadioButton
- android:id="@+id/btnBridgesDirect"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_margin="12dp"
- android:text="@string/bridge_direct_connect" />
-
- <RadioButton
- android:id="@+id/btnBridgesObfs4"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_margin="12dp"
- android:text="@string/bridge_community" />
-
- <RadioButton
- android:id="@+id/btnBridgesMeek"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_margin="12dp"
- android:text="@string/bridge_cloud" />
-
- <RadioButton
- android:id="@+id/btnBridgesNew"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_margin="12dp"
- android:text="@string/bridges_get_new" />
-
- </RadioGroup>
-
- <TextView
- android:id="@+id/lbl_bridge_test_status"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_margin="12dp"
- android:gravity="center"
- android:textColor="@color/bright_green"
- android:textSize="16sp"
- android:textStyle="bold" />
-</LinearLayout>
diff --git a/app-mini/src/main/res/layout/layout_activity_client_cookies.xml b/app-mini/src/main/res/layout/layout_activity_client_cookies.xml
deleted file mode 100644
index b8f0626e..00000000
--- a/app-mini/src/main/res/layout/layout_activity_client_cookies.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:app="http://schemas.android.com/apk/res-auto"
- xmlns:tools="http://schemas.android.com/tools"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:fitsSystemWindows="true"
- tools:context="org.torproject.android.ui.hiddenservices.ClientCookiesActivity">
-
- <android.support.design.widget.AppBarLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:theme="@style/DefaultTheme.AppBarOverlay">
-
- <android.support.v7.widget.Toolbar
- android:id="@+id/toolbar"
- android:layout_width="match_parent"
- android:layout_height="?attr/actionBarSize"
- android:background="?attr/colorPrimary"
- app:popupTheme="@style/DefaultTheme.PopupOverlay" />
-
- </android.support.design.widget.AppBarLayout>
-
- <include layout="@layout/layout_content_client_cookies" />
-
- <android.support.design.widget.FloatingActionButton
- android:id="@+id/fab"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="bottom|end"
- android:layout_margin="@dimen/fab_margin"
- app:srcCompat="@android:drawable/stat_notify_more"
- app:backgroundTint="@android:color/darker_gray" />
-
-</android.support.design.widget.CoordinatorLayout>
diff --git a/app-mini/src/main/res/layout/layout_add_client_cookie_dialog.xml b/app-mini/src/main/res/layout/layout_add_client_cookie_dialog.xml
deleted file mode 100644
index 2f4b9885..00000000
--- a/app-mini/src/main/res/layout/layout_add_client_cookie_dialog.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:orientation="vertical"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:paddingLeft="5dp"
- android:paddingRight="5dp"
- android:paddingTop="5dp"
- android:paddingBottom="5dp">
-
- <TextView
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:text="@string/onion"
- android:textAppearance="@style/TextAppearance.AppCompat.Widget.PopupMenu.Small"
- android:paddingLeft="5dp" />
-
- <org.torproject.android.ui.NoPersonalizedLearningEditText
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:inputType="text"
- android:ems="10"
- android:id="@+id/cookie_onion" />
-
- <TextView
- android:text="@string/auth_cookie"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:textAppearance="@style/TextAppearance.AppCompat.Widget.PopupMenu.Small"
- android:paddingLeft="5dp" />
-
- <org.torproject.android.ui.NoPersonalizedLearningEditText
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:ems="10"
- android:id="@+id/cookie_value"
- android:inputType="text" />
-
- <LinearLayout
- android:orientation="horizontal"
- android:layout_width="match_parent"
- android:layout_height="match_parent">
-
- <Button
- android:text="@string/btn_cancel"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:id="@+id/cookie_dialog_cancel"
- android:layout_weight="1"
- style="@style/Widget.AppCompat.Button.Borderless.Colored" />
-
- <Button
- android:text="@string/save"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:id="@+id/cookie_dialog_save"
- android:layout_weight="1"
- style="@style/Widget.AppCompat.Button.Borderless.Colored" />
-
- </LinearLayout>
-
-</LinearLayout>
\ No newline at end of file
diff --git a/app-mini/src/main/res/layout/layout_client_cookie_list_item.xml b/app-mini/src/main/res/layout/layout_client_cookie_list_item.xml
deleted file mode 100644
index 80eefb94..00000000
--- a/app-mini/src/main/res/layout/layout_client_cookie_list_item.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:tools="http://schemas.android.com/tools"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:orientation="horizontal"
- android:padding="15dp">
-
- <TextView
- android:id="@+id/cookie_onion"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:textSize="18sp"
- android:layout_weight="1" />
-
- <Switch
- android:id="@+id/cookie_switch"
- android:layout_width="wrap_content"
- android:layout_height="match_parent"
- android:focusable="false"
- android:focusableInTouchMode="false"
- android:switchPadding="30dp" />
-
-</LinearLayout>
\ No newline at end of file
diff --git a/app-mini/src/main/res/layout/layout_content_client_cookies.xml b/app-mini/src/main/res/layout/layout_content_client_cookies.xml
deleted file mode 100644
index 2517d8e1..00000000
--- a/app-mini/src/main/res/layout/layout_content_client_cookies.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:app="http://schemas.android.com/apk/res-auto"
- xmlns:tools="http://schemas.android.com/tools"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:paddingBottom="@dimen/activity_vertical_margin"
- android:paddingLeft="@dimen/activity_horizontal_margin"
- android:paddingRight="@dimen/activity_horizontal_margin"
- android:paddingTop="@dimen/activity_vertical_margin"
- app:layout_behavior="@string/appbar_scrolling_view_behavior"
- tools:context="org.torproject.android.ui.hiddenservices.ClientCookiesActivity"
- tools:showIn="@layout/layout_activity_client_cookies">
-
- <ListView
- android:id="@+id/clien_cookies_list"
- android:layout_width="match_parent"
- android:layout_height="match_parent" />
-
-</RelativeLayout>
diff --git a/app-mini/src/main/res/layout/layout_cookie_actions.xml b/app-mini/src/main/res/layout/layout_cookie_actions.xml
deleted file mode 100644
index 64d8c1c6..00000000
--- a/app-mini/src/main/res/layout/layout_cookie_actions.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:orientation="vertical" android:layout_width="match_parent"
- android:layout_height="match_parent">
-
- <Button
- android:text="@string/backup_cookie"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:id="@+id/btn_cookie_backup" />
-
- <Button
- android:text="@string/delete_cookie"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:id="@+id/btn_cookie_delete" />
-
- <Button
- android:text="@string/btn_cancel"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:id="@+id/btn_cookie_cancel" />
-
-</LinearLayout>
\ No newline at end of file
More information about the tor-commits
mailing list