summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFup Duck <fupduck@sacknagel.com>2018-03-06 12:24:22 +0100
committerFup Duck <fupduck@sacknagel.com>2018-03-06 12:24:22 +0100
commit54e95a61bc553d985f6c55823da20985b6103aa0 (patch)
treed723bb57986dcc22766c9f5ebebd34a49cceeb02
parentd2a68f7f72de06b26aa6ab0a139512455ba0fe76 (diff)
cleanup - rename layout files
-rw-r--r--app/build.gradle2
-rw-r--r--app/src/main/java/se/leap/bitmaskclient/AbstractProviderDetailActivity.java2
-rw-r--r--app/src/main/java/se/leap/bitmaskclient/DrawerSettingsAdapter.java4
-rw-r--r--app/src/main/java/se/leap/bitmaskclient/EipFragment.java3
-rw-r--r--app/src/main/java/se/leap/bitmaskclient/MainActivity.java2
-rw-r--r--app/src/main/java/se/leap/bitmaskclient/ProviderListBaseActivity.java4
-rw-r--r--app/src/main/java/se/leap/bitmaskclient/ProviderRenderer.java2
-rw-r--r--app/src/main/java/se/leap/bitmaskclient/VpnNotificationManager.java2
-rw-r--r--app/src/main/java/se/leap/bitmaskclient/drawer/NavigationDrawerFragment.java9
-rw-r--r--app/src/main/java/se/leap/bitmaskclient/fragments/AboutFragment.java3
-rw-r--r--app/src/main/java/se/leap/bitmaskclient/fragments/AlwaysOnDialog.java2
-rw-r--r--app/src/main/res/layout-sw600dp-port/a_provider_credentials.xml6
-rw-r--r--app/src/main/res/layout-sw600dp-port/a_provider_detail.xml4
-rw-r--r--app/src/main/res/layout-sw600dp-port/a_provider_list.xml (renamed from app/src/main/res/layout-sw600dp-port/provider_list_activity.xml)4
-rw-r--r--app/src/main/res/layout-sw600dp-port/f_log.xml2
-rw-r--r--app/src/main/res/layout-sw600dp/f_log.xml2
-rw-r--r--app/src/main/res/layout-xlarge/a_provider_credentials.xml6
-rw-r--r--app/src/main/res/layout-xlarge/a_provider_detail.xml4
-rw-r--r--app/src/main/res/layout-xlarge/a_provider_list.xml (renamed from app/src/main/res/layout-xlarge/provider_list_activity.xml)4
-rw-r--r--app/src/main/res/layout-xlarge/f_about.xml (renamed from app/src/main/res/layout-xlarge/about.xml)0
-rw-r--r--app/src/main/res/layout-xlarge/f_eip.xml (renamed from app/src/main/res/layout-xlarge/eip_service_fragment.xml)0
-rw-r--r--app/src/main/res/layout-xlarge/session_dialog.xml39
-rw-r--r--app/src/main/res/layout-xlarge/v_loading_screen.xml (renamed from app/src/main/res/layout-xlarge/loading_screen.xml)0
-rw-r--r--app/src/main/res/layout-xlarge/v_provider_header.xml (renamed from app/src/main/res/layout-xlarge/provider_header.xml)0
-rw-r--r--app/src/main/res/layout-xlarge/v_provider_list_item.xml (renamed from app/src/main/res/layout-xlarge/provider_list_item.xml)0
-rw-r--r--app/src/main/res/layout-xlarge/v_single_list_item.xml (renamed from app/src/main/res/layout-xlarge/single_list_item.xml)0
-rw-r--r--app/src/main/res/layout-xlarge/v_vpn_status.xml (renamed from app/src/main/res/layout-xlarge/vpnstatus.xml)0
-rw-r--r--app/src/main/res/layout/a_main.xml (renamed from app/src/main/res/layout/activity_main.xml)2
-rw-r--r--app/src/main/res/layout/a_provider_credentials.xml6
-rw-r--r--app/src/main/res/layout/a_provider_detail.xml4
-rw-r--r--app/src/main/res/layout/a_provider_list.xml (renamed from app/src/main/res/layout/provider_list_activity.xml)4
-rw-r--r--app/src/main/res/layout/d_checkbox_confirm.xml (renamed from app/src/main/res/layout/checkbox_confirm_dialog.xml)0
-rw-r--r--app/src/main/res/layout/f_about.xml (renamed from app/src/main/res/layout/about.xml)0
-rw-r--r--app/src/main/res/layout/f_drawer_main.xml (renamed from app/src/main/res/layout/drawer_main.xml)0
-rw-r--r--app/src/main/res/layout/f_eip.xml (renamed from app/src/main/res/layout/eip_service_fragment.xml)0
-rw-r--r--app/src/main/res/layout/fragment_main.xml16
-rw-r--r--app/src/main/res/layout/session_dialog.xml42
-rw-r--r--app/src/main/res/layout/v_custom_notification.xml (renamed from app/src/main/res/layout/custom_notification_layout.xml)0
-rw-r--r--app/src/main/res/layout/v_loading_screen.xml (renamed from app/src/main/res/layout/loading_screen.xml)0
-rw-r--r--app/src/main/res/layout/v_provider_credentials.xml (renamed from app/src/main/res/layout/provider_credentials.xml)0
-rw-r--r--app/src/main/res/layout/v_provider_header.xml (renamed from app/src/main/res/layout/provider_header.xml)0
-rw-r--r--app/src/main/res/layout/v_provider_list_item.xml (renamed from app/src/main/res/layout/provider_list_item.xml)0
-rw-r--r--app/src/main/res/layout/v_single_list_item.xml (renamed from app/src/main/res/layout/single_list_item.xml)0
-rw-r--r--app/src/main/res/layout/v_switch_list_item.xml (renamed from app/src/main/res/layout/switch_list_item.xml)0
-rw-r--r--app/src/main/res/layout/v_vpn_status.xml (renamed from app/src/main/res/layout/vpnstatus.xml)0
-rw-r--r--app/src/main/res/menu/main.xml13
-rw-r--r--app/src/production/java/se/leap/bitmaskclient/NewProviderDialog.java2
-rw-r--r--app/src/production/res/layout-xlarge/d_new_provider.xml (renamed from app/src/production/res/layout-xlarge/new_provider_dialog.xml)0
-rw-r--r--app/src/production/res/layout/d_new_provider.xml (renamed from app/src/production/res/layout/new_provider_dialog.xml)0
49 files changed, 37 insertions, 158 deletions
diff --git a/app/build.gradle b/app/build.gradle
index 5422b5e4..1ade8155 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -173,9 +173,7 @@ task copyIcsOpenVPNClasses( type: Copy ) {
task copyIcsOpenVPNXml( type: Copy ) {
println "copyIcsOpenVPNXml"
from ('../ics-openvpn/main/') {
- include '**/vpnstatus.xml'
include '**/strings.xml'
- include '**/vpnstatus.xml'
include '**/refs.xml'
include '**/white_rect.xml'
include '**/plurals.xml'
diff --git a/app/src/main/java/se/leap/bitmaskclient/AbstractProviderDetailActivity.java b/app/src/main/java/se/leap/bitmaskclient/AbstractProviderDetailActivity.java
index 6738a6bb..6349cb15 100644
--- a/app/src/main/java/se/leap/bitmaskclient/AbstractProviderDetailActivity.java
+++ b/app/src/main/java/se/leap/bitmaskclient/AbstractProviderDetailActivity.java
@@ -55,7 +55,7 @@ public abstract class AbstractProviderDetailActivity extends ConfigWizardBaseAct
options.setAdapter(new ArrayAdapter<>(
this,
- R.layout.single_list_item,
+ R.layout.v_single_list_item,
android.R.id.text1,
optionsList.toArray(new String[optionsList.size()])
));
diff --git a/app/src/main/java/se/leap/bitmaskclient/DrawerSettingsAdapter.java b/app/src/main/java/se/leap/bitmaskclient/DrawerSettingsAdapter.java
index 9b40d36f..8238df55 100644
--- a/app/src/main/java/se/leap/bitmaskclient/DrawerSettingsAdapter.java
+++ b/app/src/main/java/se/leap/bitmaskclient/DrawerSettingsAdapter.java
@@ -176,14 +176,14 @@ public class DrawerSettingsAdapter extends BaseAdapter {
@NonNull
private View initSwitchBinding(ViewHolder holder) {
- View convertView = mInflater.inflate(R.layout.switch_list_item, null);
+ View convertView = mInflater.inflate(R.layout.v_switch_list_item, null);
holder.switchView = convertView.findViewById(android.R.id.text1);
return convertView;
}
@NonNull
private View initTextViewBinding(ViewHolder holder) {
- View convertView = mInflater.inflate(R.layout.single_list_item, null);
+ View convertView = mInflater.inflate(R.layout.v_single_list_item, null);
holder.textView = convertView.findViewById(android.R.id.text1);
return convertView;
}
diff --git a/app/src/main/java/se/leap/bitmaskclient/EipFragment.java b/app/src/main/java/se/leap/bitmaskclient/EipFragment.java
index 34120859..9fcdcac9 100644
--- a/app/src/main/java/se/leap/bitmaskclient/EipFragment.java
+++ b/app/src/main/java/se/leap/bitmaskclient/EipFragment.java
@@ -38,7 +38,6 @@ import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.Button;
-import android.widget.TextView;
import java.util.Observable;
import java.util.Observer;
@@ -145,7 +144,7 @@ public class EipFragment extends Fragment implements Observer {
@Override
public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
eipStatus.addObserver(this);
- View view = inflater.inflate(R.layout.eip_service_fragment, container, false);
+ View view = inflater.inflate(R.layout.f_eip, container, false);
ButterKnife.inject(this, view);
Bundle arguments = getArguments();
diff --git a/app/src/main/java/se/leap/bitmaskclient/MainActivity.java b/app/src/main/java/se/leap/bitmaskclient/MainActivity.java
index 19294618..4d57b6bc 100644
--- a/app/src/main/java/se/leap/bitmaskclient/MainActivity.java
+++ b/app/src/main/java/se/leap/bitmaskclient/MainActivity.java
@@ -113,7 +113,7 @@ public class MainActivity extends AppCompatActivity implements Observer {
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
- setContentView(R.layout.activity_main);
+ setContentView(R.layout.a_main);
setSupportActionBar((Toolbar) findViewById(R.id.toolbar));
mainActivityBroadcastReceiver = new MainActivityBroadcastReceiver();
diff --git a/app/src/main/java/se/leap/bitmaskclient/ProviderListBaseActivity.java b/app/src/main/java/se/leap/bitmaskclient/ProviderListBaseActivity.java
index 75fffaf7..e0d6e27d 100644
--- a/app/src/main/java/se/leap/bitmaskclient/ProviderListBaseActivity.java
+++ b/app/src/main/java/se/leap/bitmaskclient/ProviderListBaseActivity.java
@@ -28,7 +28,6 @@ import android.support.v4.app.DialogFragment;
import android.support.v4.app.FragmentTransaction;
import android.support.v4.content.LocalBroadcastManager;
import android.util.Log;
-import android.view.Menu;
import android.widget.ListView;
import com.pedrogomez.renderers.Renderer;
@@ -47,7 +46,6 @@ import butterknife.InjectView;
import butterknife.OnItemClick;
import se.leap.bitmaskclient.fragments.AboutFragment;
-import static se.leap.bitmaskclient.Constants.APP_ACTION_QUIT;
import static se.leap.bitmaskclient.Constants.BROADCAST_PROVIDER_API_EVENT;
import static se.leap.bitmaskclient.Constants.BROADCAST_RESULT_CODE;
import static se.leap.bitmaskclient.Constants.BROADCAST_RESULT_KEY;
@@ -167,7 +165,7 @@ public abstract class ProviderListBaseActivity extends ConfigWizardBaseActivity
}
private void setUpInitialUI() {
- setContentView(R.layout.provider_list_activity);
+ setContentView(R.layout.a_provider_list);
setProviderHeaderText(R.string.setup_provider);
hideProgressBar();
}
diff --git a/app/src/main/java/se/leap/bitmaskclient/ProviderRenderer.java b/app/src/main/java/se/leap/bitmaskclient/ProviderRenderer.java
index 5b3e5728..795c8e82 100644
--- a/app/src/main/java/se/leap/bitmaskclient/ProviderRenderer.java
+++ b/app/src/main/java/se/leap/bitmaskclient/ProviderRenderer.java
@@ -25,7 +25,7 @@ public class ProviderRenderer extends Renderer<Provider> {
@Override
protected View inflate(LayoutInflater inflater, ViewGroup parent) {
- View view = inflater.inflate(R.layout.provider_list_item, parent, false);
+ View view = inflater.inflate(R.layout.v_provider_list_item, parent, false);
ButterKnife.inject(this, view);
return view;
}
diff --git a/app/src/main/java/se/leap/bitmaskclient/VpnNotificationManager.java b/app/src/main/java/se/leap/bitmaskclient/VpnNotificationManager.java
index 459f337b..6b2d67cf 100644
--- a/app/src/main/java/se/leap/bitmaskclient/VpnNotificationManager.java
+++ b/app/src/main/java/se/leap/bitmaskclient/VpnNotificationManager.java
@@ -200,7 +200,7 @@ public class VpnNotificationManager {
*/
private RemoteViews getKitkatCustomRemoteView(ConnectionStatus status, String title, String message) {
int iconResource = getIconByConnectionStatus(status);
- RemoteViews remoteViews = new RemoteViews(context.getPackageName(), R.layout.custom_notification_layout);
+ RemoteViews remoteViews = new RemoteViews(context.getPackageName(), R.layout.v_custom_notification);
remoteViews.setImageViewResource(R.id.image_icon, iconResource);
remoteViews.setTextViewText(R.id.message, message);
remoteViews.setTextViewText(R.id.title, title);
diff --git a/app/src/main/java/se/leap/bitmaskclient/drawer/NavigationDrawerFragment.java b/app/src/main/java/se/leap/bitmaskclient/drawer/NavigationDrawerFragment.java
index 6102e7e5..9256c136 100644
--- a/app/src/main/java/se/leap/bitmaskclient/drawer/NavigationDrawerFragment.java
+++ b/app/src/main/java/se/leap/bitmaskclient/drawer/NavigationDrawerFragment.java
@@ -140,7 +140,7 @@ public class NavigationDrawerFragment extends Fragment {
@Override
public View onCreateView(LayoutInflater inflater, ViewGroup container,
Bundle savedInstanceState) {
- mDrawerView = inflater.inflate(R.layout.drawer_main, container, false);
+ mDrawerView = inflater.inflate(R.layout.f_drawer_main, container, false);
restoreFromSavedInstance(savedInstanceState);
return mDrawerView;
}
@@ -196,7 +196,7 @@ public class NavigationDrawerFragment extends Fragment {
});
accountListAdapter = new ArrayAdapter<>(actionBar.getThemedContext(),
- R.layout.single_list_item,
+ R.layout.v_single_list_item,
android.R.id.text1);
createListAdapterData();
@@ -366,11 +366,6 @@ public class NavigationDrawerFragment extends Fragment {
return true;
}
- if (item.getItemId() == R.id.action_example) {
- Toast.makeText(getActivity(), "Example action.", Toast.LENGTH_SHORT).show();
- return true;
- }
-
return super.onOptionsItemSelected(item);
}
diff --git a/app/src/main/java/se/leap/bitmaskclient/fragments/AboutFragment.java b/app/src/main/java/se/leap/bitmaskclient/fragments/AboutFragment.java
index 113ce397..2f37f5b0 100644
--- a/app/src/main/java/se/leap/bitmaskclient/fragments/AboutFragment.java
+++ b/app/src/main/java/se/leap/bitmaskclient/fragments/AboutFragment.java
@@ -3,7 +3,6 @@ package se.leap.bitmaskclient.fragments;
import android.content.pm.PackageInfo;
import android.content.pm.PackageManager.NameNotFoundException;
import android.os.Bundle;
-import android.support.annotation.Nullable;
import android.support.v4.app.Fragment;
import android.view.LayoutInflater;
import android.view.View;
@@ -24,7 +23,7 @@ public class AboutFragment extends Fragment {
@Override
public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
- View view = inflater.inflate(R.layout.about, container, false);
+ View view = inflater.inflate(R.layout.f_about, container, false);
ButterKnife.inject(this, view);
return view;
}
diff --git a/app/src/main/java/se/leap/bitmaskclient/fragments/AlwaysOnDialog.java b/app/src/main/java/se/leap/bitmaskclient/fragments/AlwaysOnDialog.java
index 4e8e3d79..3558f378 100644
--- a/app/src/main/java/se/leap/bitmaskclient/fragments/AlwaysOnDialog.java
+++ b/app/src/main/java/se/leap/bitmaskclient/fragments/AlwaysOnDialog.java
@@ -45,7 +45,7 @@ public class AlwaysOnDialog extends AppCompatDialogFragment {
public Dialog onCreateDialog(Bundle savedInstanceState) {
AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
LayoutInflater inflater = getActivity().getLayoutInflater();
- View view = inflater.inflate(R.layout.checkbox_confirm_dialog, null);
+ View view = inflater.inflate(R.layout.d_checkbox_confirm, null);
ButterKnife.inject(this, view);
userMessage.setIcon(R.drawable.ic_settings);
diff --git a/app/src/main/res/layout-sw600dp-port/a_provider_credentials.xml b/app/src/main/res/layout-sw600dp-port/a_provider_credentials.xml
index 0cbb08f6..1d689db6 100644
--- a/app/src/main/res/layout-sw600dp-port/a_provider_credentials.xml
+++ b/app/src/main/res/layout-sw600dp-port/a_provider_credentials.xml
@@ -58,7 +58,7 @@
app:layout_constraintWidth_min="731dp"
>
- <include layout="@layout/loading_screen" />
+ <include layout="@layout/v_loading_screen" />
<LinearLayout
android:layout_width="match_parent"
@@ -67,7 +67,7 @@
android:orientation="vertical">
<include
- layout="@layout/provider_header"
+ layout="@layout/v_provider_header"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
@@ -83,7 +83,7 @@
android:layout_height="wrap_content"
android:orientation="vertical">
<include
- layout="@layout/provider_credentials"
+ layout="@layout/v_provider_credentials"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
diff --git a/app/src/main/res/layout-sw600dp-port/a_provider_detail.xml b/app/src/main/res/layout-sw600dp-port/a_provider_detail.xml
index bdafa45a..6d7c97ae 100644
--- a/app/src/main/res/layout-sw600dp-port/a_provider_detail.xml
+++ b/app/src/main/res/layout-sw600dp-port/a_provider_detail.xml
@@ -58,7 +58,7 @@
app:layout_constraintTop_toTopOf="@+id/guideline_top"
app:layout_constraintWidth_min="731dp">
- <include layout="@layout/loading_screen" />
+ <include layout="@layout/v_loading_screen" />
<LinearLayout
android:id="@+id/content"
@@ -67,7 +67,7 @@
android:layout_height="wrap_content">
<include
- layout="@layout/provider_header"
+ layout="@layout/v_provider_header"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
diff --git a/app/src/main/res/layout-sw600dp-port/provider_list_activity.xml b/app/src/main/res/layout-sw600dp-port/a_provider_list.xml
index f02398c5..818ce864 100644
--- a/app/src/main/res/layout-sw600dp-port/provider_list_activity.xml
+++ b/app/src/main/res/layout-sw600dp-port/a_provider_list.xml
@@ -58,7 +58,7 @@
app:layout_constraintTop_toTopOf="@+id/guideline_top"
app:layout_constraintWidth_min="731dp">
- <include layout="@layout/loading_screen" />
+ <include layout="@layout/v_loading_screen" />
<LinearLayout
android:id="@+id/content"
@@ -66,7 +66,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content">
- <include layout="@layout/provider_header"
+ <include layout="@layout/v_provider_header"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
diff --git a/app/src/main/res/layout-sw600dp-port/f_log.xml b/app/src/main/res/layout-sw600dp-port/f_log.xml
index 78dc4c62..ebadeb74 100644
--- a/app/src/main/res/layout-sw600dp-port/f_log.xml
+++ b/app/src/main/res/layout-sw600dp-port/f_log.xml
@@ -22,7 +22,7 @@
<include layout="@layout/f_log_sliders"/>
- <include layout="@layout/vpnstatus"/>
+ <include layout="@layout/v_vpn_status"/>
</LinearLayout>
<ListView
diff --git a/app/src/main/res/layout-sw600dp/f_log.xml b/app/src/main/res/layout-sw600dp/f_log.xml
index 34daf8be..b014ee9d 100644
--- a/app/src/main/res/layout-sw600dp/f_log.xml
+++ b/app/src/main/res/layout-sw600dp/f_log.xml
@@ -22,7 +22,7 @@
<include layout="@layout/f_log_sliders"/>
- <include layout="@layout/vpnstatus"/>
+ <include layout="@layout/v_vpn_status"/>
</LinearLayout>
<ListView
diff --git a/app/src/main/res/layout-xlarge/a_provider_credentials.xml b/app/src/main/res/layout-xlarge/a_provider_credentials.xml
index 2184aeb8..79045082 100644
--- a/app/src/main/res/layout-xlarge/a_provider_credentials.xml
+++ b/app/src/main/res/layout-xlarge/a_provider_credentials.xml
@@ -57,7 +57,7 @@
app:layout_constraintTop_toTopOf="@+id/guideline_top"
app:layout_constraintWidth_min="731dp">
- <include layout="@layout/loading_screen" />
+ <include layout="@layout/v_loading_screen" />
<LinearLayout
android:layout_width="match_parent"
@@ -66,7 +66,7 @@
android:orientation="vertical">
<include
- layout="@layout/provider_header"
+ layout="@layout/v_provider_header"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
@@ -82,7 +82,7 @@
android:layout_height="wrap_content"
android:orientation="vertical">
<include
- layout="@layout/provider_credentials"
+ layout="@layout/v_provider_credentials"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
diff --git a/app/src/main/res/layout-xlarge/a_provider_detail.xml b/app/src/main/res/layout-xlarge/a_provider_detail.xml
index 18098079..c1eeb0e0 100644
--- a/app/src/main/res/layout-xlarge/a_provider_detail.xml
+++ b/app/src/main/res/layout-xlarge/a_provider_detail.xml
@@ -58,7 +58,7 @@
app:layout_constraintTop_toTopOf="@+id/guideline_top"
app:layout_constraintWidth_min="731dp">
- <include layout="@layout/loading_screen" />
+ <include layout="@layout/v_loading_screen" />
<LinearLayout
android:id="@+id/content"
@@ -67,7 +67,7 @@
android:layout_height="wrap_content">
<include
- layout="@layout/provider_header"
+ layout="@layout/v_provider_header"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
diff --git a/app/src/main/res/layout-xlarge/provider_list_activity.xml b/app/src/main/res/layout-xlarge/a_provider_list.xml
index cdffc24e..9150466a 100644
--- a/app/src/main/res/layout-xlarge/provider_list_activity.xml
+++ b/app/src/main/res/layout-xlarge/a_provider_list.xml
@@ -58,7 +58,7 @@
app:layout_constraintTop_toTopOf="@+id/guideline_top"
app:layout_constraintWidth_min="731dp">
- <include layout="@layout/loading_screen" />
+ <include layout="@layout/v_loading_screen" />
<LinearLayout
android:id="@+id/content"
@@ -66,7 +66,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content">
- <include layout="@layout/provider_header"
+ <include layout="@layout/v_provider_header"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
diff --git a/app/src/main/res/layout-xlarge/about.xml b/app/src/main/res/layout-xlarge/f_about.xml
index c7896917..c7896917 100644
--- a/app/src/main/res/layout-xlarge/about.xml
+++ b/app/src/main/res/layout-xlarge/f_about.xml
diff --git a/app/src/main/res/layout-xlarge/eip_service_fragment.xml b/app/src/main/res/layout-xlarge/f_eip.xml
index 2326ffe8..2326ffe8 100644
--- a/app/src/main/res/layout-xlarge/eip_service_fragment.xml
+++ b/app/src/main/res/layout-xlarge/f_eip.xml
diff --git a/app/src/main/res/layout-xlarge/session_dialog.xml b/app/src/main/res/layout-xlarge/session_dialog.xml
deleted file mode 100644
index 3a9eebb8..00000000
--- a/app/src/main/res/layout-xlarge/session_dialog.xml
+++ /dev/null
@@ -1,39 +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="wrap_content"
- android:layout_height="wrap_content"
- android:orientation="vertical"
- tools:context=".LogInDialog" >
-
- <TextView
- android:id="@+id/user_message"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:gravity="center"
- android:textAppearance="?android:attr/textAppearanceMedium" />
-
- <EditText
- android:id="@+id/username_entered"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_marginBottom="4dp"
- android:layout_marginLeft="4dp"
- android:layout_marginRight="4dp"
- android:layout_marginTop="16dp"
- android:ems="10"
- android:hint="@string/username_hint"
- android:inputType="textUri" >
-
- <requestFocus />
- </EditText>
-
- <EditText
- android:id="@+id/password_entered"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:ems="10"
- android:hint="@string/password_hint"
- android:inputType="textPassword" />
-
-</LinearLayout> \ No newline at end of file
diff --git a/app/src/main/res/layout-xlarge/loading_screen.xml b/app/src/main/res/layout-xlarge/v_loading_screen.xml
index 2af6b411..2af6b411 100644
--- a/app/src/main/res/layout-xlarge/loading_screen.xml
+++ b/app/src/main/res/layout-xlarge/v_loading_screen.xml
diff --git a/app/src/main/res/layout-xlarge/provider_header.xml b/app/src/main/res/layout-xlarge/v_provider_header.xml
index 45f8302b..45f8302b 100644
--- a/app/src/main/res/layout-xlarge/provider_header.xml
+++ b/app/src/main/res/layout-xlarge/v_provider_header.xml
diff --git a/app/src/main/res/layout-xlarge/provider_list_item.xml b/app/src/main/res/layout-xlarge/v_provider_list_item.xml
index ec1e1242..ec1e1242 100644
--- a/app/src/main/res/layout-xlarge/provider_list_item.xml
+++ b/app/src/main/res/layout-xlarge/v_provider_list_item.xml
diff --git a/app/src/main/res/layout-xlarge/single_list_item.xml b/app/src/main/res/layout-xlarge/v_single_list_item.xml
index ad3de093..ad3de093 100644
--- a/app/src/main/res/layout-xlarge/single_list_item.xml
+++ b/app/src/main/res/layout-xlarge/v_single_list_item.xml
diff --git a/app/src/main/res/layout-xlarge/vpnstatus.xml b/app/src/main/res/layout-xlarge/v_vpn_status.xml
index 3b464b62..3b464b62 100644
--- a/app/src/main/res/layout-xlarge/vpnstatus.xml
+++ b/app/src/main/res/layout-xlarge/v_vpn_status.xml
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/a_main.xml
index de06efc7..bed05d18 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/a_main.xml
@@ -37,6 +37,6 @@
android:layout_width="@dimen/navigation_drawer_width"
android:layout_height="match_parent"
android:layout_gravity="start"
- tools:layout="@layout/drawer_main" />
+ tools:layout="@layout/f_drawer_main" />
</android.support.v4.widget.DrawerLayout>
diff --git a/app/src/main/res/layout/a_provider_credentials.xml b/app/src/main/res/layout/a_provider_credentials.xml
index 6667d905..5fefb2a3 100644
--- a/app/src/main/res/layout/a_provider_credentials.xml
+++ b/app/src/main/res/layout/a_provider_credentials.xml
@@ -7,7 +7,7 @@
android:padding="@dimen/stdpadding"
style="@style/BitmaskActivity">
- <include layout="@layout/loading_screen" />
+ <include layout="@layout/v_loading_screen" />
<LinearLayout
android:id="@+id/content"
@@ -17,7 +17,7 @@
>
<include
- layout="@layout/provider_header"
+ layout="@layout/v_provider_header"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
@@ -33,7 +33,7 @@
android:layout_height="wrap_content"
android:orientation="vertical">
<include
- layout="@layout/provider_credentials"
+ layout="@layout/v_provider_credentials"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
diff --git a/app/src/main/res/layout/a_provider_detail.xml b/app/src/main/res/layout/a_provider_detail.xml
index 018d4ee8..56b38ada 100644
--- a/app/src/main/res/layout/a_provider_detail.xml
+++ b/app/src/main/res/layout/a_provider_detail.xml
@@ -7,7 +7,7 @@
android:orientation="vertical"
style="@style/BitmaskActivity" >
- <include layout="@layout/loading_screen" />
+ <include layout="@layout/v_loading_screen" />
<LinearLayout
android:id="@+id/content"
@@ -16,7 +16,7 @@
android:layout_height="match_parent">
<include
- layout="@layout/provider_header"
+ layout="@layout/v_provider_header"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
diff --git a/app/src/main/res/layout/provider_list_activity.xml b/app/src/main/res/layout/a_provider_list.xml
index 6c5281b8..aa8cdfbb 100644
--- a/app/src/main/res/layout/provider_list_activity.xml
+++ b/app/src/main/res/layout/a_provider_list.xml
@@ -7,7 +7,7 @@
android:padding="@dimen/stdpadding"
style="@style/BitmaskActivity" >
- <include layout="@layout/loading_screen" />
+ <include layout="@layout/v_loading_screen" />
<LinearLayout
android:id="@+id/content"
@@ -15,7 +15,7 @@
android:layout_height="match_parent"
android:orientation="vertical">
- <include layout="@layout/provider_header" />
+ <include layout="@layout/v_provider_header" />
<ListView
android:id="@+id/provider_list"
diff --git a/app/src/main/res/layout/checkbox_confirm_dialog.xml b/app/src/main/res/layout/d_checkbox_confirm.xml
index 6dd22417..6dd22417 100644
--- a/app/src/main/res/layout/checkbox_confirm_dialog.xml
+++ b/app/src/main/res/layout/d_checkbox_confirm.xml
diff --git a/app/src/main/res/layout/about.xml b/app/src/main/res/layout/f_about.xml
index aba51141..aba51141 100644
--- a/app/src/main/res/layout/about.xml
+++ b/app/src/main/res/layout/f_about.xml
diff --git a/app/src/main/res/layout/drawer_main.xml b/app/src/main/res/layout/f_drawer_main.xml
index 54614f3f..54614f3f 100644
--- a/app/src/main/res/layout/drawer_main.xml
+++ b/app/src/main/res/layout/f_drawer_main.xml
diff --git a/app/src/main/res/layout/eip_service_fragment.xml b/app/src/main/res/layout/f_eip.xml
index e220bf16..e220bf16 100644
--- a/app/src/main/res/layout/eip_service_fragment.xml
+++ b/app/src/main/res/layout/f_eip.xml
diff --git a/app/src/main/res/layout/fragment_main.xml b/app/src/main/res/layout/fragment_main.xml
deleted file mode 100644
index 31dbd11e..00000000
--- a/app/src/main/res/layout/fragment_main.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
- 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"
- tools:context="se.leap.bitmaskclient.MainActivity$PlaceholderFragment">
-
- <TextView
- android:id="@+id/section_label"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content" />
-
-</RelativeLayout>
diff --git a/app/src/main/res/layout/session_dialog.xml b/app/src/main/res/layout/session_dialog.xml
deleted file mode 100644
index 62215ae8..00000000
--- a/app/src/main/res/layout/session_dialog.xml
+++ /dev/null
@@ -1,42 +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="wrap_content"
- android:layout_height="wrap_content"
- android:orientation="vertical"
- tools:context=".SessionDialog" >
-
- <TextView
- android:id="@+id/user_message"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:gravity="center"
- android:visibility="gone"
- android:textAppearance="?android:attr/textAppearanceMedium" />
-
- <EditText
- android:id="@+id/username_entered"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_marginBottom="4dp"
- android:layout_marginLeft="4dp"
- android:layout_marginRight="4dp"
- android:layout_marginTop="16dp"
- android:textSize="24sp"
- android:ems="10"
- android:hint="@string/username_hint"
- android:inputType="textUri" >
-
- <requestFocus />
- </EditText>
-
- <EditText
- android:id="@+id/password_entered"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:textSize="24sp"
- android:ems="10"
- android:hint="@string/password_hint"
- android:inputType="textPassword" />
-
-</LinearLayout> \ No newline at end of file
diff --git a/app/src/main/res/layout/custom_notification_layout.xml b/app/src/main/res/layout/v_custom_notification.xml
index e97fcbe2..e97fcbe2 100644
--- a/app/src/main/res/layout/custom_notification_layout.xml
+++ b/app/src/main/res/layout/v_custom_notification.xml
diff --git a/app/src/main/res/layout/loading_screen.xml b/app/src/main/res/layout/v_loading_screen.xml
index f4c7eb95..f4c7eb95 100644
--- a/app/src/main/res/layout/loading_screen.xml
+++ b/app/src/main/res/layout/v_loading_screen.xml
diff --git a/app/src/main/res/layout/provider_credentials.xml b/app/src/main/res/layout/v_provider_credentials.xml
index 0bfdcc47..0bfdcc47 100644
--- a/app/src/main/res/layout/provider_credentials.xml
+++ b/app/src/main/res/layout/v_provider_credentials.xml
diff --git a/app/src/main/res/layout/provider_header.xml b/app/src/main/res/layout/v_provider_header.xml
index 6b08976c..6b08976c 100644
--- a/app/src/main/res/layout/provider_header.xml
+++ b/app/src/main/res/layout/v_provider_header.xml
diff --git a/app/src/main/res/layout/provider_list_item.xml b/app/src/main/res/layout/v_provider_list_item.xml
index 1f0e135b..1f0e135b 100644
--- a/app/src/main/res/layout/provider_list_item.xml
+++ b/app/src/main/res/layout/v_provider_list_item.xml
diff --git a/app/src/main/res/layout/single_list_item.xml b/app/src/main/res/layout/v_single_list_item.xml
index 652cb693..652cb693 100644
--- a/app/src/main/res/layout/single_list_item.xml
+++ b/app/src/main/res/layout/v_single_list_item.xml
diff --git a/app/src/main/res/layout/switch_list_item.xml b/app/src/main/res/layout/v_switch_list_item.xml
index bdb9a74c..bdb9a74c 100644
--- a/app/src/main/res/layout/switch_list_item.xml
+++ b/app/src/main/res/layout/v_switch_list_item.xml
diff --git a/app/src/main/res/layout/vpnstatus.xml b/app/src/main/res/layout/v_vpn_status.xml
index 3b464b62..3b464b62 100644
--- a/app/src/main/res/layout/vpnstatus.xml
+++ b/app/src/main/res/layout/v_vpn_status.xml
diff --git a/app/src/main/res/menu/main.xml b/app/src/main/res/menu/main.xml
deleted file mode 100644
index 56f43959..00000000
--- a/app/src/main/res/menu/main.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<menu xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:tools="http://schemas.android.com/tools"
- tools:context="se.leap.bitmaskclient.MainActivity">
- <item
- android:id="@+id/action_example"
- android:showAsAction="withText|ifRoom"
- android:title="@string/action_example" />
- <item
- android:id="@+id/action_settings"
- android:orderInCategory="100"
- android:showAsAction="never"
- android:title="@string/action_settings" />
-</menu>
diff --git a/app/src/production/java/se/leap/bitmaskclient/NewProviderDialog.java b/app/src/production/java/se/leap/bitmaskclient/NewProviderDialog.java
index 025d5263..cce49d9b 100644
--- a/app/src/production/java/se/leap/bitmaskclient/NewProviderDialog.java
+++ b/app/src/production/java/se/leap/bitmaskclient/NewProviderDialog.java
@@ -65,7 +65,7 @@ public class NewProviderDialog extends DialogFragment {
public Dialog onCreateDialog(Bundle savedInstanceState) {
AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
LayoutInflater inflater = getActivity().getLayoutInflater();
- View view = inflater.inflate(R.layout.new_provider_dialog, null);
+ View view = inflater.inflate(R.layout.d_new_provider, null);
ButterKnife.inject(this, view);
Bundle arguments = getArguments();
if (arguments != null) {
diff --git a/app/src/production/res/layout-xlarge/new_provider_dialog.xml b/app/src/production/res/layout-xlarge/d_new_provider.xml
index 12616625..12616625 100644
--- a/app/src/production/res/layout-xlarge/new_provider_dialog.xml
+++ b/app/src/production/res/layout-xlarge/d_new_provider.xml
diff --git a/app/src/production/res/layout/new_provider_dialog.xml b/app/src/production/res/layout/d_new_provider.xml
index 36eb0d6a..36eb0d6a 100644
--- a/app/src/production/res/layout/new_provider_dialog.xml
+++ b/app/src/production/res/layout/d_new_provider.xml