From 54e95a61bc553d985f6c55823da20985b6103aa0 Mon Sep 17 00:00:00 2001 From: Fup Duck Date: Tue, 6 Mar 2018 12:24:22 +0100 Subject: cleanup - rename layout files --- app/build.gradle | 2 - .../AbstractProviderDetailActivity.java | 2 +- .../leap/bitmaskclient/DrawerSettingsAdapter.java | 4 +- .../java/se/leap/bitmaskclient/EipFragment.java | 3 +- .../java/se/leap/bitmaskclient/MainActivity.java | 2 +- .../bitmaskclient/ProviderListBaseActivity.java | 4 +- .../se/leap/bitmaskclient/ProviderRenderer.java | 2 +- .../leap/bitmaskclient/VpnNotificationManager.java | 2 +- .../drawer/NavigationDrawerFragment.java | 9 +- .../bitmaskclient/fragments/AboutFragment.java | 3 +- .../bitmaskclient/fragments/AlwaysOnDialog.java | 2 +- .../layout-sw600dp-port/a_provider_credentials.xml | 6 +- .../res/layout-sw600dp-port/a_provider_detail.xml | 4 +- .../res/layout-sw600dp-port/a_provider_list.xml | 83 ++++++++ app/src/main/res/layout-sw600dp-port/f_log.xml | 2 +- .../layout-sw600dp-port/provider_list_activity.xml | 83 -------- app/src/main/res/layout-sw600dp/f_log.xml | 2 +- .../res/layout-xlarge/a_provider_credentials.xml | 6 +- .../main/res/layout-xlarge/a_provider_detail.xml | 4 +- app/src/main/res/layout-xlarge/a_provider_list.xml | 83 ++++++++ app/src/main/res/layout-xlarge/about.xml | 209 --------------------- .../res/layout-xlarge/eip_service_fragment.xml | 128 ------------- app/src/main/res/layout-xlarge/f_about.xml | 209 +++++++++++++++++++++ app/src/main/res/layout-xlarge/f_eip.xml | 128 +++++++++++++ app/src/main/res/layout-xlarge/loading_screen.xml | 41 ---- app/src/main/res/layout-xlarge/provider_header.xml | 22 --- .../res/layout-xlarge/provider_list_activity.xml | 83 -------- .../main/res/layout-xlarge/provider_list_item.xml | 34 ---- app/src/main/res/layout-xlarge/session_dialog.xml | 39 ---- .../main/res/layout-xlarge/single_list_item.xml | 28 --- .../main/res/layout-xlarge/v_loading_screen.xml | 41 ++++ .../main/res/layout-xlarge/v_provider_header.xml | 22 +++ .../res/layout-xlarge/v_provider_list_item.xml | 34 ++++ .../main/res/layout-xlarge/v_single_list_item.xml | 28 +++ app/src/main/res/layout-xlarge/v_vpn_status.xml | 52 +++++ app/src/main/res/layout-xlarge/vpnstatus.xml | 52 ----- app/src/main/res/layout/a_main.xml | 42 +++++ app/src/main/res/layout/a_provider_credentials.xml | 6 +- app/src/main/res/layout/a_provider_detail.xml | 4 +- app/src/main/res/layout/a_provider_list.xml | 30 +++ app/src/main/res/layout/about.xml | 201 -------------------- app/src/main/res/layout/activity_main.xml | 42 ----- .../main/res/layout/checkbox_confirm_dialog.xml | 24 --- .../main/res/layout/custom_notification_layout.xml | 48 ----- app/src/main/res/layout/d_checkbox_confirm.xml | 24 +++ app/src/main/res/layout/drawer_main.xml | 69 ------- app/src/main/res/layout/eip_service_fragment.xml | 130 ------------- app/src/main/res/layout/f_about.xml | 201 ++++++++++++++++++++ app/src/main/res/layout/f_drawer_main.xml | 69 +++++++ app/src/main/res/layout/f_eip.xml | 130 +++++++++++++ app/src/main/res/layout/fragment_main.xml | 16 -- app/src/main/res/layout/loading_screen.xml | 41 ---- app/src/main/res/layout/provider_credentials.xml | 67 ------- app/src/main/res/layout/provider_header.xml | 22 --- app/src/main/res/layout/provider_list_activity.xml | 30 --- app/src/main/res/layout/provider_list_item.xml | 34 ---- app/src/main/res/layout/session_dialog.xml | 42 ----- app/src/main/res/layout/single_list_item.xml | 12 -- app/src/main/res/layout/switch_list_item.xml | 15 -- app/src/main/res/layout/v_custom_notification.xml | 48 +++++ app/src/main/res/layout/v_loading_screen.xml | 41 ++++ app/src/main/res/layout/v_provider_credentials.xml | 67 +++++++ app/src/main/res/layout/v_provider_header.xml | 22 +++ app/src/main/res/layout/v_provider_list_item.xml | 34 ++++ app/src/main/res/layout/v_single_list_item.xml | 12 ++ app/src/main/res/layout/v_switch_list_item.xml | 15 ++ app/src/main/res/layout/v_vpn_status.xml | 52 +++++ app/src/main/res/layout/vpnstatus.xml | 52 ----- app/src/main/res/menu/main.xml | 13 -- .../se/leap/bitmaskclient/NewProviderDialog.java | 2 +- .../res/layout-xlarge/d_new_provider.xml | 19 ++ .../res/layout-xlarge/new_provider_dialog.xml | 19 -- app/src/production/res/layout/d_new_provider.xml | 18 ++ .../production/res/layout/new_provider_dialog.xml | 18 -- 74 files changed, 1534 insertions(+), 1655 deletions(-) create mode 100644 app/src/main/res/layout-sw600dp-port/a_provider_list.xml delete mode 100644 app/src/main/res/layout-sw600dp-port/provider_list_activity.xml create mode 100644 app/src/main/res/layout-xlarge/a_provider_list.xml delete mode 100644 app/src/main/res/layout-xlarge/about.xml delete mode 100644 app/src/main/res/layout-xlarge/eip_service_fragment.xml create mode 100644 app/src/main/res/layout-xlarge/f_about.xml create mode 100644 app/src/main/res/layout-xlarge/f_eip.xml delete mode 100644 app/src/main/res/layout-xlarge/loading_screen.xml delete mode 100644 app/src/main/res/layout-xlarge/provider_header.xml delete mode 100644 app/src/main/res/layout-xlarge/provider_list_activity.xml delete mode 100644 app/src/main/res/layout-xlarge/provider_list_item.xml delete mode 100644 app/src/main/res/layout-xlarge/session_dialog.xml delete mode 100644 app/src/main/res/layout-xlarge/single_list_item.xml create mode 100644 app/src/main/res/layout-xlarge/v_loading_screen.xml create mode 100644 app/src/main/res/layout-xlarge/v_provider_header.xml create mode 100644 app/src/main/res/layout-xlarge/v_provider_list_item.xml create mode 100644 app/src/main/res/layout-xlarge/v_single_list_item.xml create mode 100644 app/src/main/res/layout-xlarge/v_vpn_status.xml delete mode 100644 app/src/main/res/layout-xlarge/vpnstatus.xml create mode 100644 app/src/main/res/layout/a_main.xml create mode 100644 app/src/main/res/layout/a_provider_list.xml delete mode 100644 app/src/main/res/layout/about.xml delete mode 100644 app/src/main/res/layout/activity_main.xml delete mode 100644 app/src/main/res/layout/checkbox_confirm_dialog.xml delete mode 100644 app/src/main/res/layout/custom_notification_layout.xml create mode 100644 app/src/main/res/layout/d_checkbox_confirm.xml delete mode 100644 app/src/main/res/layout/drawer_main.xml delete mode 100644 app/src/main/res/layout/eip_service_fragment.xml create mode 100644 app/src/main/res/layout/f_about.xml create mode 100644 app/src/main/res/layout/f_drawer_main.xml create mode 100644 app/src/main/res/layout/f_eip.xml delete mode 100644 app/src/main/res/layout/fragment_main.xml delete mode 100644 app/src/main/res/layout/loading_screen.xml delete mode 100644 app/src/main/res/layout/provider_credentials.xml delete mode 100644 app/src/main/res/layout/provider_header.xml delete mode 100644 app/src/main/res/layout/provider_list_activity.xml delete mode 100644 app/src/main/res/layout/provider_list_item.xml delete mode 100644 app/src/main/res/layout/session_dialog.xml delete mode 100644 app/src/main/res/layout/single_list_item.xml delete mode 100644 app/src/main/res/layout/switch_list_item.xml create mode 100644 app/src/main/res/layout/v_custom_notification.xml create mode 100644 app/src/main/res/layout/v_loading_screen.xml create mode 100644 app/src/main/res/layout/v_provider_credentials.xml create mode 100644 app/src/main/res/layout/v_provider_header.xml create mode 100644 app/src/main/res/layout/v_provider_list_item.xml create mode 100644 app/src/main/res/layout/v_single_list_item.xml create mode 100644 app/src/main/res/layout/v_switch_list_item.xml create mode 100644 app/src/main/res/layout/v_vpn_status.xml delete mode 100644 app/src/main/res/layout/vpnstatus.xml delete mode 100644 app/src/main/res/menu/main.xml create mode 100644 app/src/production/res/layout-xlarge/d_new_provider.xml delete mode 100644 app/src/production/res/layout-xlarge/new_provider_dialog.xml create mode 100644 app/src/production/res/layout/d_new_provider.xml delete mode 100644 app/src/production/res/layout/new_provider_dialog.xml (limited to 'app') 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 { @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" > - + @@ -83,7 +83,7 @@ android:layout_height="wrap_content" android:orientation="vertical"> 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"> - + diff --git a/app/src/main/res/layout-sw600dp-port/a_provider_list.xml b/app/src/main/res/layout-sw600dp-port/a_provider_list.xml new file mode 100644 index 00000000..818ce864 --- /dev/null +++ b/app/src/main/res/layout-sw600dp-port/a_provider_list.xml @@ -0,0 +1,83 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + 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 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - 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 @@ - + - + @@ -82,7 +82,7 @@ android:layout_height="wrap_content" android:orientation="vertical"> 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"> - + diff --git a/app/src/main/res/layout-xlarge/a_provider_list.xml b/app/src/main/res/layout-xlarge/a_provider_list.xml new file mode 100644 index 00000000..9150466a --- /dev/null +++ b/app/src/main/res/layout-xlarge/a_provider_list.xml @@ -0,0 +1,83 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/layout-xlarge/about.xml b/app/src/main/res/layout-xlarge/about.xml deleted file mode 100644 index c7896917..00000000 --- a/app/src/main/res/layout-xlarge/about.xml +++ /dev/null @@ -1,209 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/app/src/main/res/layout-xlarge/eip_service_fragment.xml b/app/src/main/res/layout-xlarge/eip_service_fragment.xml deleted file mode 100644 index 2326ffe8..00000000 --- a/app/src/main/res/layout-xlarge/eip_service_fragment.xml +++ /dev/null @@ -1,128 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/app/src/main/res/layout-xlarge/f_about.xml b/app/src/main/res/layout-xlarge/f_about.xml new file mode 100644 index 00000000..c7896917 --- /dev/null +++ b/app/src/main/res/layout-xlarge/f_about.xml @@ -0,0 +1,209 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/layout-xlarge/f_eip.xml b/app/src/main/res/layout-xlarge/f_eip.xml new file mode 100644 index 00000000..2326ffe8 --- /dev/null +++ b/app/src/main/res/layout-xlarge/f_eip.xml @@ -0,0 +1,128 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/layout-xlarge/loading_screen.xml b/app/src/main/res/layout-xlarge/loading_screen.xml deleted file mode 100644 index 2af6b411..00000000 --- a/app/src/main/res/layout-xlarge/loading_screen.xml +++ /dev/null @@ -1,41 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout-xlarge/provider_header.xml b/app/src/main/res/layout-xlarge/provider_header.xml deleted file mode 100644 index 45f8302b..00000000 --- a/app/src/main/res/layout-xlarge/provider_header.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout-xlarge/provider_list_activity.xml b/app/src/main/res/layout-xlarge/provider_list_activity.xml deleted file mode 100644 index cdffc24e..00000000 --- a/app/src/main/res/layout-xlarge/provider_list_activity.xml +++ /dev/null @@ -1,83 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/app/src/main/res/layout-xlarge/provider_list_item.xml b/app/src/main/res/layout-xlarge/provider_list_item.xml deleted file mode 100644 index ec1e1242..00000000 --- a/app/src/main/res/layout-xlarge/provider_list_item.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - - 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 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout-xlarge/single_list_item.xml b/app/src/main/res/layout-xlarge/single_list_item.xml deleted file mode 100644 index ad3de093..00000000 --- a/app/src/main/res/layout-xlarge/single_list_item.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - diff --git a/app/src/main/res/layout-xlarge/v_loading_screen.xml b/app/src/main/res/layout-xlarge/v_loading_screen.xml new file mode 100644 index 00000000..2af6b411 --- /dev/null +++ b/app/src/main/res/layout-xlarge/v_loading_screen.xml @@ -0,0 +1,41 @@ + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout-xlarge/v_provider_header.xml b/app/src/main/res/layout-xlarge/v_provider_header.xml new file mode 100644 index 00000000..45f8302b --- /dev/null +++ b/app/src/main/res/layout-xlarge/v_provider_header.xml @@ -0,0 +1,22 @@ + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout-xlarge/v_provider_list_item.xml b/app/src/main/res/layout-xlarge/v_provider_list_item.xml new file mode 100644 index 00000000..ec1e1242 --- /dev/null +++ b/app/src/main/res/layout-xlarge/v_provider_list_item.xml @@ -0,0 +1,34 @@ + + + + + + + + + diff --git a/app/src/main/res/layout-xlarge/v_single_list_item.xml b/app/src/main/res/layout-xlarge/v_single_list_item.xml new file mode 100644 index 00000000..ad3de093 --- /dev/null +++ b/app/src/main/res/layout-xlarge/v_single_list_item.xml @@ -0,0 +1,28 @@ + + + + diff --git a/app/src/main/res/layout-xlarge/v_vpn_status.xml b/app/src/main/res/layout-xlarge/v_vpn_status.xml new file mode 100644 index 00000000..3b464b62 --- /dev/null +++ b/app/src/main/res/layout-xlarge/v_vpn_status.xml @@ -0,0 +1,52 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout-xlarge/vpnstatus.xml b/app/src/main/res/layout-xlarge/vpnstatus.xml deleted file mode 100644 index 3b464b62..00000000 --- a/app/src/main/res/layout-xlarge/vpnstatus.xml +++ /dev/null @@ -1,52 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/a_main.xml b/app/src/main/res/layout/a_main.xml new file mode 100644 index 00000000..bed05d18 --- /dev/null +++ b/app/src/main/res/layout/a_main.xml @@ -0,0 +1,42 @@ + + + + + + + + + + + + + + + + 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"> - + @@ -33,7 +33,7 @@ android:layout_height="wrap_content" android:orientation="vertical"> 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" > - + diff --git a/app/src/main/res/layout/a_provider_list.xml b/app/src/main/res/layout/a_provider_list.xml new file mode 100644 index 00000000..aa8cdfbb --- /dev/null +++ b/app/src/main/res/layout/a_provider_list.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + diff --git a/app/src/main/res/layout/about.xml b/app/src/main/res/layout/about.xml deleted file mode 100644 index aba51141..00000000 --- a/app/src/main/res/layout/about.xml +++ /dev/null @@ -1,201 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml deleted file mode 100644 index de06efc7..00000000 --- a/app/src/main/res/layout/activity_main.xml +++ /dev/null @@ -1,42 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/app/src/main/res/layout/checkbox_confirm_dialog.xml b/app/src/main/res/layout/checkbox_confirm_dialog.xml deleted file mode 100644 index 6dd22417..00000000 --- a/app/src/main/res/layout/checkbox_confirm_dialog.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/custom_notification_layout.xml b/app/src/main/res/layout/custom_notification_layout.xml deleted file mode 100644 index e97fcbe2..00000000 --- a/app/src/main/res/layout/custom_notification_layout.xml +++ /dev/null @@ -1,48 +0,0 @@ - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/d_checkbox_confirm.xml b/app/src/main/res/layout/d_checkbox_confirm.xml new file mode 100644 index 00000000..6dd22417 --- /dev/null +++ b/app/src/main/res/layout/d_checkbox_confirm.xml @@ -0,0 +1,24 @@ + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/drawer_main.xml b/app/src/main/res/layout/drawer_main.xml deleted file mode 100644 index 54614f3f..00000000 --- a/app/src/main/res/layout/drawer_main.xml +++ /dev/null @@ -1,69 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/eip_service_fragment.xml b/app/src/main/res/layout/eip_service_fragment.xml deleted file mode 100644 index e220bf16..00000000 --- a/app/src/main/res/layout/eip_service_fragment.xml +++ /dev/null @@ -1,130 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/app/src/main/res/layout/f_about.xml b/app/src/main/res/layout/f_about.xml new file mode 100644 index 00000000..aba51141 --- /dev/null +++ b/app/src/main/res/layout/f_about.xml @@ -0,0 +1,201 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/layout/f_drawer_main.xml b/app/src/main/res/layout/f_drawer_main.xml new file mode 100644 index 00000000..54614f3f --- /dev/null +++ b/app/src/main/res/layout/f_drawer_main.xml @@ -0,0 +1,69 @@ + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/f_eip.xml b/app/src/main/res/layout/f_eip.xml new file mode 100644 index 00000000..e220bf16 --- /dev/null +++ b/app/src/main/res/layout/f_eip.xml @@ -0,0 +1,130 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 @@ - - - - - diff --git a/app/src/main/res/layout/loading_screen.xml b/app/src/main/res/layout/loading_screen.xml deleted file mode 100644 index f4c7eb95..00000000 --- a/app/src/main/res/layout/loading_screen.xml +++ /dev/null @@ -1,41 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/provider_credentials.xml b/app/src/main/res/layout/provider_credentials.xml deleted file mode 100644 index 0bfdcc47..00000000 --- a/app/src/main/res/layout/provider_credentials.xml +++ /dev/null @@ -1,67 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/provider_header.xml b/app/src/main/res/layout/provider_header.xml deleted file mode 100644 index 6b08976c..00000000 --- a/app/src/main/res/layout/provider_header.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - diff --git a/app/src/main/res/layout/provider_list_activity.xml b/app/src/main/res/layout/provider_list_activity.xml deleted file mode 100644 index 6c5281b8..00000000 --- a/app/src/main/res/layout/provider_list_activity.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - - - diff --git a/app/src/main/res/layout/provider_list_item.xml b/app/src/main/res/layout/provider_list_item.xml deleted file mode 100644 index 1f0e135b..00000000 --- a/app/src/main/res/layout/provider_list_item.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - - 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 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/single_list_item.xml b/app/src/main/res/layout/single_list_item.xml deleted file mode 100644 index 652cb693..00000000 --- a/app/src/main/res/layout/single_list_item.xml +++ /dev/null @@ -1,12 +0,0 @@ - \ No newline at end of file diff --git a/app/src/main/res/layout/switch_list_item.xml b/app/src/main/res/layout/switch_list_item.xml deleted file mode 100644 index bdb9a74c..00000000 --- a/app/src/main/res/layout/switch_list_item.xml +++ /dev/null @@ -1,15 +0,0 @@ - \ No newline at end of file diff --git a/app/src/main/res/layout/v_custom_notification.xml b/app/src/main/res/layout/v_custom_notification.xml new file mode 100644 index 00000000..e97fcbe2 --- /dev/null +++ b/app/src/main/res/layout/v_custom_notification.xml @@ -0,0 +1,48 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/v_loading_screen.xml b/app/src/main/res/layout/v_loading_screen.xml new file mode 100644 index 00000000..f4c7eb95 --- /dev/null +++ b/app/src/main/res/layout/v_loading_screen.xml @@ -0,0 +1,41 @@ + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/v_provider_credentials.xml b/app/src/main/res/layout/v_provider_credentials.xml new file mode 100644 index 00000000..0bfdcc47 --- /dev/null +++ b/app/src/main/res/layout/v_provider_credentials.xml @@ -0,0 +1,67 @@ + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/v_provider_header.xml b/app/src/main/res/layout/v_provider_header.xml new file mode 100644 index 00000000..6b08976c --- /dev/null +++ b/app/src/main/res/layout/v_provider_header.xml @@ -0,0 +1,22 @@ + + + + + + + + diff --git a/app/src/main/res/layout/v_provider_list_item.xml b/app/src/main/res/layout/v_provider_list_item.xml new file mode 100644 index 00000000..1f0e135b --- /dev/null +++ b/app/src/main/res/layout/v_provider_list_item.xml @@ -0,0 +1,34 @@ + + + + + + + + + diff --git a/app/src/main/res/layout/v_single_list_item.xml b/app/src/main/res/layout/v_single_list_item.xml new file mode 100644 index 00000000..652cb693 --- /dev/null +++ b/app/src/main/res/layout/v_single_list_item.xml @@ -0,0 +1,12 @@ + \ No newline at end of file diff --git a/app/src/main/res/layout/v_switch_list_item.xml b/app/src/main/res/layout/v_switch_list_item.xml new file mode 100644 index 00000000..bdb9a74c --- /dev/null +++ b/app/src/main/res/layout/v_switch_list_item.xml @@ -0,0 +1,15 @@ + \ No newline at end of file diff --git a/app/src/main/res/layout/v_vpn_status.xml b/app/src/main/res/layout/v_vpn_status.xml new file mode 100644 index 00000000..3b464b62 --- /dev/null +++ b/app/src/main/res/layout/v_vpn_status.xml @@ -0,0 +1,52 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/vpnstatus.xml b/app/src/main/res/layout/vpnstatus.xml deleted file mode 100644 index 3b464b62..00000000 --- a/app/src/main/res/layout/vpnstatus.xml +++ /dev/null @@ -1,52 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file 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 @@ - - - - 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/d_new_provider.xml b/app/src/production/res/layout-xlarge/d_new_provider.xml new file mode 100644 index 00000000..12616625 --- /dev/null +++ b/app/src/production/res/layout-xlarge/d_new_provider.xml @@ -0,0 +1,19 @@ + + + + + + diff --git a/app/src/production/res/layout-xlarge/new_provider_dialog.xml b/app/src/production/res/layout-xlarge/new_provider_dialog.xml deleted file mode 100644 index 12616625..00000000 --- a/app/src/production/res/layout-xlarge/new_provider_dialog.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - diff --git a/app/src/production/res/layout/d_new_provider.xml b/app/src/production/res/layout/d_new_provider.xml new file mode 100644 index 00000000..36eb0d6a --- /dev/null +++ b/app/src/production/res/layout/d_new_provider.xml @@ -0,0 +1,18 @@ + + + + + + diff --git a/app/src/production/res/layout/new_provider_dialog.xml b/app/src/production/res/layout/new_provider_dialog.xml deleted file mode 100644 index 36eb0d6a..00000000 --- a/app/src/production/res/layout/new_provider_dialog.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - -- cgit v1.2.3