new year cleanup: restructure messy project

28 files changed, 44 insertions, 43 deletions

diff --git a/app/src/main/res/layout-xlarge-port/a_add_provider.xml b/app/src/main/res/layout-xlarge-port/a_add_provider.xml
index 2ec2f1b7..9d1614aa 100644
--- a/app/src/main/res/layout-xlarge-port/a_add_provider.xml
+++ b/app/src/main/res/layout-xlarge-port/a_add_provider.xml
@@ -5,7 +5,7 @@
     style="@style/BitmaskActivity"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".ProviderCredentialsBaseActivity">
+    tools:context=".providersetup.activities.ProviderCredentialsBaseActivity">
 
     <androidx.appcompat.widget.AppCompatImageView
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout-xlarge-port/a_custom_provider_setup.xml b/app/src/main/res/layout-xlarge-port/a_custom_provider_setup.xml
index 1f285968..da813a23 100644
--- a/app/src/main/res/layout-xlarge-port/a_custom_provider_setup.xml
+++ b/app/src/main/res/layout-xlarge-port/a_custom_provider_setup.xml
@@ -6,7 +6,7 @@
     style="@style/BitmaskActivity"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".CustomProviderSetupActivity">
+    tools:context=".providersetup.activities.CustomProviderSetupActivity">
 
     <androidx.appcompat.widget.AppCompatImageView
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout-xlarge-port/a_provider_credentials.xml b/app/src/main/res/layout-xlarge-port/a_provider_credentials.xml
index 73c2131c..75f6244a 100644
--- a/app/src/main/res/layout-xlarge-port/a_provider_credentials.xml
+++ b/app/src/main/res/layout-xlarge-port/a_provider_credentials.xml
@@ -5,7 +5,7 @@
     style="@style/BitmaskActivity"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".ProviderCredentialsBaseActivity">
+    tools:context=".providersetup.activities.ProviderCredentialsBaseActivity">
 
     <androidx.appcompat.widget.AppCompatImageView
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout-xlarge-port/a_provider_detail.xml b/app/src/main/res/layout-xlarge-port/a_provider_detail.xml
index cb2045c9..7d1e8444 100644
--- a/app/src/main/res/layout-xlarge-port/a_provider_detail.xml
+++ b/app/src/main/res/layout-xlarge-port/a_provider_detail.xml
@@ -5,7 +5,7 @@
     android:id="@+id/provider_list_layout"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".ProviderDetailActivity"
+    tools:context=".providersetup.ProviderDetailActivity"
     style="@style/BitmaskActivity">
 
     <androidx.appcompat.widget.AppCompatImageView
diff --git a/app/src/main/res/layout-xlarge-port/a_provider_list.xml b/app/src/main/res/layout-xlarge-port/a_provider_list.xml
index 94829b42..87ca6427 100644
--- a/app/src/main/res/layout-xlarge-port/a_provider_list.xml
+++ b/app/src/main/res/layout-xlarge-port/a_provider_list.xml
@@ -6,7 +6,7 @@
     style="@style/BitmaskActivity"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".ProviderListActivity">
+    tools:context=".providersetup.ProviderListActivity">
 
     <androidx.appcompat.widget.AppCompatImageView
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout-xlarge/a_add_provider.xml b/app/src/main/res/layout-xlarge/a_add_provider.xml
index 8cfd43c5..e4ebdadf 100644
--- a/app/src/main/res/layout-xlarge/a_add_provider.xml
+++ b/app/src/main/res/layout-xlarge/a_add_provider.xml
@@ -5,7 +5,7 @@
     style="@style/BitmaskActivity"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".ProviderCredentialsBaseActivity">
+    tools:context=".providersetup.activities.ProviderCredentialsBaseActivity">
 
     <androidx.appcompat.widget.AppCompatImageView
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout-xlarge/a_custom_provider_setup.xml b/app/src/main/res/layout-xlarge/a_custom_provider_setup.xml
index 7c9a1798..23bf7d40 100644
--- a/app/src/main/res/layout-xlarge/a_custom_provider_setup.xml
+++ b/app/src/main/res/layout-xlarge/a_custom_provider_setup.xml
@@ -6,7 +6,7 @@
     style="@style/BitmaskActivity"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".CustomProviderSetupActivity">
