diff --git a/app/src/main/java/com/github/dfa/diaspora_android/activity/AboutActivity.java b/app/src/main/java/com/github/dfa/diaspora_android/activity/AboutActivity.java index 492dcc55..f2c46bdd 100644 --- a/app/src/main/java/com/github/dfa/diaspora_android/activity/AboutActivity.java +++ b/app/src/main/java/com/github/dfa/diaspora_android/activity/AboutActivity.java @@ -71,7 +71,7 @@ public class AboutActivity extends AppCompatActivity { @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - setContentView(R.layout.activity_about); + setContentView(R.layout.about__activity); ButterKnife.bind(this); setSupportActionBar(toolbar); @@ -111,7 +111,7 @@ public class AboutActivity extends AppCompatActivity { @Override public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { - View rootView = inflater.inflate(R.layout.fragment_about, container, false); + View rootView = inflater.inflate(R.layout.about__fragment_about, container, false); TextView appVersion = (TextView) rootView.findViewById(R.id.fragment_about__app_version); if (isAdded()) { @@ -143,7 +143,7 @@ public class AboutActivity extends AppCompatActivity { @Override public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { - View rootView = inflater.inflate(R.layout.fragment_license, container, false); + View rootView = inflater.inflate(R.layout.about__fragment_license, container, false); ButterKnife.bind(this, rootView); final Context context = rootView.getContext(); accentColor = Helpers.hexColorFromRessourceColor(context, R.color.colorAccent); @@ -201,7 +201,7 @@ public class AboutActivity extends AppCompatActivity { @Override public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { - View rootView = inflater.inflate(R.layout.fragment_debug, container, false); + View rootView = inflater.inflate(R.layout.about__fragment_debug, container, false); TextView packageName = (TextView) rootView.findViewById(R.id.fragment_debug__package_name); TextView appVersion = (TextView) rootView.findViewById(R.id.fragment_debug__app_version); TextView osVersion = (TextView) rootView.findViewById(R.id.fragment_debug__android_version); diff --git a/app/src/main/java/com/github/dfa/diaspora_android/activity/MainActivity.java b/app/src/main/java/com/github/dfa/diaspora_android/activity/MainActivity.java index 5a257e21..c736489e 100644 --- a/app/src/main/java/com/github/dfa/diaspora_android/activity/MainActivity.java +++ b/app/src/main/java/com/github/dfa/diaspora_android/activity/MainActivity.java @@ -235,7 +235,7 @@ public class MainActivity extends AppCompatActivity boolean newWebView = (webView == null); if (newWebView) { AppLog.v(this, "WebView was null. Create new one."); - View webviewHolder = getLayoutInflater().inflate(R.layout.webview, this.contentLayout, false); + View webviewHolder = getLayoutInflater().inflate(R.layout.ui__webview, this.contentLayout, false); this.webView = (ContextMenuWebView) webviewHolder.findViewById(R.id.webView); ((LinearLayout) webView.getParent()).removeView(webView); setupWebView(savedInstanceState); @@ -840,7 +840,7 @@ public class MainActivity extends AppCompatActivity if (WebHelper.isOnline(MainActivity.this)) { final InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE); - View layout = getLayoutInflater().inflate(R.layout.dialog_search__people_tags, null, false); + View layout = getLayoutInflater().inflate(R.layout.ui__dialog_search__people_tags, null, false); final EditText input = (EditText) layout.findViewById(R.id.dialog_search__input); final DialogInterface.OnClickListener clickListener = new DialogInterface.OnClickListener() { @Override @@ -1249,7 +1249,7 @@ public class MainActivity extends AppCompatActivity AppLog.v(this, "Apply NetCipher proxy settings"); NetCipher.setProxy(host, port); //Proxy for HttpsUrlConnections try { - //Proxy for the webview + //Proxy for the ui__webview AppLog.v(this, "Apply Webkit proxy settings"); WebkitProxy.setProxy(MainActivity.class.getName(), getApplicationContext(), null, host, port); } catch (Exception e) { diff --git a/app/src/main/java/com/github/dfa/diaspora_android/activity/PodSelectionActivity.java b/app/src/main/java/com/github/dfa/diaspora_android/activity/PodSelectionActivity.java index ec307c92..9729b8e4 100644 --- a/app/src/main/java/com/github/dfa/diaspora_android/activity/PodSelectionActivity.java +++ b/app/src/main/java/com/github/dfa/diaspora_android/activity/PodSelectionActivity.java @@ -224,7 +224,7 @@ public class PodSelectionActivity extends AppCompatActivity { @Override public boolean onCreateOptionsMenu(Menu menu) { - getMenuInflater().inflate(R.menu.pods__menu, menu); + getMenuInflater().inflate(R.menu.podselection__menu, menu); return true; } diff --git a/app/src/main/java/com/github/dfa/diaspora_android/receivers/UpdateTitleReceiver.java b/app/src/main/java/com/github/dfa/diaspora_android/receivers/UpdateTitleReceiver.java index c722baac..10ddc5f5 100644 --- a/app/src/main/java/com/github/dfa/diaspora_android/receivers/UpdateTitleReceiver.java +++ b/app/src/main/java/com/github/dfa/diaspora_android/receivers/UpdateTitleReceiver.java @@ -12,7 +12,7 @@ import com.github.dfa.diaspora_android.util.AppLog; import com.github.dfa.diaspora_android.util.DiasporaUrlHelper; /** - * BroadcastReceiver used to update the title of the MainActivity depending on the url of the webview + * BroadcastReceiver used to update the title of the MainActivity depending on the url of the ui__webview * Created by vanitas on 11.09.16. */ public class UpdateTitleReceiver extends BroadcastReceiver { diff --git a/app/src/main/java/com/github/dfa/diaspora_android/util/CustomTabHelpers/CustomTabActivityHelper.java b/app/src/main/java/com/github/dfa/diaspora_android/util/CustomTabHelpers/CustomTabActivityHelper.java index 9e14c748..e43ce0b0 100644 --- a/app/src/main/java/com/github/dfa/diaspora_android/util/CustomTabHelpers/CustomTabActivityHelper.java +++ b/app/src/main/java/com/github/dfa/diaspora_android/util/CustomTabHelpers/CustomTabActivityHelper.java @@ -37,7 +37,7 @@ public class CustomTabActivityHelper { String packageName = CustomTabsHelper.getPackageNameToUse(activity); //If we cant find a package name, it means there's no browser that supports - //Chrome Custom Tabs installed. So, we fallback to the webview + //Chrome Custom Tabs installed. So, we fallback to the ui__webview if (packageName == null) { if (fallback != null) { fallback.openUri(activity, uri); diff --git a/app/src/main/res/layout/activity_about.xml b/app/src/main/res/layout/about__activity.xml similarity index 100% rename from app/src/main/res/layout/activity_about.xml rename to app/src/main/res/layout/about__activity.xml diff --git a/app/src/main/res/layout/fragment_about.xml b/app/src/main/res/layout/about__fragment_about.xml similarity index 100% rename from app/src/main/res/layout/fragment_about.xml rename to app/src/main/res/layout/about__fragment_about.xml diff --git a/app/src/main/res/layout/fragment_debug.xml b/app/src/main/res/layout/about__fragment_debug.xml similarity index 100% rename from app/src/main/res/layout/fragment_debug.xml rename to app/src/main/res/layout/about__fragment_debug.xml diff --git a/app/src/main/res/layout/fragment_license.xml b/app/src/main/res/layout/about__fragment_license.xml similarity index 100% rename from app/src/main/res/layout/fragment_license.xml rename to app/src/main/res/layout/about__fragment_license.xml diff --git a/app/src/main/res/layout/dialog_search__people_tags.xml b/app/src/main/res/layout/ui__dialog_search__people_tags.xml similarity index 100% rename from app/src/main/res/layout/dialog_search__people_tags.xml rename to app/src/main/res/layout/ui__dialog_search__people_tags.xml diff --git a/app/src/main/res/layout/webview.xml b/app/src/main/res/layout/ui__webview.xml similarity index 100% rename from app/src/main/res/layout/webview.xml rename to app/src/main/res/layout/ui__webview.xml diff --git a/app/src/main/res/menu/pods__menu.xml b/app/src/main/res/menu/podselection__menu.xml similarity index 100% rename from app/src/main/res/menu/pods__menu.xml rename to app/src/main/res/menu/podselection__menu.xml diff --git a/app/src/main/res/values/strings-preferences.xml b/app/src/main/res/values/strings-preferences.xml index 9e367342..fe4e728b 100644 --- a/app/src/main/res/values/strings-preferences.xml +++ b/app/src/main/res/values/strings-preferences.xml @@ -81,6 +81,8 @@ Disable image loading to safe mobile data + Proxy + @string/pref_desc__proxy_enabled Enable Proxy Proxy Diaspora\'s traffic to circumvent firewalls.\nMay require restart Host diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml index 6c6308a3..4bbc7b4c 100644 --- a/app/src/main/res/xml/preferences.xml +++ b/app/src/main/res/xml/preferences.xml @@ -125,21 +125,26 @@ android:summary="@string/pref_desc__clear_cache" android:title="@string/pref_title__clear_cache"/> - - - + + + + + +