+    tools:context=".providersetup.activities.CustomProviderSetupActivity">
 
     <androidx.appcompat.widget.AppCompatImageView
         android:layout_width="match_parent"
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 2cf9e16a..c5b35fdc 100644
--- a/app/src/main/res/layout-xlarge/a_provider_credentials.xml
+++ b/app/src/main/res/layout-xlarge/a_provider_credentials.xml
@@ -5,7 +5,7 @@
     style="@style/BitmaskActivity"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".ProviderCredentialsBaseActivity">
+    tools:context=".providersetup.activities.ProviderCredentialsBaseActivity">
 
     <androidx.appcompat.widget.AppCompatImageView
         android:layout_width="match_parent"
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 bead7d92..59e9c18d 100644
--- a/app/src/main/res/layout-xlarge/a_provider_detail.xml
+++ b/app/src/main/res/layout-xlarge/a_provider_detail.xml
@@ -5,7 +5,7 @@
     android:id="@+id/provider_list_layout"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".ProviderDetailActivity"
+    tools:context=".providersetup.ProviderDetailActivity"
     style="@style/BitmaskActivity">
 
     <androidx.appcompat.widget.AppCompatImageView
diff --git a/app/src/main/res/layout-xlarge/a_provider_list.xml b/app/src/main/res/layout-xlarge/a_provider_list.xml
index 58d75246..6504db10 100644
--- a/app/src/main/res/layout-xlarge/a_provider_list.xml
+++ b/app/src/main/res/layout-xlarge/a_provider_list.xml
@@ -6,7 +6,7 @@
     style="@style/BitmaskActivity"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".ProviderListActivity">
+    tools:context=".providersetup.ProviderListActivity">
 
     <androidx.appcompat.widget.AppCompatImageView
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout-xlarge/f_about.xml b/app/src/main/res/layout-xlarge/f_about.xml
index 1d915da4..704a7319 100644
--- a/app/src/main/res/layout-xlarge/f_about.xml
+++ b/app/src/main/res/layout-xlarge/f_about.xml
@@ -5,7 +5,7 @@
     android:layout_height="match_parent"
     android:orientation="vertical"
     android:layout_marginLeft="12sp"
-    tools:context=".MainActivity" >
+    tools:context=".base.MainActivity" >
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout-xlarge/f_eip.xml b/app/src/main/res/layout-xlarge/f_eip.xml
index fdaab8ca..d4a51b8d 100644
--- a/app/src/main/res/layout-xlarge/f_eip.xml
+++ b/app/src/main/res/layout-xlarge/f_eip.xml
@@ -69,7 +69,7 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
-    <se.leap.bitmaskclient.views.VpnStateImage
+    <se.leap.bitmaskclient.base.views.VpnStateImage
         android:id="@+id/vpn_state_image"
         android:layout_width="0dp"
         android:layout_height="0dp"
diff --git a/app/src/main/res/layout/a_add_provider.xml b/app/src/main/res/layout/a_add_provider.xml
index eab1693e..c78db432 100644
--- a/app/src/main/res/layout/a_add_provider.xml
+++ b/app/src/main/res/layout/a_add_provider.xml
@@ -6,7 +6,7 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:padding="@dimen/stdpadding"
-    tools:context=".AddProviderActivity">
+    tools:context=".providersetup.AddProviderActivity">
 
     <LinearLayout
         android:id="@+id/content"
@@ -18,7 +18,7 @@
         android:orientation="vertical">
 
         <!-- the header contains the mask-->
-        <se.leap.bitmaskclient.views.ProviderHeaderView
+        <se.leap.bitmaskclient.base.views.ProviderHeaderView
             android:id="@+id/header"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"/>
diff --git a/app/src/main/res/layout/a_add_provider_tablet_scrollview.xml b/app/src/main/res/layout/a_add_provider_tablet_scrollview.xml
index 31c8d07c..4debbf9f 100644
--- a/app/src/main/res/layout/a_add_provider_tablet_scrollview.xml
+++ b/app/src/main/res/layout/a_add_provider_tablet_scrollview.xml
@@ -23,7 +23,7 @@
         android:layout_height="wrap_content"
         android:orientation="vertical">
 
-        <se.leap.bitmaskclient.views.ProviderHeaderView
+        <se.leap.bitmaskclient.base.views.ProviderHeaderView
             android:id="@+id/header"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"/>
diff --git a/app/src/main/res/layout/a_custom_provider_setup.xml b/app/src/main/res/layout/a_custom_provider_setup.xml
index 34c59259..782537d9 100644
--- a/app/src/main/res/layout/a_custom_provider_setup.xml
+++ b/app/src/main/res/layout/a_custom_provider_setup.xml
@@ -4,7 +4,7 @@
     android:id="@+id/custom_provider_setup_layout"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".CustomProviderSetupActivity"
+    tools:context=".providersetup.activities.CustomProviderSetupActivity"
     android:padding="@dimen/stdpadding"
     style="@style/BitmaskActivity" >
 
@@ -15,7 +15,7 @@
         android:layout_height="0dp"
         android:layout_width="0dp"
         android:id="@id/content">
-        <se.leap.bitmaskclient.views.ProviderHeaderView
+        <se.leap.bitmaskclient.base.views.ProviderHeaderView
             android:id="@+id/header"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/a_custom_provider_setup_tablet_linear_layout.xml b/app/src/main/res/layout/a_custom_provider_setup_tablet_linear_layout.xml
index 9fb67092..4879c76f 100644
--- a/app/src/main/res/layout/a_custom_provider_setup_tablet_linear_layout.xml
+++ b/app/src/main/res/layout/a_custom_provider_setup_tablet_linear_layout.xml
@@ -18,7 +18,7 @@
         android:layout_height="0dp"
         android:layout_width="0dp"
         android:id="@id/content">
-        <se.leap.bitmaskclient.views.ProviderHeaderView
+        <se.leap.bitmaskclient.base.views.ProviderHeaderView
             android:id="@+id/header"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/a_main.xml b/app/src/main/res/layout/a_main.xml
index 1977be74..4e921a9c 100644
--- a/app/src/main/res/layout/a_main.xml
+++ b/app/src/main/res/layout/a_main.xml
@@ -5,7 +5,7 @@
     android:id="@+id/drawer_layout"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context="se.leap.bitmaskclient.MainActivity">
+    tools:context="se.leap.bitmaskclient.base.MainActivity">
 
 
     <!-- As the main content view, the view below consumes the entire
@@ -34,7 +34,7 @@
          the container. -->
     <fragment
         android:id="@+id/navigation_drawer"
-        android:name="se.leap.bitmaskclient.drawer.NavigationDrawerFragment"
+        android:name="se.leap.bitmaskclient.base.drawer.NavigationDrawerFragment"
         android:layout_width="@dimen/navigation_drawer_width"
         android:layout_height="match_parent"
         android:layout_gravity="start"
diff --git a/app/src/main/res/layout/a_provider_credentials.xml b/app/src/main/res/layout/a_provider_credentials.xml
index 93f44208..b5dfa088 100644
--- a/app/src/main/res/layout/a_provider_credentials.xml
+++ b/app/src/main/res/layout/a_provider_credentials.xml
@@ -16,7 +16,7 @@
         android:layout_height="match_parent"
         >
 
-        <se.leap.bitmaskclient.views.ProviderHeaderView
+        <se.leap.bitmaskclient.base.views.ProviderHeaderView
             android:id="@+id/header"
             android:layout_width="match_parent"
             android:layout_height="wrap_content" />
diff --git a/app/src/main/res/layout/a_provider_credentials_tablet_linear_layout.xml b/app/src/main/res/layout/a_provider_credentials_tablet_linear_layout.xml
index bf022d51..ea0b6dd4 100644
--- a/app/src/main/res/layout/a_provider_credentials_tablet_linear_layout.xml
+++ b/app/src/main/res/layout/a_provider_credentials_tablet_linear_layout.xml
@@ -23,7 +23,7 @@
         android:id="@+id/content"
         android:orientation="vertical">
 
-        <se.leap.bitmaskclient.views.ProviderHeaderView
+        <se.leap.bitmaskclient.base.views.ProviderHeaderView
             android:id="@+id/header"
             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 840d60df..bdc17ee9 100644
--- a/app/src/main/res/layout/a_provider_detail.xml
+++ b/app/src/main/res/layout/a_provider_detail.xml
@@ -15,7 +15,7 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
-        <se.leap.bitmaskclient.views.ProviderHeaderView
+        <se.leap.bitmaskclient.base.views.ProviderHeaderView
             android:id="@+id/header"
             android:layout_width="match_parent"
             android:layout_height="wrap_content" />
diff --git a/app/src/main/res/layout/a_provider_detail_tablet_linear_layout.xml b/app/src/main/res/layout/a_provider_detail_tablet_linear_layout.xml
index 51c5ab0f..0c7e02d1 100644
--- a/app/src/main/res/layout/a_provider_detail_tablet_linear_layout.xml
+++ b/app/src/main/res/layout/a_provider_detail_tablet_linear_layout.xml
@@ -23,7 +23,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
 
-        <se.leap.bitmaskclient.views.ProviderHeaderView
+        <se.leap.bitmaskclient.base.views.ProviderHeaderView
             android:id="@+id/header"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"/>
diff --git a/app/src/main/res/layout/a_provider_list.xml b/app/src/main/res/layout/a_provider_list.xml
index 2e2573eb..5d7efae7 100644
--- a/app/src/main/res/layout/a_provider_list.xml
+++ b/app/src/main/res/layout/a_provider_list.xml
@@ -3,7 +3,7 @@
     android:id="@+id/provider_list_layout"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".ProviderListActivity"
+    tools:context=".providersetup.ProviderListActivity"
     android:padding="@dimen/stdpadding"
     style="@style/BitmaskActivity" >
 
@@ -15,7 +15,7 @@
         android:layout_height="match_parent"
         android:orientation="vertical">
 
-        <se.leap.bitmaskclient.views.ProviderHeaderView
+        <se.leap.bitmaskclient.base.views.ProviderHeaderView
             android:id="@+id/header"
             android:layout_width="match_parent"
             android:layout_height="wrap_content" />
diff --git a/app/src/main/res/layout/a_provider_list_tablet_linear_layout.xml b/app/src/main/res/layout/a_provider_list_tablet_linear_layout.xml
index 107f25fb..487edd1d 100644
--- a/app/src/main/res/layout/a_provider_list_tablet_linear_layout.xml
+++ b/app/src/main/res/layout/a_provider_list_tablet_linear_layout.xml
@@ -22,7 +22,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
 
-        <se.leap.bitmaskclient.views.ProviderHeaderView
+        <se.leap.bitmaskclient.base.views.ProviderHeaderView
             android:id="@+id/header"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"/>
diff --git a/app/src/main/res/layout/d_checkbox_confirm.xml b/app/src/main/res/layout/d_checkbox_confirm.xml
index b2b61eca..f8aace6e 100644
--- a/app/src/main/res/layout/d_checkbox_confirm.xml
+++ b/app/src/main/res/layout/d_checkbox_confirm.xml
@@ -24,7 +24,7 @@
             android:textStyle="bold"
             />
 
-        <se.leap.bitmaskclient.views.IconTextView
+        <se.leap.bitmaskclient.base.views.IconTextView
             android:id="@+id/user_message"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/f_about.xml b/app/src/main/res/layout/f_about.xml
index 22053054..ec7369ef 100644
--- a/app/src/main/res/layout/f_about.xml
+++ b/app/src/main/res/layout/f_about.xml
@@ -5,7 +5,7 @@
     android:layout_height="match_parent"
     android:orientation="vertical"
     android:layout_marginLeft="8sp"
-    tools:context=".MainActivity" >
+    tools:context=".base.MainActivity" >
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/f_drawer_main.xml b/app/src/main/res/layout/f_drawer_main.xml
index 5a0977da..be60e620 100644
--- a/app/src/main/res/layout/f_drawer_main.xml
+++ b/app/src/main/res/layout/f_drawer_main.xml
@@ -4,7 +4,7 @@
     android:layout_height="match_parent"
     android:layout_width="match_parent"
     android:background="@color/colorBackground"
-    tools:context="se.leap.bitmaskclient.drawer.NavigationDrawerFragment"
+    tools:context=".base.drawer.NavigationDrawerFragment"
     android:clickable="true"
     android:focusable="true"
     android:fillViewport="true"
@@ -37,13 +37,13 @@
                 app:srcCompat="@drawable/drawer_logo" />
         </FrameLayout>
 
-        <se.leap.bitmaskclient.views.IconTextEntry
+        <se.leap.bitmaskclient.base.views.IconTextEntry
             android:id="@+id/account"
             android:layout_height="wrap_content"
             android:layout_width="wrap_content"
             />
 
-        <se.leap.bitmaskclient.views.IconTextEntry
+        <se.leap.bitmaskclient.base.views.IconTextEntry
             android:id="@+id/switch_provider"
             android:layout_height="wrap_content"
             android:layout_width="wrap_content"
@@ -60,7 +60,7 @@
             android:background="@color/black800_high_transparent"
             />
 
-        <se.leap.bitmaskclient.views.IconSwitchEntry
+        <se.leap.bitmaskclient.base.views.IconSwitchEntry
             android:id="@+id/battery_switch"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -69,7 +69,7 @@
             app:icon="@drawable/ic_battery_36"
             />
 
-        <se.leap.bitmaskclient.views.IconSwitchEntry
+        <se.leap.bitmaskclient.base.views.IconSwitchEntry
             android:id="@+id/bridges_switch"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -79,7 +79,7 @@
             android:visibility="gone"
             />
 
-        <se.leap.bitmaskclient.views.IconTextEntry
+        <se.leap.bitmaskclient.base.views.IconTextEntry
             android:id="@+id/always_on_vpn"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -89,7 +89,7 @@
             android:visibility="gone"
             />
 
-        <se.leap.bitmaskclient.views.IconTextEntry
+        <se.leap.bitmaskclient.base.views.IconTextEntry
             android:id="@+id/exclude_apps"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -110,7 +110,7 @@
             android:background="@color/black800_high_transparent"
             />
 
-        <se.leap.bitmaskclient.views.IconSwitchEntry
+        <se.leap.bitmaskclient.base.views.IconSwitchEntry
             android:id="@+id/enableIPv6Firewall"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -121,7 +121,7 @@
             tools:visibility="visible"
             />
 
-        <se.leap.bitmaskclient.views.IconTextEntry
+        <se.leap.bitmaskclient.base.views.IconTextEntry
             android:id="@+id/tethering"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -141,7 +141,7 @@
             tools:visibility="visible"
             />
 
-        <se.leap.bitmaskclient.views.IconTextEntry
+        <se.leap.bitmaskclient.base.views.IconTextEntry
             android:id="@+id/donate"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -150,7 +150,7 @@
             android:visibility="gone"
             />
 
-        <se.leap.bitmaskclient.views.IconTextEntry
+        <se.leap.bitmaskclient.base.views.IconTextEntry
             android:id="@+id/log"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -158,7 +158,7 @@
             app:icon="@drawable/ic_log_36"
             />
 
-        <se.leap.bitmaskclient.views.IconTextEntry
+        <se.leap.bitmaskclient.base.views.IconTextEntry
             android:id="@+id/about"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/f_eip.xml b/app/src/main/res/layout/f_eip.xml
index 01feb0cd..3309eb5d 100644
--- a/app/src/main/res/layout/f_eip.xml
+++ b/app/src/main/res/layout/f_eip.xml
@@ -70,7 +70,7 @@
         app:layout_constraintTop_toTopOf="parent" />
 
 
-    <se.leap.bitmaskclient.views.VpnStateImage
+    <se.leap.bitmaskclient.base.views.VpnStateImage
         android:id="@+id/vpn_state_image"
         android:layout_width="0dp"
         android:layout_height="0dp"
diff --git a/app/src/main/res/values/untranslatable.xml b/app/src/main/res/values/untranslatable.xml
index 0d680b96..9c6afadd 100644
--- a/app/src/main/res/values/untranslatable.xml
+++ b/app/src/main/res/values/untranslatable.xml
@@ -44,4 +44,5 @@
     <string name="circleImageView" translatable="false">CircleImageView</string>
     <string name="copyright_circleImageView" translatable="false">Copyright 2014 - 2020 Henning Dodenhof. Licensed under the Apache License, Version 2.0 </string>
 
-</resources>
+
+</resources>
\ No newline at end of file