diff --git a/.atomignore b/.atomignore index b8a393b..90fece1 100755 --- a/.atomignore +++ b/.atomignore @@ -1,8 +1,2 @@ -crowdin.yaml -diaspora-android.iml -gradle -gradle.properties -gradlew -gradlew.bat local.properties -.gradle/ +/.gradle/* diff --git a/.gitignore b/.gitignore index 51b5ac3..5e0f983 100755 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,2 @@ -crowdin.yaml -diaspora-android.iml -gradle -gradle.properties -gradlew -gradlew.bat +/.gradle/* local.properties diff --git a/.gradle/4.4/fileChanges/last-build.bin b/.gradle/4.4/fileChanges/last-build.bin deleted file mode 100644 index f76dd23..0000000 Binary files a/.gradle/4.4/fileChanges/last-build.bin and /dev/null differ diff --git a/.gradle/4.4/fileContent/fileContent.lock b/.gradle/4.4/fileContent/fileContent.lock deleted file mode 100644 index 5fcc1eb..0000000 Binary files a/.gradle/4.4/fileContent/fileContent.lock and /dev/null differ diff --git a/.gradle/4.4/fileHashes/fileHashes.bin b/.gradle/4.4/fileHashes/fileHashes.bin deleted file mode 100644 index 952b339..0000000 Binary files a/.gradle/4.4/fileHashes/fileHashes.bin and /dev/null differ diff --git a/.gradle/4.4/fileHashes/fileHashes.lock b/.gradle/4.4/fileHashes/fileHashes.lock deleted file mode 100644 index 6a02d7b..0000000 Binary files a/.gradle/4.4/fileHashes/fileHashes.lock and /dev/null differ diff --git a/.gradle/4.4/fileHashes/resourceHashesCache.bin b/.gradle/4.4/fileHashes/resourceHashesCache.bin deleted file mode 100644 index 56a64a8..0000000 Binary files a/.gradle/4.4/fileHashes/resourceHashesCache.bin and /dev/null differ diff --git a/.gradle/4.4/javaCompile/classAnalysis.bin b/.gradle/4.4/javaCompile/classAnalysis.bin deleted file mode 100644 index 9e96213..0000000 Binary files a/.gradle/4.4/javaCompile/classAnalysis.bin and /dev/null differ diff --git a/.gradle/4.4/javaCompile/jarAnalysis.bin b/.gradle/4.4/javaCompile/jarAnalysis.bin deleted file mode 100644 index c781bed..0000000 Binary files a/.gradle/4.4/javaCompile/jarAnalysis.bin and /dev/null differ diff --git a/.gradle/4.4/javaCompile/javaCompile.lock b/.gradle/4.4/javaCompile/javaCompile.lock deleted file mode 100644 index d666602..0000000 Binary files a/.gradle/4.4/javaCompile/javaCompile.lock and /dev/null differ diff --git a/.gradle/4.4/javaCompile/taskHistory.bin b/.gradle/4.4/javaCompile/taskHistory.bin deleted file mode 100644 index 71914f5..0000000 Binary files a/.gradle/4.4/javaCompile/taskHistory.bin and /dev/null differ diff --git a/.gradle/4.4/javaCompile/taskJars.bin b/.gradle/4.4/javaCompile/taskJars.bin deleted file mode 100644 index 83b6ebb..0000000 Binary files a/.gradle/4.4/javaCompile/taskJars.bin and /dev/null differ diff --git a/.gradle/4.4/taskHistory/taskHistory.bin b/.gradle/4.4/taskHistory/taskHistory.bin deleted file mode 100644 index e06e59b..0000000 Binary files a/.gradle/4.4/taskHistory/taskHistory.bin and /dev/null differ diff --git a/.gradle/4.4/taskHistory/taskHistory.lock b/.gradle/4.4/taskHistory/taskHistory.lock deleted file mode 100644 index d50e5e9..0000000 Binary files a/.gradle/4.4/taskHistory/taskHistory.lock and /dev/null differ diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock index 15a2993..2d2d966 100644 Binary files a/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ diff --git a/.gradle/buildOutputCleanup/cache.properties b/.gradle/buildOutputCleanup/cache.properties index 131893b..774a7f9 100644 --- a/.gradle/buildOutputCleanup/cache.properties +++ b/.gradle/buildOutputCleanup/cache.properties @@ -1,2 +1,2 @@ -#Sat Jun 16 12:09:21 CEST 2018 -gradle.version=4.4 +#Sun Jun 17 09:50:40 CEST 2018 +gradle.version=4.8 diff --git a/.gradle/buildOutputCleanup/outputFiles.bin b/.gradle/buildOutputCleanup/outputFiles.bin index b34be0b..c538c12 100644 Binary files a/.gradle/buildOutputCleanup/outputFiles.bin and b/.gradle/buildOutputCleanup/outputFiles.bin differ diff --git a/app/.gitignore b/app/.gitignore index 796b96d..e69de29 100644 --- a/app/.gitignore +++ b/app/.gitignore @@ -1 +0,0 @@ -/build diff --git a/app/build.gradle b/app/build.gradle index b97684f..8450f9c 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -16,9 +16,9 @@ android { buildConfigField "boolean", "IS_GPLAY_BUILD", "false" buildConfigField "String[]", "DETECTED_ANDROID_LOCALES", "${findUsedAndroidLocales()}" buildConfigField "String", "GITHASH", "\"${getGitHash()}\"" - resValue "string", "manifest_package_id", "com.github.dfa.hubzilla_android" + resValue "string", "manifest_package_id", "com.dfa.hubzilla_android" - applicationId "com.github.dfa.hubzilla_android" + applicationId "com.dfa.hubzilla_android" versionName "0.0.1" versionCode 32 diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index c979e0f..56a75f1 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,7 +1,7 @@ @@ -11,14 +11,14 @@ @@ -33,25 +33,25 @@ android:resource="@xml/file_provider_paths" /> . */ -package com.github.dfa.hubzilla_android; +package com.dfa.hubzilla_android; import android.app.Application; import android.content.Context; @@ -28,13 +28,13 @@ import android.webkit.CookieManager; import android.webkit.CookieSyncManager; import android.webkit.WebView; -import com.github.dfa.hubzilla_android.data.DiasporaUserProfile; -import com.github.dfa.hubzilla_android.service.AvatarImageLoader; -import com.github.dfa.hubzilla_android.util.AppLog; -import com.github.dfa.hubzilla_android.util.AppSettings; -import com.github.dfa.hubzilla_android.util.DiasporaUrlHelper; +import com.dfa.hubzilla_android.data.DiasporaUserProfile; +import com.dfa.hubzilla_android.service.AvatarImageLoader; +import com.dfa.hubzilla_android.util.AppLog; +import com.dfa.hubzilla_android.util.AppSettings; +import com.dfa.hubzilla_android.util.DiasporaUrlHelper; -import net.gsantner.opoc.util.AdBlock; +import net.opoc.util.AdBlock; public class App extends Application { private volatile static App app; diff --git a/app/src/main/java/com/github/dfa/hubzilla_android/activity/AboutActivity.java b/app/src/main/java/com/dfa/hubzilla_android/activity/AboutActivity.java similarity index 94% rename from app/src/main/java/com/github/dfa/hubzilla_android/activity/AboutActivity.java rename to app/src/main/java/com/dfa/hubzilla_android/activity/AboutActivity.java index 2b1d421..2e5dc75 100644 --- a/app/src/main/java/com/github/dfa/hubzilla_android/activity/AboutActivity.java +++ b/app/src/main/java/com/dfa/hubzilla_android/activity/AboutActivity.java @@ -16,7 +16,7 @@ If not, see . */ -package com.github.dfa.hubzilla_android.activity; +package com.dfa.hubzilla_android.activity; import android.content.ClipData; import android.content.ClipboardManager; @@ -42,16 +42,16 @@ import android.widget.LinearLayout; import android.widget.TextView; import android.widget.Toast; -import com.github.dfa.hubzilla_android.App; -import com.github.dfa.hubzilla_android.R; -import com.github.dfa.hubzilla_android.listener.IntellihideToolbarActivityListener; -import com.github.dfa.hubzilla_android.ui.HtmlTextView; -import com.github.dfa.hubzilla_android.ui.theme.ThemeHelper; -import com.github.dfa.hubzilla_android.ui.theme.ThemedActivity; -import com.github.dfa.hubzilla_android.ui.theme.ThemedFragment; -import com.github.dfa.hubzilla_android.util.AppLog; -import com.github.dfa.hubzilla_android.util.AppSettings; -import com.github.dfa.hubzilla_android.util.ContextUtils; +import com.dfa.hubzilla_android.App; +import com.dfa.hubzilla_android.R; +import com.dfa.hubzilla_android.listener.IntellihideToolbarActivityListener; +import com.dfa.hubzilla_android.ui.HtmlTextView; +import com.dfa.hubzilla_android.ui.theme.ThemeHelper; +import com.dfa.hubzilla_android.ui.theme.ThemedActivity; +import com.dfa.hubzilla_android.ui.theme.ThemedFragment; +import com.dfa.hubzilla_android.util.AppLog; +import com.dfa.hubzilla_android.util.AppSettings; +import com.dfa.hubzilla_android.util.ContextUtils; import java.util.Observable; import java.util.Observer; @@ -134,7 +134,7 @@ public class AboutActivity extends ThemedActivity */ public static class AboutFragment extends ThemedFragment { - public static final String TAG = "com.github.dfa.hubzilla_android.AboutActivity.AboutFragment"; + public static final String TAG = "com.dfa.hubzilla_android.AboutActivity.AboutFragment"; @BindView(R.id.fragment_about__app_version) TextView appVersion; @@ -224,7 +224,7 @@ public class AboutActivity extends ThemedActivity * Fragment that shows information about the license of the app and used 3rd party libraries */ public static class LicenseFragment extends ThemedFragment { - public static final String TAG = "com.github.dfa.hubzilla_android.AboutActivity.LicenseFragment"; + public static final String TAG = "com.dfa.hubzilla_android.AboutActivity.LicenseFragment"; @BindView(R.id.fragment_license__maintainers_text) HtmlTextView maintainers; @@ -302,7 +302,7 @@ public class AboutActivity extends ThemedActivity * Fragment that shows debug information like app version, pod version... */ public static class DebugFragment extends Fragment implements Observer { - public static final String TAG = "com.github.dfa.hubzilla_android.AboutActivity.DebugFragment"; + public static final String TAG = "com.dfa.hubzilla_android.AboutActivity.DebugFragment"; @BindView(R.id.fragment_debug__package_name) TextView packageName; diff --git a/app/src/main/java/com/github/dfa/hubzilla_android/activity/AspectListFragment.java b/app/src/main/java/com/dfa/hubzilla_android/activity/AspectListFragment.java similarity index 92% rename from app/src/main/java/com/github/dfa/hubzilla_android/activity/AspectListFragment.java rename to app/src/main/java/com/dfa/hubzilla_android/activity/AspectListFragment.java index f6bd944..5df3e3c 100644 --- a/app/src/main/java/com/github/dfa/hubzilla_android/activity/AspectListFragment.java +++ b/app/src/main/java/com/dfa/hubzilla_android/activity/AspectListFragment.java @@ -16,7 +16,7 @@ If not, see . */ -package com.github.dfa.hubzilla_android.activity; +package com.dfa.hubzilla_android.activity; import android.content.Context; import android.graphics.Color; @@ -32,14 +32,14 @@ import android.view.ViewGroup; import android.widget.RelativeLayout; import android.widget.TextView; -import com.github.dfa.hubzilla_android.App; -import com.github.dfa.hubzilla_android.R; -import com.github.dfa.hubzilla_android.data.DiasporaAspect; -import com.github.dfa.hubzilla_android.listener.OnSomethingClickListener; -import com.github.dfa.hubzilla_android.ui.theme.ThemedFragment; -import com.github.dfa.hubzilla_android.util.AppSettings; -import com.github.dfa.hubzilla_android.util.ContextUtils; -import com.github.dfa.hubzilla_android.util.DiasporaUrlHelper; +import com.dfa.hubzilla_android.App; +import com.dfa.hubzilla_android.R; +import com.dfa.hubzilla_android.data.DiasporaAspect; +import com.dfa.hubzilla_android.listener.OnSomethingClickListener; +import com.dfa.hubzilla_android.ui.theme.ThemedFragment; +import com.dfa.hubzilla_android.util.AppSettings; +import com.dfa.hubzilla_android.util.ContextUtils; +import com.dfa.hubzilla_android.util.DiasporaUrlHelper; import java.util.ArrayList; import java.util.Arrays; @@ -53,7 +53,7 @@ import butterknife.ButterKnife; */ public class AspectListFragment extends ThemedFragment implements OnSomethingClickListener { - public static final String TAG = "com.github.dfa.hubzilla_android.AspectListFragment"; + public static final String TAG = "com.dfa.hubzilla_android.AspectListFragment"; @BindView(R.id.fragment_list__recycler_view) public RecyclerView aspectsRecyclerView; diff --git a/app/src/main/java/com/github/dfa/hubzilla_android/activity/DiasporaStreamFragment.java b/app/src/main/java/com/dfa/hubzilla_android/activity/DiasporaStreamFragment.java similarity index 94% rename from app/src/main/java/com/github/dfa/hubzilla_android/activity/DiasporaStreamFragment.java rename to app/src/main/java/com/dfa/hubzilla_android/activity/DiasporaStreamFragment.java index 64f7cd5..7e6994c 100644 --- a/app/src/main/java/com/github/dfa/hubzilla_android/activity/DiasporaStreamFragment.java +++ b/app/src/main/java/com/dfa/hubzilla_android/activity/DiasporaStreamFragment.java @@ -16,7 +16,7 @@ If not, see . */ -package com.github.dfa.hubzilla_android.activity; +package com.dfa.hubzilla_android.activity; import android.Manifest; import android.animation.ObjectAnimator; @@ -42,22 +42,22 @@ import android.webkit.WebChromeClient; import android.webkit.WebView; import android.widget.Toast; -import com.github.dfa.hubzilla_android.App; -import com.github.dfa.hubzilla_android.BuildConfig; -import com.github.dfa.hubzilla_android.R; -import com.github.dfa.hubzilla_android.data.DiasporaUserProfile; -import com.github.dfa.hubzilla_android.ui.theme.ThemedAlertDialogBuilder; -import com.github.dfa.hubzilla_android.util.AppLog; -import com.github.dfa.hubzilla_android.util.AppSettings; -import com.github.dfa.hubzilla_android.util.ContextUtils; -import com.github.dfa.hubzilla_android.util.DiasporaUrlHelper; -import com.github.dfa.hubzilla_android.web.BrowserFragment; -import com.github.dfa.hubzilla_android.web.DiasporaStreamWebChromeClient; -import com.github.dfa.hubzilla_android.web.FileUploadWebChromeClient; -import com.github.dfa.hubzilla_android.web.WebHelper; +import com.dfa.hubzilla_android.App; +import com.dfa.hubzilla_android.BuildConfig; +import com.dfa.hubzilla_android.R; +import com.dfa.hubzilla_android.data.DiasporaUserProfile; +import com.dfa.hubzilla_android.ui.theme.ThemedAlertDialogBuilder; +import com.dfa.hubzilla_android.util.AppLog; +import com.dfa.hubzilla_android.util.AppSettings; +import com.dfa.hubzilla_android.util.ContextUtils; +import com.dfa.hubzilla_android.util.DiasporaUrlHelper; +import com.dfa.hubzilla_android.web.BrowserFragment; +import com.dfa.hubzilla_android.web.DiasporaStreamWebChromeClient; +import com.dfa.hubzilla_android.web.FileUploadWebChromeClient; +import com.dfa.hubzilla_android.web.WebHelper; -import net.gsantner.opoc.util.PermissionChecker; -import net.gsantner.opoc.util.ShareUtil; +import net.opoc.util.PermissionChecker; +import net.opoc.util.ShareUtil; import org.json.JSONException; @@ -71,7 +71,7 @@ import java.util.Date; */ public class DiasporaStreamFragment extends BrowserFragment { - public static final String TAG = "com.github.dfa.hubzilla_android.StreamFragment"; + public static final String TAG = "com.dfa.hubzilla_android.StreamFragment"; protected DiasporaUrlHelper urls; diff --git a/app/src/main/java/com/github/dfa/hubzilla_android/activity/MainActivity.java b/app/src/main/java/com/dfa/hubzilla_android/activity/MainActivity.java similarity index 95% rename from app/src/main/java/com/github/dfa/hubzilla_android/activity/MainActivity.java rename to app/src/main/java/com/dfa/hubzilla_android/activity/MainActivity.java index 9670dcb..c646e79 100644 --- a/app/src/main/java/com/github/dfa/hubzilla_android/activity/MainActivity.java +++ b/app/src/main/java/com/dfa/hubzilla_android/activity/MainActivity.java @@ -16,7 +16,7 @@ If not, see . */ -package com.github.dfa.hubzilla_android.activity; +package com.dfa.hubzilla_android.activity; import android.annotation.SuppressLint; import android.content.BroadcastReceiver; @@ -60,34 +60,34 @@ import android.widget.RelativeLayout; import android.widget.TextView; import android.widget.Toast; -import com.github.dfa.hubzilla_android.App; -import com.github.dfa.hubzilla_android.BuildConfig; -import com.github.dfa.hubzilla_android.R; -import com.github.dfa.hubzilla_android.data.DiasporaPodList; -import com.github.dfa.hubzilla_android.data.DiasporaUserProfile; -import com.github.dfa.hubzilla_android.listener.DiasporaUserProfileChangedListener; -import com.github.dfa.hubzilla_android.listener.IntellihideToolbarActivityListener; -import com.github.dfa.hubzilla_android.receiver.OpenExternalLinkReceiver; -import com.github.dfa.hubzilla_android.receiver.UpdateTitleReceiver; -import com.github.dfa.hubzilla_android.ui.BadgeDrawable; -import com.github.dfa.hubzilla_android.ui.PodSelectionDialog; -import com.github.dfa.hubzilla_android.ui.theme.ThemeHelper; -import com.github.dfa.hubzilla_android.ui.theme.ThemedActivity; -import com.github.dfa.hubzilla_android.ui.theme.ThemedAlertDialogBuilder; -import com.github.dfa.hubzilla_android.ui.theme.ThemedFragment; -import com.github.dfa.hubzilla_android.util.ActivityUtils; -import com.github.dfa.hubzilla_android.util.AndroidBug5497Workaround; -import com.github.dfa.hubzilla_android.util.AppLog; -import com.github.dfa.hubzilla_android.util.AppSettings; -import com.github.dfa.hubzilla_android.util.ContextUtils; -import com.github.dfa.hubzilla_android.util.DiasporaUrlHelper; -import com.github.dfa.hubzilla_android.web.BrowserFragment; -import com.github.dfa.hubzilla_android.web.ContextMenuWebView; -import com.github.dfa.hubzilla_android.web.ProxyHandler; -import com.github.dfa.hubzilla_android.web.WebHelper; -import com.github.dfa.hubzilla_android.web.custom_tab.CustomTabActivityHelper; +import com.dfa.hubzilla_android.App; +import com.dfa.hubzilla_android.BuildConfig; +import com.dfa.hubzilla_android.R; +import com.dfa.hubzilla_android.data.DiasporaPodList; +import com.dfa.hubzilla_android.data.DiasporaUserProfile; +import com.dfa.hubzilla_android.listener.DiasporaUserProfileChangedListener; +import com.dfa.hubzilla_android.listener.IntellihideToolbarActivityListener; +import com.dfa.hubzilla_android.receiver.OpenExternalLinkReceiver; +import com.dfa.hubzilla_android.receiver.UpdateTitleReceiver; +import com.dfa.hubzilla_android.ui.BadgeDrawable; +import com.dfa.hubzilla_android.ui.PodSelectionDialog; +import com.dfa.hubzilla_android.ui.theme.ThemeHelper; +import com.dfa.hubzilla_android.ui.theme.ThemedActivity; +import com.dfa.hubzilla_android.ui.theme.ThemedAlertDialogBuilder; +import com.dfa.hubzilla_android.ui.theme.ThemedFragment; +import com.dfa.hubzilla_android.util.ActivityUtils; +import com.dfa.hubzilla_android.util.AndroidBug5497Workaround; +import com.dfa.hubzilla_android.util.AppLog; +import com.dfa.hubzilla_android.util.AppSettings; +import com.dfa.hubzilla_android.util.ContextUtils; +import com.dfa.hubzilla_android.util.DiasporaUrlHelper; +import com.dfa.hubzilla_android.web.BrowserFragment; +import com.dfa.hubzilla_android.web.ContextMenuWebView; +import com.dfa.hubzilla_android.web.ProxyHandler; +import com.dfa.hubzilla_android.web.WebHelper; +import com.dfa.hubzilla_android.web.custom_tab.CustomTabActivityHelper; -import net.gsantner.opoc.format.markdown.SimpleMarkdownParser; +import net.opoc.format.markdown.SimpleMarkdownParser; import java.io.IOException; @@ -108,14 +108,14 @@ public class MainActivity extends ThemedActivity public static final int INPUT_FILE_REQUEST_CODE_NEW = 1; public static final int INPUT_FILE_REQUEST_CODE_OLD = 2; - public static final String ACTION_OPEN_URL = "com.github.dfa.hubzilla_android.MainActivity.open_url"; - public static final String ACTION_OPEN_EXTERNAL_URL = "com.github.dfa.hubzilla_android.MainActivity.open_external_url"; - public static final String ACTION_CHANGE_ACCOUNT = "com.github.dfa.hubzilla_android.MainActivity.change_account"; - public static final String ACTION_CLEAR_CACHE = "com.github.dfa.hubzilla_android.MainActivity.clear_cache"; - public static final String ACTION_UPDATE_TITLE_FROM_URL = "com.github.dfa.hubzilla_android.MainActivity.set_title"; + public static final String ACTION_OPEN_URL = "com.dfa.hubzilla_android.MainActivity.open_url"; + public static final String ACTION_OPEN_EXTERNAL_URL = "com.dfa.hubzilla_android.MainActivity.open_external_url"; + public static final String ACTION_CHANGE_ACCOUNT = "com.dfa.hubzilla_android.MainActivity.change_account"; + public static final String ACTION_CLEAR_CACHE = "com.dfa.hubzilla_android.MainActivity.clear_cache"; + public static final String ACTION_UPDATE_TITLE_FROM_URL = "com.dfa.hubzilla_android.MainActivity.set_title"; public static final String URL_MESSAGE = "URL_MESSAGE"; - public static final String EXTRA_URL = "com.github.dfa.hubzilla_android.extra_url"; - public static final String CONTENT_HASHTAG = "content://com.github.dfa.hubzilla_android.mainactivity/"; + public static final String EXTRA_URL = "com.dfa.hubzilla_android.extra_url"; + public static final String CONTENT_HASHTAG = "content://com.dfa.hubzilla_android.mainactivity/"; private App app; private CustomTabActivityHelper customTabActivityHelper; diff --git a/app/src/main/java/com/github/dfa/hubzilla_android/activity/PodSelectionFragment.java b/app/src/main/java/com/dfa/hubzilla_android/activity/PodSelectionFragment.java similarity index 93% rename from app/src/main/java/com/github/dfa/hubzilla_android/activity/PodSelectionFragment.java rename to app/src/main/java/com/dfa/hubzilla_android/activity/PodSelectionFragment.java index 05475e3..da3f144 100644 --- a/app/src/main/java/com/github/dfa/hubzilla_android/activity/PodSelectionFragment.java +++ b/app/src/main/java/com/dfa/hubzilla_android/activity/PodSelectionFragment.java @@ -16,7 +16,7 @@ If not, see . */ -package com.github.dfa.hubzilla_android.activity; +package com.dfa.hubzilla_android.activity; import android.content.BroadcastReceiver; import android.content.Context; @@ -44,17 +44,17 @@ import android.widget.ListView; import android.widget.RelativeLayout; import android.widget.TextView; -import com.github.dfa.hubzilla_android.App; -import com.github.dfa.hubzilla_android.R; -import com.github.dfa.hubzilla_android.data.DiasporaPodList; -import com.github.dfa.hubzilla_android.data.DiasporaPodList.DiasporaPod; -import com.github.dfa.hubzilla_android.service.FetchPodsService; -import com.github.dfa.hubzilla_android.ui.PodSelectionDialog; -import com.github.dfa.hubzilla_android.ui.theme.ThemedFragment; -import com.github.dfa.hubzilla_android.util.ActivityUtils; -import com.github.dfa.hubzilla_android.util.AppSettings; -import com.github.dfa.hubzilla_android.util.ContextUtils; -import com.github.dfa.hubzilla_android.util.DiasporaUrlHelper; +import com.dfa.hubzilla_android.App; +import com.dfa.hubzilla_android.R; +import com.dfa.hubzilla_android.data.DiasporaPodList; +import com.dfa.hubzilla_android.data.DiasporaPodList.DiasporaPod; +import com.dfa.hubzilla_android.service.FetchPodsService; +import com.dfa.hubzilla_android.ui.PodSelectionDialog; +import com.dfa.hubzilla_android.ui.theme.ThemedFragment; +import com.dfa.hubzilla_android.util.ActivityUtils; +import com.dfa.hubzilla_android.util.AppSettings; +import com.dfa.hubzilla_android.util.ContextUtils; +import com.dfa.hubzilla_android.util.DiasporaUrlHelper; import org.json.JSONException; import org.json.JSONObject; @@ -71,7 +71,7 @@ import butterknife.OnClick; */ public class PodSelectionFragment extends ThemedFragment implements SearchView.OnQueryTextListener, PodSelectionDialog.PodSelectionDialogResultListener { - public static final String TAG = "com.github.dfa.hubzilla_android.PodSelectionFragment"; + public static final String TAG = "com.dfa.hubzilla_android.PodSelectionFragment"; @BindView(R.id.podselection__fragment__listpods) protected ListView listViewPod; diff --git a/app/src/main/java/com/github/dfa/hubzilla_android/activity/SettingsActivity.java b/app/src/main/java/com/dfa/hubzilla_android/activity/SettingsActivity.java similarity index 94% rename from app/src/main/java/com/github/dfa/hubzilla_android/activity/SettingsActivity.java rename to app/src/main/java/com/dfa/hubzilla_android/activity/SettingsActivity.java index 3dcc118..d037259 100644 --- a/app/src/main/java/com/github/dfa/hubzilla_android/activity/SettingsActivity.java +++ b/app/src/main/java/com/dfa/hubzilla_android/activity/SettingsActivity.java @@ -1,4 +1,4 @@ -package com.github.dfa.hubzilla_android.activity; +package com.dfa.hubzilla_android.activity; import android.annotation.SuppressLint; import android.app.AlarmManager; @@ -21,17 +21,17 @@ import android.widget.FrameLayout; import android.widget.TextView; import android.widget.Toast; -import com.github.dfa.hubzilla_android.App; -import com.github.dfa.hubzilla_android.R; -import com.github.dfa.hubzilla_android.ui.theme.ColorPalette; -import com.github.dfa.hubzilla_android.ui.theme.ThemeHelper; -import com.github.dfa.hubzilla_android.ui.theme.ThemedActivity; -import com.github.dfa.hubzilla_android.ui.theme.ThemedAlertDialogBuilder; -import com.github.dfa.hubzilla_android.ui.theme.ThemedPreferenceFragment; -import com.github.dfa.hubzilla_android.util.AppLog; -import com.github.dfa.hubzilla_android.util.AppSettings; -import com.github.dfa.hubzilla_android.util.DiasporaUrlHelper; -import com.github.dfa.hubzilla_android.web.ProxyHandler; +import com.dfa.hubzilla_android.App; +import com.dfa.hubzilla_android.R; +import com.dfa.hubzilla_android.ui.theme.ColorPalette; +import com.dfa.hubzilla_android.ui.theme.ThemeHelper; +import com.dfa.hubzilla_android.ui.theme.ThemedActivity; +import com.dfa.hubzilla_android.ui.theme.ThemedAlertDialogBuilder; +import com.dfa.hubzilla_android.ui.theme.ThemedPreferenceFragment; +import com.dfa.hubzilla_android.util.AppLog; +import com.dfa.hubzilla_android.util.AppSettings; +import com.dfa.hubzilla_android.util.DiasporaUrlHelper; +import com.dfa.hubzilla_android.web.ProxyHandler; import butterknife.BindView; import butterknife.ButterKnife; @@ -154,7 +154,7 @@ public class SettingsActivity extends ThemedActivity implements SharedPreference } public static class SettingsFragmentMaster extends ThemedPreferenceFragment { - public static final String TAG = "com.github.dfa.hubzilla_android.settings.SettingsFragmentMaster"; + public static final String TAG = "com.dfa.hubzilla_android.settings.SettingsFragmentMaster"; public void onCreate(Bundle savedInstances) { super.onCreate(savedInstances); @@ -252,7 +252,7 @@ public class SettingsActivity extends ThemedActivity implements SharedPreference } public static class SettingsFragmentThemes extends ThemedPreferenceFragment { - public static final String TAG = "com.github.dfa.hubzilla_android.settings.SettingsFragmentThemes"; + public static final String TAG = "com.dfa.hubzilla_android.settings.SettingsFragmentThemes"; public void onCreate(Bundle savedInstances) { super.onCreate(savedInstances); @@ -360,7 +360,7 @@ public class SettingsActivity extends ThemedActivity implements SharedPreference } public static class SettingsFragmentNavSlider extends ThemedPreferenceFragment { - public static final String TAG = "com.github.dfa.hubzilla_android.settings.SettingsFragmentNavSlider"; + public static final String TAG = "com.dfa.hubzilla_android.settings.SettingsFragmentNavSlider"; public void onCreate(Bundle savedInstances) { super.onCreate(savedInstances); @@ -380,7 +380,7 @@ public class SettingsActivity extends ThemedActivity implements SharedPreference } public static class SettingsFragmentProxy extends ThemedPreferenceFragment implements SharedPreferences.OnSharedPreferenceChangeListener { - public static final String TAG = "com.github.dfa.hubzilla_android.settings.SettingsFragmentProxy"; + public static final String TAG = "com.dfa.hubzilla_android.settings.SettingsFragmentProxy"; public void onCreate(Bundle savedInstances) { super.onCreate(savedInstances); @@ -441,7 +441,7 @@ public class SettingsActivity extends ThemedActivity implements SharedPreference } public static class SettingsFragmentDebugging extends ThemedPreferenceFragment { - public static final String TAG = "com.github.dfa.hubzilla_android.settings.SettingsFragmentDebugging"; + public static final String TAG = "com.dfa.hubzilla_android.settings.SettingsFragmentDebugging"; public void onCreate(Bundle savedInstances) { super.onCreate(savedInstances); diff --git a/app/src/main/java/com/github/dfa/hubzilla_android/activity/TagListFragment.java b/app/src/main/java/com/dfa/hubzilla_android/activity/TagListFragment.java similarity index 93% rename from app/src/main/java/com/github/dfa/hubzilla_android/activity/TagListFragment.java rename to app/src/main/java/com/dfa/hubzilla_android/activity/TagListFragment.java index ad76bca..8fb1c16 100644 --- a/app/src/main/java/com/github/dfa/hubzilla_android/activity/TagListFragment.java +++ b/app/src/main/java/com/dfa/hubzilla_android/activity/TagListFragment.java @@ -16,7 +16,7 @@ If not, see . */ -package com.github.dfa.hubzilla_android.activity; +package com.dfa.hubzilla_android.activity; import android.content.Context; import android.graphics.Color; @@ -31,13 +31,13 @@ import android.view.ViewGroup; import android.widget.RelativeLayout; import android.widget.TextView; -import com.github.dfa.hubzilla_android.App; -import com.github.dfa.hubzilla_android.R; -import com.github.dfa.hubzilla_android.listener.OnSomethingClickListener; -import com.github.dfa.hubzilla_android.ui.theme.ThemedFragment; -import com.github.dfa.hubzilla_android.util.AppSettings; -import com.github.dfa.hubzilla_android.util.ContextUtils; -import com.github.dfa.hubzilla_android.util.DiasporaUrlHelper; +import com.dfa.hubzilla_android.App; +import com.dfa.hubzilla_android.R; +import com.dfa.hubzilla_android.listener.OnSomethingClickListener; +import com.dfa.hubzilla_android.ui.theme.ThemedFragment; +import com.dfa.hubzilla_android.util.AppSettings; +import com.dfa.hubzilla_android.util.ContextUtils; +import com.dfa.hubzilla_android.util.DiasporaUrlHelper; import java.util.ArrayList; import java.util.Arrays; @@ -51,7 +51,7 @@ import butterknife.ButterKnife; */ public class TagListFragment extends ThemedFragment implements OnSomethingClickListener { - public static final String TAG = "com.github.dfa.hubzilla_android.TagListFragment"; + public static final String TAG = "com.dfa.hubzilla_android.TagListFragment"; @BindView(R.id.fragment_list__recycler_view) public RecyclerView followedTagsRecyclerView; diff --git a/app/src/main/java/com/github/dfa/hubzilla_android/data/DiasporaAspect.java b/app/src/main/java/com/dfa/hubzilla_android/data/DiasporaAspect.java similarity index 94% rename from app/src/main/java/com/github/dfa/hubzilla_android/data/DiasporaAspect.java rename to app/src/main/java/com/dfa/hubzilla_android/data/DiasporaAspect.java index 163dad6..294049d 100644 --- a/app/src/main/java/com/github/dfa/hubzilla_android/data/DiasporaAspect.java +++ b/app/src/main/java/com/dfa/hubzilla_android/data/DiasporaAspect.java @@ -16,10 +16,10 @@ If not, see . */ -package com.github.dfa.hubzilla_android.data; +package com.dfa.hubzilla_android.data; -import com.github.dfa.hubzilla_android.App; -import com.github.dfa.hubzilla_android.util.AppSettings; +import com.dfa.hubzilla_android.App; +import com.dfa.hubzilla_android.util.AppSettings; import org.json.JSONException; import org.json.JSONObject; diff --git a/app/src/main/java/com/github/dfa/hubzilla_android/data/DiasporaPodList.java b/app/src/main/java/com/dfa/hubzilla_android/data/DiasporaPodList.java similarity index 99% rename from app/src/main/java/com/github/dfa/hubzilla_android/data/DiasporaPodList.java rename to app/src/main/java/com/dfa/hubzilla_android/data/DiasporaPodList.java index f1edc47..40b2a5e 100644 --- a/app/src/main/java/com/github/dfa/hubzilla_android/data/DiasporaPodList.java +++ b/app/src/main/java/com/dfa/hubzilla_android/data/DiasporaPodList.java @@ -1,4 +1,4 @@ -package com.github.dfa.hubzilla_android.data; +package com.dfa.hubzilla_android.data; import org.json.JSONArray; import org.json.JSONException; diff --git a/app/src/main/java/com/github/dfa/hubzilla_android/data/DiasporaUserProfile.java b/app/src/main/java/com/dfa/hubzilla_android/data/DiasporaUserProfile.java similarity index 96% rename from app/src/main/java/com/github/dfa/hubzilla_android/data/DiasporaUserProfile.java rename to app/src/main/java/com/dfa/hubzilla_android/data/DiasporaUserProfile.java index f259dd9..ff4f645 100644 --- a/app/src/main/java/com/github/dfa/hubzilla_android/data/DiasporaUserProfile.java +++ b/app/src/main/java/com/dfa/hubzilla_android/data/DiasporaUserProfile.java @@ -16,15 +16,15 @@ If not, see . */ -package com.github.dfa.hubzilla_android.data; +package com.dfa.hubzilla_android.data; import android.os.Handler; -import com.github.dfa.hubzilla_android.App; -import com.github.dfa.hubzilla_android.listener.DiasporaUserProfileChangedListener; -import com.github.dfa.hubzilla_android.util.AppLog; -import com.github.dfa.hubzilla_android.util.AppSettings; -import com.github.dfa.hubzilla_android.util.DiasporaUrlHelper; +import com.dfa.hubzilla_android.App; +import com.dfa.hubzilla_android.listener.DiasporaUserProfileChangedListener; +import com.dfa.hubzilla_android.util.AppLog; +import com.dfa.hubzilla_android.util.AppSettings; +import com.dfa.hubzilla_android.util.DiasporaUrlHelper; import org.json.JSONArray; import org.json.JSONException; diff --git a/app/src/main/java/com/github/dfa/hubzilla_android/listener/DiasporaUserProfileChangedListener.java b/app/src/main/java/com/dfa/hubzilla_android/listener/DiasporaUserProfileChangedListener.java similarity index 94% rename from app/src/main/java/com/github/dfa/hubzilla_android/listener/DiasporaUserProfileChangedListener.java rename to app/src/main/java/com/dfa/hubzilla_android/listener/DiasporaUserProfileChangedListener.java index e5049e8..f14d717 100644 --- a/app/src/main/java/com/github/dfa/hubzilla_android/listener/DiasporaUserProfileChangedListener.java +++ b/app/src/main/java/com/dfa/hubzilla_android/listener/DiasporaUserProfileChangedListener.java @@ -16,9 +16,9 @@ If not, see . */ -package com.github.dfa.hubzilla_android.listener; +package com.dfa.hubzilla_android.listener; -import com.github.dfa.hubzilla_android.data.DiasporaUserProfile; +import com.dfa.hubzilla_android.data.DiasporaUserProfile; /** * Created by gsantner (https://gsantner.net/) on 26.03.16. diff --git a/app/src/main/java/com/github/dfa/hubzilla_android/listener/IntellihideToolbarActivityListener.java b/app/src/main/java/com/dfa/hubzilla_android/listener/IntellihideToolbarActivityListener.java similarity index 90% rename from app/src/main/java/com/github/dfa/hubzilla_android/listener/IntellihideToolbarActivityListener.java rename to app/src/main/java/com/dfa/hubzilla_android/listener/IntellihideToolbarActivityListener.java index 4622137..89bf9a5 100644 --- a/app/src/main/java/com/github/dfa/hubzilla_android/listener/IntellihideToolbarActivityListener.java +++ b/app/src/main/java/com/dfa/hubzilla_android/listener/IntellihideToolbarActivityListener.java @@ -1,4 +1,4 @@ -package com.github.dfa.hubzilla_android.listener; +package com.dfa.hubzilla_android.listener; import android.support.design.widget.AppBarLayout; diff --git a/app/src/main/java/com/github/dfa/hubzilla_android/listener/OnSomethingClickListener.java b/app/src/main/java/com/dfa/hubzilla_android/listener/OnSomethingClickListener.java similarity index 87% rename from app/src/main/java/com/github/dfa/hubzilla_android/listener/OnSomethingClickListener.java rename to app/src/main/java/com/dfa/hubzilla_android/listener/OnSomethingClickListener.java index 20265a7..7bda1fd 100644 --- a/app/src/main/java/com/github/dfa/hubzilla_android/listener/OnSomethingClickListener.java +++ b/app/src/main/java/com/dfa/hubzilla_android/listener/OnSomethingClickListener.java @@ -1,4 +1,4 @@ -package com.github.dfa.hubzilla_android.listener; +package com.dfa.hubzilla_android.listener; /** * Listener for different types of click events diff --git a/app/src/main/java/com/github/dfa/hubzilla_android/receiver/OpenExternalLinkReceiver.java b/app/src/main/java/com/dfa/hubzilla_android/receiver/OpenExternalLinkReceiver.java similarity index 85% rename from app/src/main/java/com/github/dfa/hubzilla_android/receiver/OpenExternalLinkReceiver.java rename to app/src/main/java/com/dfa/hubzilla_android/receiver/OpenExternalLinkReceiver.java index 50cc9f0..899c5e9 100644 --- a/app/src/main/java/com/github/dfa/hubzilla_android/receiver/OpenExternalLinkReceiver.java +++ b/app/src/main/java/com/dfa/hubzilla_android/receiver/OpenExternalLinkReceiver.java @@ -16,7 +16,7 @@ If not, see . */ -package com.github.dfa.hubzilla_android.receiver; +package com.dfa.hubzilla_android.receiver; import android.app.Activity; import android.content.BroadcastReceiver; @@ -27,13 +27,13 @@ import android.graphics.BitmapFactory; import android.net.Uri; import android.support.customtabs.CustomTabsIntent; -import com.github.dfa.hubzilla_android.R; -import com.github.dfa.hubzilla_android.activity.MainActivity; -import com.github.dfa.hubzilla_android.ui.theme.ThemeHelper; -import com.github.dfa.hubzilla_android.util.AppLog; -import com.github.dfa.hubzilla_android.util.AppSettings; -import com.github.dfa.hubzilla_android.web.custom_tab.BrowserFallback; -import com.github.dfa.hubzilla_android.web.custom_tab.CustomTabActivityHelper; +import com.dfa.hubzilla_android.R; +import com.dfa.hubzilla_android.activity.MainActivity; +import com.dfa.hubzilla_android.ui.theme.ThemeHelper; +import com.dfa.hubzilla_android.util.AppLog; +import com.dfa.hubzilla_android.util.AppSettings; +import com.dfa.hubzilla_android.web.custom_tab.BrowserFallback; +import com.dfa.hubzilla_android.web.custom_tab.CustomTabActivityHelper; /** * BroadcastReceiver that opens links in a Chrome CustomTab diff --git a/app/src/main/java/com/github/dfa/hubzilla_android/receiver/UpdateTitleReceiver.java b/app/src/main/java/com/dfa/hubzilla_android/receiver/UpdateTitleReceiver.java similarity index 91% rename from app/src/main/java/com/github/dfa/hubzilla_android/receiver/UpdateTitleReceiver.java rename to app/src/main/java/com/dfa/hubzilla_android/receiver/UpdateTitleReceiver.java index 9d05e65..617763f 100644 --- a/app/src/main/java/com/github/dfa/hubzilla_android/receiver/UpdateTitleReceiver.java +++ b/app/src/main/java/com/dfa/hubzilla_android/receiver/UpdateTitleReceiver.java @@ -16,18 +16,18 @@ If not, see . */ -package com.github.dfa.hubzilla_android.receiver; +package com.dfa.hubzilla_android.receiver; import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; -import com.github.dfa.hubzilla_android.App; -import com.github.dfa.hubzilla_android.R; -import com.github.dfa.hubzilla_android.activity.MainActivity; -import com.github.dfa.hubzilla_android.util.AppLog; -import com.github.dfa.hubzilla_android.util.AppSettings; -import com.github.dfa.hubzilla_android.util.DiasporaUrlHelper; +import com.dfa.hubzilla_android.App; +import com.dfa.hubzilla_android.R; +import com.dfa.hubzilla_android.activity.MainActivity; +import com.dfa.hubzilla_android.util.AppLog; +import com.dfa.hubzilla_android.util.AppSettings; +import com.dfa.hubzilla_android.util.DiasporaUrlHelper; /** * BroadcastReceiver used to update the title of the MainActivity depending on the url of the ui__webview diff --git a/app/src/main/java/com/github/dfa/hubzilla_android/service/AvatarImageLoader.java b/app/src/main/java/com/dfa/hubzilla_android/service/AvatarImageLoader.java similarity index 95% rename from app/src/main/java/com/github/dfa/hubzilla_android/service/AvatarImageLoader.java rename to app/src/main/java/com/dfa/hubzilla_android/service/AvatarImageLoader.java index 2737505..8af1f22 100644 --- a/app/src/main/java/com/github/dfa/hubzilla_android/service/AvatarImageLoader.java +++ b/app/src/main/java/com/dfa/hubzilla_android/service/AvatarImageLoader.java @@ -17,14 +17,14 @@ If not, see . */ -package com.github.dfa.hubzilla_android.service; +package com.dfa.hubzilla_android.service; import android.content.Context; import android.graphics.Bitmap; import android.graphics.BitmapFactory; import android.widget.ImageView; -import net.gsantner.opoc.util.DownloadTask; +import net.opoc.util.DownloadTask; import java.io.File; diff --git a/app/src/main/java/com/github/dfa/hubzilla_android/service/FetchPodsService.java b/app/src/main/java/com/dfa/hubzilla_android/service/FetchPodsService.java similarity index 95% rename from app/src/main/java/com/github/dfa/hubzilla_android/service/FetchPodsService.java rename to app/src/main/java/com/dfa/hubzilla_android/service/FetchPodsService.java index cd91b83..067aa92 100644 --- a/app/src/main/java/com/github/dfa/hubzilla_android/service/FetchPodsService.java +++ b/app/src/main/java/com/dfa/hubzilla_android/service/FetchPodsService.java @@ -16,7 +16,7 @@ If not, see . */ -package com.github.dfa.hubzilla_android.service; +package com.dfa.hubzilla_android.service; import android.app.Service; import android.content.Intent; @@ -24,8 +24,8 @@ import android.os.AsyncTask; import android.os.IBinder; import android.support.v4.content.LocalBroadcastManager; -import com.github.dfa.hubzilla_android.data.DiasporaPodList; -import com.github.dfa.hubzilla_android.util.AppLog; +import com.dfa.hubzilla_android.data.DiasporaPodList; +import com.dfa.hubzilla_android.util.AppLog; import org.json.JSONException; import org.json.JSONObject; diff --git a/app/src/main/java/com/github/dfa/hubzilla_android/service/HashtagContentProvider.java b/app/src/main/java/com/dfa/hubzilla_android/service/HashtagContentProvider.java similarity index 97% rename from app/src/main/java/com/github/dfa/hubzilla_android/service/HashtagContentProvider.java rename to app/src/main/java/com/dfa/hubzilla_android/service/HashtagContentProvider.java index c566ce1..8e8704d 100644 --- a/app/src/main/java/com/github/dfa/hubzilla_android/service/HashtagContentProvider.java +++ b/app/src/main/java/com/dfa/hubzilla_android/service/HashtagContentProvider.java @@ -18,7 +18,7 @@ This file is inspired from sourabhsoni.com/implementing-hashtags-in-android-application/ */ -package com.github.dfa.hubzilla_android.service; +package com.dfa.hubzilla_android.service; import android.content.ContentProvider; import android.content.ContentValues; diff --git a/app/src/main/java/com/github/dfa/hubzilla_android/service/ProfileFetchTask.java b/app/src/main/java/com/dfa/hubzilla_android/service/ProfileFetchTask.java similarity index 92% rename from app/src/main/java/com/github/dfa/hubzilla_android/service/ProfileFetchTask.java rename to app/src/main/java/com/dfa/hubzilla_android/service/ProfileFetchTask.java index e69901a..a681275 100644 --- a/app/src/main/java/com/github/dfa/hubzilla_android/service/ProfileFetchTask.java +++ b/app/src/main/java/com/dfa/hubzilla_android/service/ProfileFetchTask.java @@ -16,16 +16,16 @@ If not, see . */ -package com.github.dfa.hubzilla_android.service; +package com.dfa.hubzilla_android.service; import android.content.Context; import android.os.AsyncTask; import android.webkit.CookieManager; -import com.github.dfa.hubzilla_android.App; -import com.github.dfa.hubzilla_android.data.DiasporaUserProfile; -import com.github.dfa.hubzilla_android.util.AppLog; -import com.github.dfa.hubzilla_android.util.DiasporaUrlHelper; +import com.dfa.hubzilla_android.App; +import com.dfa.hubzilla_android.data.DiasporaUserProfile; +import com.dfa.hubzilla_android.util.AppLog; +import com.dfa.hubzilla_android.util.DiasporaUrlHelper; import java.io.BufferedReader; import java.io.IOException; diff --git a/app/src/main/java/com/github/dfa/hubzilla_android/ui/BadgeDrawable.java b/app/src/main/java/com/dfa/hubzilla_android/ui/BadgeDrawable.java similarity index 95% rename from app/src/main/java/com/github/dfa/hubzilla_android/ui/BadgeDrawable.java rename to app/src/main/java/com/dfa/hubzilla_android/ui/BadgeDrawable.java index 1354e11..c76fa52 100644 --- a/app/src/main/java/com/github/dfa/hubzilla_android/ui/BadgeDrawable.java +++ b/app/src/main/java/com/dfa/hubzilla_android/ui/BadgeDrawable.java @@ -16,7 +16,7 @@ If not, see . */ -package com.github.dfa.hubzilla_android.ui; +package com.dfa.hubzilla_android.ui; import android.content.Context; import android.graphics.Canvas; @@ -30,9 +30,9 @@ import android.graphics.drawable.Drawable; import android.graphics.drawable.LayerDrawable; import android.support.annotation.NonNull; -import com.github.dfa.hubzilla_android.R; -import com.github.dfa.hubzilla_android.util.AppSettings; -import com.github.dfa.hubzilla_android.util.ContextUtils; +import com.dfa.hubzilla_android.R; +import com.dfa.hubzilla_android.util.AppSettings; +import com.dfa.hubzilla_android.util.ContextUtils; @SuppressWarnings("WeakerAccess") public class BadgeDrawable extends Drawable { diff --git a/app/src/main/java/com/github/dfa/hubzilla_android/ui/BottomBarBehavior.java b/app/src/main/java/com/dfa/hubzilla_android/ui/BottomBarBehavior.java similarity index 97% rename from app/src/main/java/com/github/dfa/hubzilla_android/ui/BottomBarBehavior.java rename to app/src/main/java/com/dfa/hubzilla_android/ui/BottomBarBehavior.java index d43d68d..32c5ad5 100644 --- a/app/src/main/java/com/github/dfa/hubzilla_android/ui/BottomBarBehavior.java +++ b/app/src/main/java/com/dfa/hubzilla_android/ui/BottomBarBehavior.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.github.dfa.hubzilla_android.ui; +package com.dfa.hubzilla_android.ui; import android.content.Context; import android.support.design.widget.AppBarLayout; diff --git a/app/src/main/java/com/github/dfa/hubzilla_android/ui/HtmlTextView.java b/app/src/main/java/com/dfa/hubzilla_android/ui/HtmlTextView.java similarity index 96% rename from app/src/main/java/com/github/dfa/hubzilla_android/ui/HtmlTextView.java rename to app/src/main/java/com/dfa/hubzilla_android/ui/HtmlTextView.java index b9e50e2..577ec26 100644 --- a/app/src/main/java/com/github/dfa/hubzilla_android/ui/HtmlTextView.java +++ b/app/src/main/java/com/dfa/hubzilla_android/ui/HtmlTextView.java @@ -16,7 +16,7 @@ If not, see . */ -package com.github.dfa.hubzilla_android.ui; +package com.dfa.hubzilla_android.ui; import android.content.Context; import android.support.v7.widget.AppCompatTextView; @@ -26,7 +26,7 @@ import android.text.util.Linkify; import android.util.AttributeSet; import android.util.Patterns; -import com.github.dfa.hubzilla_android.activity.MainActivity; +import com.dfa.hubzilla_android.activity.MainActivity; import java.util.regex.Matcher; import java.util.regex.Pattern; diff --git a/app/src/main/java/com/github/dfa/hubzilla_android/ui/PodSelectionDialog.java b/app/src/main/java/com/dfa/hubzilla_android/ui/PodSelectionDialog.java similarity index 93% rename from app/src/main/java/com/github/dfa/hubzilla_android/ui/PodSelectionDialog.java rename to app/src/main/java/com/dfa/hubzilla_android/ui/PodSelectionDialog.java index f42a3b1..6ba53da 100644 --- a/app/src/main/java/com/github/dfa/hubzilla_android/ui/PodSelectionDialog.java +++ b/app/src/main/java/com/dfa/hubzilla_android/ui/PodSelectionDialog.java @@ -1,4 +1,4 @@ -package com.github.dfa.hubzilla_android.ui; +package com.dfa.hubzilla_android.ui; import android.annotation.SuppressLint; @@ -17,14 +17,14 @@ import android.widget.RadioGroup; import android.widget.Spinner; import android.widget.TextView; -import com.github.dfa.hubzilla_android.App; -import com.github.dfa.hubzilla_android.R; -import com.github.dfa.hubzilla_android.data.DiasporaPodList.DiasporaPod; -import com.github.dfa.hubzilla_android.data.DiasporaPodList.DiasporaPod.DiasporaPodUrl; -import com.github.dfa.hubzilla_android.ui.theme.ThemeHelper; -import com.github.dfa.hubzilla_android.ui.theme.ThemedAppCompatDialogFragment; -import com.github.dfa.hubzilla_android.util.AppSettings; -import com.github.dfa.hubzilla_android.web.ProxyHandler; +import com.dfa.hubzilla_android.App; +import com.dfa.hubzilla_android.R; +import com.dfa.hubzilla_android.data.DiasporaPodList.DiasporaPod; +import com.dfa.hubzilla_android.data.DiasporaPodList.DiasporaPod.DiasporaPodUrl; +import com.dfa.hubzilla_android.ui.theme.ThemeHelper; +import com.dfa.hubzilla_android.ui.theme.ThemedAppCompatDialogFragment; +import com.dfa.hubzilla_android.util.AppSettings; +import com.dfa.hubzilla_android.web.ProxyHandler; import org.json.JSONException; @@ -40,7 +40,7 @@ import butterknife.OnItemSelected; * Created by gsantner (http://gsantner.net) on 06.10.16. */ public class PodSelectionDialog extends ThemedAppCompatDialogFragment { - public static final String TAG = "com.github.dfa.hubzilla_android.ui.PodSelectionDialog"; + public static final String TAG = "com.dfa.hubzilla_android.ui.PodSelectionDialog"; public interface PodSelectionDialogResultListener { void onPodSelectionDialogResult(DiasporaPod pod, boolean accepted); diff --git a/app/src/main/java/com/github/dfa/hubzilla_android/ui/theme/ColorPalette.java b/app/src/main/java/com/dfa/hubzilla_android/ui/theme/ColorPalette.java similarity index 99% rename from app/src/main/java/com/github/dfa/hubzilla_android/ui/theme/ColorPalette.java rename to app/src/main/java/com/dfa/hubzilla_android/ui/theme/ColorPalette.java index 5317136..373c48e 100644 --- a/app/src/main/java/com/github/dfa/hubzilla_android/ui/theme/ColorPalette.java +++ b/app/src/main/java/com/dfa/hubzilla_android/ui/theme/ColorPalette.java @@ -1,11 +1,11 @@ -package com.github.dfa.hubzilla_android.ui.theme; +package com.dfa.hubzilla_android.ui.theme; import android.content.Context; import android.graphics.Color; import android.support.v4.content.ContextCompat; import android.support.v4.graphics.ColorUtils; -import com.github.dfa.hubzilla_android.R; +import com.dfa.hubzilla_android.R; /** * Class that handles Colors diff --git a/app/src/main/java/com/github/dfa/hubzilla_android/ui/theme/ThemeHelper.java b/app/src/main/java/com/dfa/hubzilla_android/ui/theme/ThemeHelper.java similarity index 97% rename from app/src/main/java/com/github/dfa/hubzilla_android/ui/theme/ThemeHelper.java rename to app/src/main/java/com/dfa/hubzilla_android/ui/theme/ThemeHelper.java index c3eb942..964bee4 100644 --- a/app/src/main/java/com/github/dfa/hubzilla_android/ui/theme/ThemeHelper.java +++ b/app/src/main/java/com/dfa/hubzilla_android/ui/theme/ThemeHelper.java @@ -17,7 +17,7 @@ If not, see . This class is inspired by org.horasapps.LeafPic */ -package com.github.dfa.hubzilla_android.ui.theme; +package com.dfa.hubzilla_android.ui.theme; import android.content.DialogInterface; import android.content.res.ColorStateList; @@ -39,8 +39,8 @@ import android.widget.RadioButton; import android.widget.RadioGroup; import android.widget.TextView; -import com.github.dfa.hubzilla_android.R; -import com.github.dfa.hubzilla_android.util.AppSettings; +import com.dfa.hubzilla_android.R; +import com.dfa.hubzilla_android.util.AppSettings; /** * Singleton that can be used to color views diff --git a/app/src/main/java/com/github/dfa/hubzilla_android/ui/theme/Themeable.java b/app/src/main/java/com/dfa/hubzilla_android/ui/theme/Themeable.java similarity index 74% rename from app/src/main/java/com/github/dfa/hubzilla_android/ui/theme/Themeable.java rename to app/src/main/java/com/dfa/hubzilla_android/ui/theme/Themeable.java index 229f0f0..8a9f3a5 100644 --- a/app/src/main/java/com/github/dfa/hubzilla_android/ui/theme/Themeable.java +++ b/app/src/main/java/com/dfa/hubzilla_android/ui/theme/Themeable.java @@ -1,4 +1,4 @@ -package com.github.dfa.hubzilla_android.ui.theme; +package com.dfa.hubzilla_android.ui.theme; /** * Interface that allows setting Theme colors diff --git a/app/src/main/java/com/github/dfa/hubzilla_android/ui/theme/ThemedActivity.java b/app/src/main/java/com/dfa/hubzilla_android/ui/theme/ThemedActivity.java similarity index 91% rename from app/src/main/java/com/github/dfa/hubzilla_android/ui/theme/ThemedActivity.java rename to app/src/main/java/com/dfa/hubzilla_android/ui/theme/ThemedActivity.java index 9cb840d..91a7005 100644 --- a/app/src/main/java/com/github/dfa/hubzilla_android/ui/theme/ThemedActivity.java +++ b/app/src/main/java/com/dfa/hubzilla_android/ui/theme/ThemedActivity.java @@ -16,17 +16,17 @@ If not, see . */ -package com.github.dfa.hubzilla_android.ui.theme; +package com.dfa.hubzilla_android.ui.theme; import android.annotation.TargetApi; import android.content.pm.ActivityInfo; import android.os.Build; import android.support.v7.app.AppCompatActivity; -import com.github.dfa.hubzilla_android.App; -import com.github.dfa.hubzilla_android.R; -import com.github.dfa.hubzilla_android.util.AppSettings; -import com.github.dfa.hubzilla_android.util.ContextUtils; +import com.dfa.hubzilla_android.App; +import com.dfa.hubzilla_android.R; +import com.dfa.hubzilla_android.util.AppSettings; +import com.dfa.hubzilla_android.util.ContextUtils; /** * Activity that supports color schemes diff --git a/app/src/main/java/com/github/dfa/hubzilla_android/ui/theme/ThemedAlertDialogBuilder.java b/app/src/main/java/com/dfa/hubzilla_android/ui/theme/ThemedAlertDialogBuilder.java similarity index 92% rename from app/src/main/java/com/github/dfa/hubzilla_android/ui/theme/ThemedAlertDialogBuilder.java rename to app/src/main/java/com/dfa/hubzilla_android/ui/theme/ThemedAlertDialogBuilder.java index a2869f9..f191f08 100644 --- a/app/src/main/java/com/github/dfa/hubzilla_android/ui/theme/ThemedAlertDialogBuilder.java +++ b/app/src/main/java/com/dfa/hubzilla_android/ui/theme/ThemedAlertDialogBuilder.java @@ -1,4 +1,4 @@ -package com.github.dfa.hubzilla_android.ui.theme; +package com.dfa.hubzilla_android.ui.theme; import android.content.Context; import android.content.DialogInterface; @@ -6,7 +6,7 @@ import android.support.annotation.NonNull; import android.support.annotation.StyleRes; import android.support.v7.app.AlertDialog; -import com.github.dfa.hubzilla_android.util.AppSettings; +import com.dfa.hubzilla_android.util.AppSettings; /** * AlertDialog Builder that colors its buttons diff --git a/app/src/main/java/com/github/dfa/hubzilla_android/ui/theme/ThemedAppCompatDialogFragment.java b/app/src/main/java/com/dfa/hubzilla_android/ui/theme/ThemedAppCompatDialogFragment.java similarity index 85% rename from app/src/main/java/com/github/dfa/hubzilla_android/ui/theme/ThemedAppCompatDialogFragment.java rename to app/src/main/java/com/dfa/hubzilla_android/ui/theme/ThemedAppCompatDialogFragment.java index 34bcba5..36dedf4 100644 --- a/app/src/main/java/com/github/dfa/hubzilla_android/ui/theme/ThemedAppCompatDialogFragment.java +++ b/app/src/main/java/com/dfa/hubzilla_android/ui/theme/ThemedAppCompatDialogFragment.java @@ -1,11 +1,11 @@ -package com.github.dfa.hubzilla_android.ui.theme; +package com.dfa.hubzilla_android.ui.theme; import android.app.Dialog; import android.os.Bundle; import android.support.annotation.NonNull; import android.support.v7.app.AppCompatDialogFragment; -import com.github.dfa.hubzilla_android.util.AppSettings; +import com.dfa.hubzilla_android.util.AppSettings; /** * Themed DialogFragment diff --git a/app/src/main/java/com/github/dfa/hubzilla_android/ui/theme/ThemedCheckBoxPreference.java b/app/src/main/java/com/dfa/hubzilla_android/ui/theme/ThemedCheckBoxPreference.java similarity index 92% rename from app/src/main/java/com/github/dfa/hubzilla_android/ui/theme/ThemedCheckBoxPreference.java rename to app/src/main/java/com/dfa/hubzilla_android/ui/theme/ThemedCheckBoxPreference.java index 08cbea1..0992591 100644 --- a/app/src/main/java/com/github/dfa/hubzilla_android/ui/theme/ThemedCheckBoxPreference.java +++ b/app/src/main/java/com/dfa/hubzilla_android/ui/theme/ThemedCheckBoxPreference.java @@ -1,4 +1,4 @@ -package com.github.dfa.hubzilla_android.ui.theme; +package com.dfa.hubzilla_android.ui.theme; import android.content.Context; import android.preference.CheckBoxPreference; @@ -7,7 +7,7 @@ import android.view.View; import android.view.ViewGroup; import android.widget.CheckBox; -import com.github.dfa.hubzilla_android.util.AppSettings; +import com.dfa.hubzilla_android.util.AppSettings; /** * CheckboxPreference that colors its checkbox with accent color diff --git a/app/src/main/java/com/github/dfa/hubzilla_android/ui/theme/ThemedColorPickerPreference.java b/app/src/main/java/com/dfa/hubzilla_android/ui/theme/ThemedColorPickerPreference.java similarity index 90% rename from app/src/main/java/com/github/dfa/hubzilla_android/ui/theme/ThemedColorPickerPreference.java rename to app/src/main/java/com/dfa/hubzilla_android/ui/theme/ThemedColorPickerPreference.java index b41fdbb..548dac6 100644 --- a/app/src/main/java/com/github/dfa/hubzilla_android/ui/theme/ThemedColorPickerPreference.java +++ b/app/src/main/java/com/dfa/hubzilla_android/ui/theme/ThemedColorPickerPreference.java @@ -1,4 +1,4 @@ -package com.github.dfa.hubzilla_android.ui.theme; +package com.dfa.hubzilla_android.ui.theme; import android.content.Context; import android.graphics.PorterDuff; @@ -8,9 +8,9 @@ import android.util.AttributeSet; import android.view.View; import android.widget.ImageView; -import com.github.dfa.hubzilla_android.R; -import com.github.dfa.hubzilla_android.util.AppSettings; -import com.github.dfa.hubzilla_android.util.ContextUtils; +import com.dfa.hubzilla_android.R; +import com.dfa.hubzilla_android.util.AppSettings; +import com.dfa.hubzilla_android.util.ContextUtils; /** * Preference that shows selected Color in a circle diff --git a/app/src/main/java/com/github/dfa/hubzilla_android/ui/theme/ThemedFragment.java b/app/src/main/java/com/dfa/hubzilla_android/ui/theme/ThemedFragment.java similarity index 86% rename from app/src/main/java/com/github/dfa/hubzilla_android/ui/theme/ThemedFragment.java rename to app/src/main/java/com/dfa/hubzilla_android/ui/theme/ThemedFragment.java index 0cab197..c252afe 100644 --- a/app/src/main/java/com/github/dfa/hubzilla_android/ui/theme/ThemedFragment.java +++ b/app/src/main/java/com/dfa/hubzilla_android/ui/theme/ThemedFragment.java @@ -16,12 +16,12 @@ If not, see . */ -package com.github.dfa.hubzilla_android.ui.theme; +package com.dfa.hubzilla_android.ui.theme; -import com.github.dfa.hubzilla_android.App; -import com.github.dfa.hubzilla_android.util.AppSettings; +import com.dfa.hubzilla_android.App; +import com.dfa.hubzilla_android.util.AppSettings; -import net.gsantner.opoc.activity.GsFragmentBase; +import net.opoc.activity.GsFragmentBase; /** * Fragment that supports color schemes diff --git a/app/src/main/java/com/github/dfa/hubzilla_android/ui/theme/ThemedPreferenceCategory.java b/app/src/main/java/com/dfa/hubzilla_android/ui/theme/ThemedPreferenceCategory.java similarity index 92% rename from app/src/main/java/com/github/dfa/hubzilla_android/ui/theme/ThemedPreferenceCategory.java rename to app/src/main/java/com/dfa/hubzilla_android/ui/theme/ThemedPreferenceCategory.java index 09a0676..d7919f8 100644 --- a/app/src/main/java/com/github/dfa/hubzilla_android/ui/theme/ThemedPreferenceCategory.java +++ b/app/src/main/java/com/dfa/hubzilla_android/ui/theme/ThemedPreferenceCategory.java @@ -1,4 +1,4 @@ -package com.github.dfa.hubzilla_android.ui.theme; +package com.dfa.hubzilla_android.ui.theme; import android.content.Context; import android.preference.PreferenceCategory; @@ -7,7 +7,7 @@ import android.view.View; import android.view.ViewGroup; import android.widget.TextView; -import com.github.dfa.hubzilla_android.util.AppSettings; +import com.dfa.hubzilla_android.util.AppSettings; /** * PreferenceCategory with a colored title diff --git a/app/src/main/java/com/github/dfa/hubzilla_android/ui/theme/ThemedPreferenceFragment.java b/app/src/main/java/com/dfa/hubzilla_android/ui/theme/ThemedPreferenceFragment.java similarity index 90% rename from app/src/main/java/com/github/dfa/hubzilla_android/ui/theme/ThemedPreferenceFragment.java rename to app/src/main/java/com/dfa/hubzilla_android/ui/theme/ThemedPreferenceFragment.java index e13bc5a..4af4c2b 100644 --- a/app/src/main/java/com/github/dfa/hubzilla_android/ui/theme/ThemedPreferenceFragment.java +++ b/app/src/main/java/com/dfa/hubzilla_android/ui/theme/ThemedPreferenceFragment.java @@ -1,4 +1,4 @@ -package com.github.dfa.hubzilla_android.ui.theme; +package com.dfa.hubzilla_android.ui.theme; import android.os.Build; import android.preference.Preference; @@ -6,8 +6,8 @@ import android.preference.PreferenceFragment; import android.preference.PreferenceScreen; import android.view.Window; -import com.github.dfa.hubzilla_android.App; -import com.github.dfa.hubzilla_android.util.AppSettings; +import com.dfa.hubzilla_android.App; +import com.dfa.hubzilla_android.util.AppSettings; /** * PreferenceFragment with a colored status bar diff --git a/app/src/main/java/com/github/dfa/hubzilla_android/ui/theme/ThemedVisibilityPreference.java b/app/src/main/java/com/dfa/hubzilla_android/ui/theme/ThemedVisibilityPreference.java similarity index 86% rename from app/src/main/java/com/github/dfa/hubzilla_android/ui/theme/ThemedVisibilityPreference.java rename to app/src/main/java/com/dfa/hubzilla_android/ui/theme/ThemedVisibilityPreference.java index deb24c5..02f8cdc 100644 --- a/app/src/main/java/com/github/dfa/hubzilla_android/ui/theme/ThemedVisibilityPreference.java +++ b/app/src/main/java/com/dfa/hubzilla_android/ui/theme/ThemedVisibilityPreference.java @@ -1,11 +1,11 @@ -package com.github.dfa.hubzilla_android.ui.theme; +package com.dfa.hubzilla_android.ui.theme; import android.content.Context; import android.util.AttributeSet; import android.widget.CheckBox; -import com.github.dfa.hubzilla_android.R; -import com.github.dfa.hubzilla_android.util.AppSettings; +import com.dfa.hubzilla_android.R; +import com.dfa.hubzilla_android.util.AppSettings; /** * ThemedCheckBoxPreference with visibility icons instead of checkbox. TODO: Make more flexible? diff --git a/app/src/main/java/com/github/dfa/hubzilla_android/util/ActivityUtils.java b/app/src/main/java/com/dfa/hubzilla_android/util/ActivityUtils.java similarity index 91% rename from app/src/main/java/com/github/dfa/hubzilla_android/util/ActivityUtils.java rename to app/src/main/java/com/dfa/hubzilla_android/util/ActivityUtils.java index 05008e1..58ce816 100644 --- a/app/src/main/java/com/github/dfa/hubzilla_android/util/ActivityUtils.java +++ b/app/src/main/java/com/dfa/hubzilla_android/util/ActivityUtils.java @@ -1,4 +1,4 @@ -package com.github.dfa.hubzilla_android.util; +package com.dfa.hubzilla_android.util; import android.app.Activity; import android.content.Context; @@ -8,9 +8,9 @@ import android.os.Environment; import android.support.v4.content.FileProvider; import android.view.View; -import com.github.dfa.hubzilla_android.BuildConfig; -import com.github.dfa.hubzilla_android.R; -import com.github.dfa.hubzilla_android.web.WebHelper; +import com.dfa.hubzilla_android.BuildConfig; +import com.dfa.hubzilla_android.R; +import com.dfa.hubzilla_android.web.WebHelper; import java.io.File; import java.io.IOException; @@ -20,7 +20,7 @@ import java.util.Date; import java.util.Locale; @SuppressWarnings({"WeakerAccess", "unused", "SameParameterValue"}) -public class ActivityUtils extends net.gsantner.opoc.util.ActivityUtils { +public class ActivityUtils extends net.opoc.util.ActivityUtils { public ActivityUtils(Activity activity) { super(activity); } diff --git a/app/src/main/java/com/github/dfa/hubzilla_android/util/AndroidBug5497Workaround.java b/app/src/main/java/com/dfa/hubzilla_android/util/AndroidBug5497Workaround.java similarity index 97% rename from app/src/main/java/com/github/dfa/hubzilla_android/util/AndroidBug5497Workaround.java rename to app/src/main/java/com/dfa/hubzilla_android/util/AndroidBug5497Workaround.java index 1607fed..aa0b7ae 100644 --- a/app/src/main/java/com/github/dfa/hubzilla_android/util/AndroidBug5497Workaround.java +++ b/app/src/main/java/com/dfa/hubzilla_android/util/AndroidBug5497Workaround.java @@ -1,4 +1,4 @@ -package com.github.dfa.hubzilla_android.util; +package com.dfa.hubzilla_android.util; import android.app.Activity; diff --git a/app/src/main/java/com/github/dfa/hubzilla_android/util/AppLog.java b/app/src/main/java/com/dfa/hubzilla_android/util/AppLog.java similarity index 99% rename from app/src/main/java/com/github/dfa/hubzilla_android/util/AppLog.java rename to app/src/main/java/com/dfa/hubzilla_android/util/AppLog.java index add0562..ffbda79 100644 --- a/app/src/main/java/com/github/dfa/hubzilla_android/util/AppLog.java +++ b/app/src/main/java/com/dfa/hubzilla_android/util/AppLog.java @@ -16,7 +16,7 @@ If not, see . */ -package com.github.dfa.hubzilla_android.util; +package com.dfa.hubzilla_android.util; import java.text.DateFormat; import java.text.SimpleDateFormat; diff --git a/app/src/main/java/com/github/dfa/hubzilla_android/util/AppSettings.java b/app/src/main/java/com/dfa/hubzilla_android/util/AppSettings.java similarity index 97% rename from app/src/main/java/com/github/dfa/hubzilla_android/util/AppSettings.java rename to app/src/main/java/com/dfa/hubzilla_android/util/AppSettings.java index e19649c..a325a7d 100644 --- a/app/src/main/java/com/github/dfa/hubzilla_android/util/AppSettings.java +++ b/app/src/main/java/com/dfa/hubzilla_android/util/AppSettings.java @@ -12,7 +12,7 @@ along with the dandelion*. If not, see . */ -package com.github.dfa.hubzilla_android.util; +package com.dfa.hubzilla_android.util; import android.annotation.SuppressLint; import android.content.Context; @@ -20,14 +20,14 @@ import android.content.SharedPreferences; import android.graphics.Color; import android.os.Environment; -import com.github.dfa.hubzilla_android.App; -import com.github.dfa.hubzilla_android.BuildConfig; -import com.github.dfa.hubzilla_android.R; -import com.github.dfa.hubzilla_android.data.DiasporaAspect; -import com.github.dfa.hubzilla_android.data.DiasporaPodList.DiasporaPod; -import com.github.dfa.hubzilla_android.web.ProxyHandler; +import com.dfa.hubzilla_android.App; +import com.dfa.hubzilla_android.BuildConfig; +import com.dfa.hubzilla_android.R; +import com.dfa.hubzilla_android.data.DiasporaAspect; +import com.dfa.hubzilla_android.data.DiasporaPodList.DiasporaPod; +import com.dfa.hubzilla_android.web.ProxyHandler; -import net.gsantner.opoc.preference.SharedPreferencesPropertyBackend; +import net.opoc.preference.SharedPreferencesPropertyBackend; import org.json.JSONException; import org.json.JSONObject; diff --git a/app/src/main/java/com/github/dfa/hubzilla_android/util/ContextUtils.java b/app/src/main/java/com/dfa/hubzilla_android/util/ContextUtils.java similarity index 92% rename from app/src/main/java/com/github/dfa/hubzilla_android/util/ContextUtils.java rename to app/src/main/java/com/dfa/hubzilla_android/util/ContextUtils.java index 3e71a41..764fc50 100644 --- a/app/src/main/java/com/github/dfa/hubzilla_android/util/ContextUtils.java +++ b/app/src/main/java/com/dfa/hubzilla_android/util/ContextUtils.java @@ -1,10 +1,10 @@ -package com.github.dfa.hubzilla_android.util; +package com.dfa.hubzilla_android.util; import android.content.Context; import android.os.Bundle; import android.os.Environment; -import com.github.dfa.hubzilla_android.App; +import com.dfa.hubzilla_android.App; import java.io.File; import java.io.IOException; @@ -14,7 +14,7 @@ import java.util.Date; import java.util.Locale; @SuppressWarnings({"WeakerAccess", "unused", "SameParameterValue"}) -public class ContextUtils extends net.gsantner.opoc.util.ContextUtils { +public class ContextUtils extends net.opoc.util.ContextUtils { protected ContextUtils(Context context) { super(context); } diff --git a/app/src/main/java/com/github/dfa/hubzilla_android/util/DiasporaUrlHelper.java b/app/src/main/java/com/dfa/hubzilla_android/util/DiasporaUrlHelper.java similarity index 97% rename from app/src/main/java/com/github/dfa/hubzilla_android/util/DiasporaUrlHelper.java rename to app/src/main/java/com/dfa/hubzilla_android/util/DiasporaUrlHelper.java index b461abf..c17e47d 100644 --- a/app/src/main/java/com/github/dfa/hubzilla_android/util/DiasporaUrlHelper.java +++ b/app/src/main/java/com/dfa/hubzilla_android/util/DiasporaUrlHelper.java @@ -16,12 +16,12 @@ If not, see . */ -package com.github.dfa.hubzilla_android.util; +package com.dfa.hubzilla_android.util; -import com.github.dfa.hubzilla_android.App; -import com.github.dfa.hubzilla_android.R; -import com.github.dfa.hubzilla_android.data.DiasporaAspect; -import com.github.dfa.hubzilla_android.data.DiasporaPodList.DiasporaPod; +import com.dfa.hubzilla_android.App; +import com.dfa.hubzilla_android.R; +import com.dfa.hubzilla_android.data.DiasporaAspect; +import com.dfa.hubzilla_android.data.DiasporaPodList.DiasporaPod; /** * Helper class that provides easy access to specific urls related to diaspora diff --git a/app/src/main/java/com/github/dfa/hubzilla_android/web/BrowserFragment.java b/app/src/main/java/com/dfa/hubzilla_android/web/BrowserFragment.java similarity index 93% rename from app/src/main/java/com/github/dfa/hubzilla_android/web/BrowserFragment.java rename to app/src/main/java/com/dfa/hubzilla_android/web/BrowserFragment.java index 99d1175..4fc83a7 100644 --- a/app/src/main/java/com/github/dfa/hubzilla_android/web/BrowserFragment.java +++ b/app/src/main/java/com/dfa/hubzilla_android/web/BrowserFragment.java @@ -16,7 +16,7 @@ If not, see . */ -package com.github.dfa.hubzilla_android.web; +package com.dfa.hubzilla_android.web; import android.content.Context; import android.content.MutableContextWrapper; @@ -27,12 +27,12 @@ import android.webkit.WebSettings; import android.webkit.WebView; import android.widget.ProgressBar; -import com.github.dfa.hubzilla_android.App; -import com.github.dfa.hubzilla_android.R; -import com.github.dfa.hubzilla_android.ui.theme.ThemeHelper; -import com.github.dfa.hubzilla_android.ui.theme.ThemedFragment; -import com.github.dfa.hubzilla_android.util.AppLog; -import com.github.dfa.hubzilla_android.util.AppSettings; +import com.dfa.hubzilla_android.App; +import com.dfa.hubzilla_android.R; +import com.dfa.hubzilla_android.ui.theme.ThemeHelper; +import com.dfa.hubzilla_android.ui.theme.ThemedFragment; +import com.dfa.hubzilla_android.util.AppLog; +import com.dfa.hubzilla_android.util.AppSettings; /** * Fragment with a webView and a ProgressBar. @@ -41,7 +41,7 @@ import com.github.dfa.hubzilla_android.util.AppSettings; */ public class BrowserFragment extends ThemedFragment { - public static final String TAG = "com.github.dfa.hubzilla_android.BrowserFragment"; + public static final String TAG = "com.dfa.hubzilla_android.BrowserFragment"; protected ContextMenuWebView webView; protected ProgressBar progressBar; diff --git a/app/src/main/java/com/github/dfa/hubzilla_android/web/ContextMenuWebView.java b/app/src/main/java/com/dfa/hubzilla_android/web/ContextMenuWebView.java similarity index 96% rename from app/src/main/java/com/github/dfa/hubzilla_android/web/ContextMenuWebView.java rename to app/src/main/java/com/dfa/hubzilla_android/web/ContextMenuWebView.java index b6d382b..a6f90ed 100644 --- a/app/src/main/java/com/github/dfa/hubzilla_android/web/ContextMenuWebView.java +++ b/app/src/main/java/com/dfa/hubzilla_android/web/ContextMenuWebView.java @@ -16,7 +16,7 @@ If not, see . */ -package com.github.dfa.hubzilla_android.web; +package com.dfa.hubzilla_android.web; import android.app.Activity; import android.content.ClipData; @@ -29,13 +29,13 @@ import android.view.ContextMenu; import android.view.MenuItem; import android.widget.Toast; -import com.github.dfa.hubzilla_android.BuildConfig; -import com.github.dfa.hubzilla_android.R; -import com.github.dfa.hubzilla_android.util.AppSettings; +import com.dfa.hubzilla_android.BuildConfig; +import com.dfa.hubzilla_android.R; +import com.dfa.hubzilla_android.util.AppSettings; -import net.gsantner.opoc.util.DownloadTask; -import net.gsantner.opoc.util.PermissionChecker; -import net.gsantner.opoc.util.ShareUtil; +import net.opoc.util.DownloadTask; +import net.opoc.util.PermissionChecker; +import net.opoc.util.ShareUtil; import java.io.File; import java.util.Date; diff --git a/app/src/main/java/com/github/dfa/hubzilla_android/web/CustomWebViewClient.java b/app/src/main/java/com/dfa/hubzilla_android/web/CustomWebViewClient.java similarity index 91% rename from app/src/main/java/com/github/dfa/hubzilla_android/web/CustomWebViewClient.java rename to app/src/main/java/com/dfa/hubzilla_android/web/CustomWebViewClient.java index e09dd6a..eb98571 100644 --- a/app/src/main/java/com/github/dfa/hubzilla_android/web/CustomWebViewClient.java +++ b/app/src/main/java/com/dfa/hubzilla_android/web/CustomWebViewClient.java @@ -16,7 +16,7 @@ If not, see . */ -package com.github.dfa.hubzilla_android.web; +package com.dfa.hubzilla_android.web; import android.annotation.TargetApi; import android.content.Intent; @@ -27,12 +27,12 @@ import android.webkit.WebResourceResponse; import android.webkit.WebView; import android.webkit.WebViewClient; -import com.github.dfa.hubzilla_android.App; -import com.github.dfa.hubzilla_android.activity.MainActivity; -import com.github.dfa.hubzilla_android.data.DiasporaPodList; -import com.github.dfa.hubzilla_android.util.AppSettings; +import com.dfa.hubzilla_android.App; +import com.dfa.hubzilla_android.activity.MainActivity; +import com.dfa.hubzilla_android.data.DiasporaPodList; +import com.dfa.hubzilla_android.util.AppSettings; -import net.gsantner.opoc.util.AdBlock; +import net.opoc.util.AdBlock; public class CustomWebViewClient extends WebViewClient { private final App app; diff --git a/app/src/main/java/com/github/dfa/hubzilla_android/web/DiasporaStreamWebChromeClient.java b/app/src/main/java/com/dfa/hubzilla_android/web/DiasporaStreamWebChromeClient.java similarity index 91% rename from app/src/main/java/com/github/dfa/hubzilla_android/web/DiasporaStreamWebChromeClient.java rename to app/src/main/java/com/dfa/hubzilla_android/web/DiasporaStreamWebChromeClient.java index c1e0552..8087a91 100644 --- a/app/src/main/java/com/github/dfa/hubzilla_android/web/DiasporaStreamWebChromeClient.java +++ b/app/src/main/java/com/dfa/hubzilla_android/web/DiasporaStreamWebChromeClient.java @@ -16,16 +16,16 @@ If not, see . */ -package com.github.dfa.hubzilla_android.web; +package com.dfa.hubzilla_android.web; import android.webkit.JsResult; import android.webkit.WebView; import android.widget.ProgressBar; -import com.github.dfa.hubzilla_android.R; -import com.github.dfa.hubzilla_android.ui.theme.ThemedAlertDialogBuilder; -import com.github.dfa.hubzilla_android.util.AppLog; -import com.github.dfa.hubzilla_android.util.AppSettings; +import com.dfa.hubzilla_android.R; +import com.dfa.hubzilla_android.ui.theme.ThemedAlertDialogBuilder; +import com.dfa.hubzilla_android.util.AppLog; +import com.dfa.hubzilla_android.util.AppSettings; /** * WebChromeClient that handles sharing text to diaspora* diff --git a/app/src/main/java/com/github/dfa/hubzilla_android/web/FileUploadWebChromeClient.java b/app/src/main/java/com/dfa/hubzilla_android/web/FileUploadWebChromeClient.java similarity index 97% rename from app/src/main/java/com/github/dfa/hubzilla_android/web/FileUploadWebChromeClient.java rename to app/src/main/java/com/dfa/hubzilla_android/web/FileUploadWebChromeClient.java index 6e67c81..327d99b 100644 --- a/app/src/main/java/com/github/dfa/hubzilla_android/web/FileUploadWebChromeClient.java +++ b/app/src/main/java/com/dfa/hubzilla_android/web/FileUploadWebChromeClient.java @@ -16,7 +16,7 @@ If not, see . */ -package com.github.dfa.hubzilla_android.web; +package com.dfa.hubzilla_android.web; import android.net.Uri; import android.webkit.ValueCallback; diff --git a/app/src/main/java/com/github/dfa/hubzilla_android/web/NestedWebView.java b/app/src/main/java/com/dfa/hubzilla_android/web/NestedWebView.java similarity index 99% rename from app/src/main/java/com/github/dfa/hubzilla_android/web/NestedWebView.java rename to app/src/main/java/com/dfa/hubzilla_android/web/NestedWebView.java index 074ab9f..30987b4 100644 --- a/app/src/main/java/com/github/dfa/hubzilla_android/web/NestedWebView.java +++ b/app/src/main/java/com/dfa/hubzilla_android/web/NestedWebView.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.github.dfa.hubzilla_android.web; +package com.dfa.hubzilla_android.web; import android.content.Context; import android.support.v4.view.MotionEventCompat; diff --git a/app/src/main/java/com/github/dfa/hubzilla_android/web/ProgressBarWebChromeClient.java b/app/src/main/java/com/dfa/hubzilla_android/web/ProgressBarWebChromeClient.java similarity index 97% rename from app/src/main/java/com/github/dfa/hubzilla_android/web/ProgressBarWebChromeClient.java rename to app/src/main/java/com/dfa/hubzilla_android/web/ProgressBarWebChromeClient.java index aad4d6d..7625f36 100644 --- a/app/src/main/java/com/github/dfa/hubzilla_android/web/ProgressBarWebChromeClient.java +++ b/app/src/main/java/com/dfa/hubzilla_android/web/ProgressBarWebChromeClient.java @@ -16,7 +16,7 @@ If not, see . */ -package com.github.dfa.hubzilla_android.web; +package com.dfa.hubzilla_android.web; import android.view.View; import android.webkit.WebChromeClient; diff --git a/app/src/main/java/com/github/dfa/hubzilla_android/web/ProxyHandler.java b/app/src/main/java/com/dfa/hubzilla_android/web/ProxyHandler.java similarity index 95% rename from app/src/main/java/com/github/dfa/hubzilla_android/web/ProxyHandler.java rename to app/src/main/java/com/dfa/hubzilla_android/web/ProxyHandler.java index 8028e98..cef9e5b 100644 --- a/app/src/main/java/com/github/dfa/hubzilla_android/web/ProxyHandler.java +++ b/app/src/main/java/com/dfa/hubzilla_android/web/ProxyHandler.java @@ -16,15 +16,15 @@ If not, see . */ -package com.github.dfa.hubzilla_android.web; +package com.dfa.hubzilla_android.web; import android.content.Context; import android.os.StrictMode; import android.webkit.WebView; -import com.github.dfa.hubzilla_android.activity.MainActivity; -import com.github.dfa.hubzilla_android.util.AppLog; -import com.github.dfa.hubzilla_android.util.AppSettings; +import com.dfa.hubzilla_android.activity.MainActivity; +import com.dfa.hubzilla_android.util.AppLog; +import com.dfa.hubzilla_android.util.AppSettings; import java.util.ArrayList; diff --git a/app/src/main/java/com/github/dfa/hubzilla_android/web/WebHelper.java b/app/src/main/java/com/dfa/hubzilla_android/web/WebHelper.java similarity index 98% rename from app/src/main/java/com/github/dfa/hubzilla_android/web/WebHelper.java rename to app/src/main/java/com/dfa/hubzilla_android/web/WebHelper.java index dcd88fc..71f9885 100644 --- a/app/src/main/java/com/github/dfa/hubzilla_android/web/WebHelper.java +++ b/app/src/main/java/com/dfa/hubzilla_android/web/WebHelper.java @@ -17,7 +17,7 @@ If not, see . */ -package com.github.dfa.hubzilla_android.web; +package com.dfa.hubzilla_android.web; import android.content.Context; import android.content.Intent; @@ -28,7 +28,7 @@ import android.text.Html; import android.webkit.URLUtil; import android.webkit.WebView; -import com.github.dfa.hubzilla_android.activity.MainActivity; +import com.dfa.hubzilla_android.activity.MainActivity; /** * Created by Gregor Santner on 07.08.16. diff --git a/app/src/main/java/com/github/dfa/hubzilla_android/web/custom_tab/BrowserFallback.java b/app/src/main/java/com/dfa/hubzilla_android/web/custom_tab/BrowserFallback.java similarity index 95% rename from app/src/main/java/com/github/dfa/hubzilla_android/web/custom_tab/BrowserFallback.java rename to app/src/main/java/com/dfa/hubzilla_android/web/custom_tab/BrowserFallback.java index a078777..d07e5dc 100644 --- a/app/src/main/java/com/github/dfa/hubzilla_android/web/custom_tab/BrowserFallback.java +++ b/app/src/main/java/com/dfa/hubzilla_android/web/custom_tab/BrowserFallback.java @@ -16,7 +16,7 @@ If not, see . */ -package com.github.dfa.hubzilla_android.web.custom_tab; +package com.dfa.hubzilla_android.web.custom_tab; import android.app.Activity; import android.content.Intent; diff --git a/app/src/main/java/com/github/dfa/hubzilla_android/web/custom_tab/CustomTabActivityHelper.java b/app/src/main/java/com/dfa/hubzilla_android/web/custom_tab/CustomTabActivityHelper.java similarity index 99% rename from app/src/main/java/com/github/dfa/hubzilla_android/web/custom_tab/CustomTabActivityHelper.java rename to app/src/main/java/com/dfa/hubzilla_android/web/custom_tab/CustomTabActivityHelper.java index 4265a6c..a6506ef 100644 --- a/app/src/main/java/com/github/dfa/hubzilla_android/web/custom_tab/CustomTabActivityHelper.java +++ b/app/src/main/java/com/dfa/hubzilla_android/web/custom_tab/CustomTabActivityHelper.java @@ -16,7 +16,7 @@ If not, see . */ -package com.github.dfa.hubzilla_android.web.custom_tab; +package com.dfa.hubzilla_android.web.custom_tab; import android.app.Activity; import android.content.ComponentName; diff --git a/app/src/main/java/com/github/dfa/hubzilla_android/web/custom_tab/CustomTabsHelper.java b/app/src/main/java/com/dfa/hubzilla_android/web/custom_tab/CustomTabsHelper.java similarity index 98% rename from app/src/main/java/com/github/dfa/hubzilla_android/web/custom_tab/CustomTabsHelper.java rename to app/src/main/java/com/dfa/hubzilla_android/web/custom_tab/CustomTabsHelper.java index 6f5264c..c039531 100644 --- a/app/src/main/java/com/github/dfa/hubzilla_android/web/custom_tab/CustomTabsHelper.java +++ b/app/src/main/java/com/dfa/hubzilla_android/web/custom_tab/CustomTabsHelper.java @@ -16,7 +16,7 @@ If not, see . */ -package com.github.dfa.hubzilla_android.web.custom_tab; +package com.dfa.hubzilla_android.web.custom_tab; import android.content.Context; import android.content.Intent; @@ -27,7 +27,7 @@ import android.net.Uri; import android.support.customtabs.CustomTabsService; import android.text.TextUtils; -import com.github.dfa.hubzilla_android.util.AppLog; +import com.dfa.hubzilla_android.util.AppLog; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/net/gsantner/opoc/activity/GsFragmentBase.java b/app/src/main/java/net/opoc/activity/GsFragmentBase.java similarity index 98% rename from app/src/main/java/net/gsantner/opoc/activity/GsFragmentBase.java rename to app/src/main/java/net/opoc/activity/GsFragmentBase.java index 93019ce..de042aa 100644 --- a/app/src/main/java/net/gsantner/opoc/activity/GsFragmentBase.java +++ b/app/src/main/java/net/opoc/activity/GsFragmentBase.java @@ -8,7 +8,7 @@ * https://www.apache.org/licenses/LICENSE-2.0 * #########################################################*/ -package net.gsantner.opoc.activity; +package net.opoc.activity; import android.content.Context; import android.os.Bundle; @@ -20,7 +20,7 @@ import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; -import net.gsantner.opoc.util.ContextUtils; +import net.opoc.util.ContextUtils; import butterknife.ButterKnife; diff --git a/app/src/main/java/net/gsantner/opoc/format/markdown/SimpleMarkdownParser.java b/app/src/main/java/net/opoc/format/markdown/SimpleMarkdownParser.java similarity index 99% rename from app/src/main/java/net/gsantner/opoc/format/markdown/SimpleMarkdownParser.java rename to app/src/main/java/net/opoc/format/markdown/SimpleMarkdownParser.java index adaafa3..050e84f 100644 --- a/app/src/main/java/net/gsantner/opoc/format/markdown/SimpleMarkdownParser.java +++ b/app/src/main/java/net/opoc/format/markdown/SimpleMarkdownParser.java @@ -22,7 +22,7 @@ * FILTER_WEB is intended to be used at engines understanding most common HTML tags. */ -package net.gsantner.opoc.format.markdown; +package net.opoc.format.markdown; import java.io.BufferedReader; import java.io.FileInputStream; diff --git a/app/src/main/java/net/gsantner/opoc/preference/PropertyBackend.java b/app/src/main/java/net/opoc/preference/PropertyBackend.java similarity index 97% rename from app/src/main/java/net/gsantner/opoc/preference/PropertyBackend.java rename to app/src/main/java/net/opoc/preference/PropertyBackend.java index f134122..4bc8490 100644 --- a/app/src/main/java/net/gsantner/opoc/preference/PropertyBackend.java +++ b/app/src/main/java/net/opoc/preference/PropertyBackend.java @@ -8,7 +8,7 @@ * https://www.apache.org/licenses/LICENSE-2.0 * #########################################################*/ -package net.gsantner.opoc.preference; +package net.opoc.preference; import java.util.List; diff --git a/app/src/main/java/net/gsantner/opoc/preference/SharedPreferencesPropertyBackend.java b/app/src/main/java/net/opoc/preference/SharedPreferencesPropertyBackend.java similarity index 99% rename from app/src/main/java/net/gsantner/opoc/preference/SharedPreferencesPropertyBackend.java rename to app/src/main/java/net/opoc/preference/SharedPreferencesPropertyBackend.java index bfcce37..ff724a8 100644 --- a/app/src/main/java/net/gsantner/opoc/preference/SharedPreferencesPropertyBackend.java +++ b/app/src/main/java/net/opoc/preference/SharedPreferencesPropertyBackend.java @@ -31,7 +31,7 @@ } */ -package net.gsantner.opoc.preference; +package net.opoc.preference; import android.annotation.SuppressLint; import android.content.Context; diff --git a/app/src/main/java/net/gsantner/opoc/preference/nonsupport/LanguagePreference.java b/app/src/main/java/net/opoc/preference/nonsupport/LanguagePreference.java similarity index 97% rename from app/src/main/java/net/gsantner/opoc/preference/nonsupport/LanguagePreference.java rename to app/src/main/java/net/opoc/preference/nonsupport/LanguagePreference.java index 76284a1..483c295 100644 --- a/app/src/main/java/net/gsantner/opoc/preference/nonsupport/LanguagePreference.java +++ b/app/src/main/java/net/opoc/preference/nonsupport/LanguagePreference.java @@ -37,13 +37,13 @@ static String getUsedAndroidLanguages() { * Summary: Change language of this app. Restart app for changes to take effect * Define element in Preferences-XML: - */ -package net.gsantner.opoc.preference.nonsupport; +package net.opoc.preference.nonsupport; import android.annotation.TargetApi; import android.content.Context; @@ -53,7 +53,7 @@ import android.support.annotation.Nullable; import android.text.TextUtils; import android.util.AttributeSet; -import net.gsantner.opoc.util.ContextUtils; +import net.opoc.util.ContextUtils; import java.util.ArrayList; import java.util.Collections; diff --git a/app/src/main/java/net/gsantner/opoc/util/ActivityUtils.java b/app/src/main/java/net/opoc/util/ActivityUtils.java similarity index 98% rename from app/src/main/java/net/gsantner/opoc/util/ActivityUtils.java rename to app/src/main/java/net/opoc/util/ActivityUtils.java index 7c72b72..4bb6475 100644 --- a/app/src/main/java/net/gsantner/opoc/util/ActivityUtils.java +++ b/app/src/main/java/net/opoc/util/ActivityUtils.java @@ -8,7 +8,7 @@ * https://www.apache.org/licenses/LICENSE-2.0 * #########################################################*/ -package net.gsantner.opoc.util; +package net.opoc.util; import android.app.Activity; import android.content.ActivityNotFoundException; @@ -32,7 +32,7 @@ import android.webkit.WebView; @SuppressWarnings({"WeakerAccess", "unused", "SameParameterValue", "SpellCheckingInspection"}) -public class ActivityUtils extends net.gsantner.opoc.util.ContextUtils { +public class ActivityUtils extends net.opoc.util.ContextUtils { //######################## //## Members, Constructors //######################## diff --git a/app/src/main/java/net/gsantner/opoc/util/AdBlock.java b/app/src/main/java/net/opoc/util/AdBlock.java similarity index 98% rename from app/src/main/java/net/gsantner/opoc/util/AdBlock.java rename to app/src/main/java/net/opoc/util/AdBlock.java index e16d2de..24ec515 100644 --- a/app/src/main/java/net/gsantner/opoc/util/AdBlock.java +++ b/app/src/main/java/net/opoc/util/AdBlock.java @@ -23,13 +23,13 @@ public WebResourceResponse shouldInterceptRequest(WebView view, String url) { : super.shouldInterceptRequest(view, url); } */ -package net.gsantner.opoc.util; +package net.opoc.util; import android.content.Context; import android.util.Log; import android.webkit.WebResourceResponse; -import com.github.dfa.hubzilla_android.R; +import com.dfa.hubzilla_android.R; import java.io.BufferedReader; import java.io.ByteArrayInputStream; diff --git a/app/src/main/java/net/gsantner/opoc/util/Callback.java b/app/src/main/java/net/opoc/util/Callback.java similarity index 96% rename from app/src/main/java/net/gsantner/opoc/util/Callback.java rename to app/src/main/java/net/opoc/util/Callback.java index a08ff68..17ddb4a 100644 --- a/app/src/main/java/net/gsantner/opoc/util/Callback.java +++ b/app/src/main/java/net/opoc/util/Callback.java @@ -8,7 +8,7 @@ * https://www.apache.org/licenses/LICENSE-2.0 * #########################################################*/ -package net.gsantner.opoc.util; +package net.opoc.util; @SuppressWarnings("unused") public class Callback { diff --git a/app/src/main/java/net/gsantner/opoc/util/ContextUtils.java b/app/src/main/java/net/opoc/util/ContextUtils.java similarity index 99% rename from app/src/main/java/net/gsantner/opoc/util/ContextUtils.java rename to app/src/main/java/net/opoc/util/ContextUtils.java index ba96c11..cc88a66 100644 --- a/app/src/main/java/net/gsantner/opoc/util/ContextUtils.java +++ b/app/src/main/java/net/opoc/util/ContextUtils.java @@ -8,7 +8,7 @@ * https://www.apache.org/licenses/LICENSE-2.0 * #########################################################*/ -package net.gsantner.opoc.util; +package net.opoc.util; import android.annotation.SuppressLint; import android.app.AlarmManager; @@ -57,7 +57,7 @@ import android.view.MenuItem; import android.widget.ImageView; import android.widget.TextView; -import net.gsantner.opoc.format.markdown.SimpleMarkdownParser; +import net.opoc.format.markdown.SimpleMarkdownParser; import java.io.BufferedReader; import java.io.File; diff --git a/app/src/main/java/net/gsantner/opoc/util/DownloadTask.java b/app/src/main/java/net/opoc/util/DownloadTask.java similarity index 98% rename from app/src/main/java/net/gsantner/opoc/util/DownloadTask.java rename to app/src/main/java/net/opoc/util/DownloadTask.java index aec5b86..2853728 100644 --- a/app/src/main/java/net/gsantner/opoc/util/DownloadTask.java +++ b/app/src/main/java/net/opoc/util/DownloadTask.java @@ -16,7 +16,7 @@ If not, see . */ -package net.gsantner.opoc.util; +package net.opoc.util; import android.os.AsyncTask; import android.support.annotation.Nullable; diff --git a/app/src/main/java/net/gsantner/opoc/util/FileUtils.java b/app/src/main/java/net/opoc/util/FileUtils.java similarity index 99% rename from app/src/main/java/net/gsantner/opoc/util/FileUtils.java rename to app/src/main/java/net/opoc/util/FileUtils.java index 15a417a..6f7c0f0 100644 --- a/app/src/main/java/net/gsantner/opoc/util/FileUtils.java +++ b/app/src/main/java/net/opoc/util/FileUtils.java @@ -8,7 +8,7 @@ * https://www.apache.org/licenses/LICENSE-2.0 * #########################################################*/ -package net.gsantner.opoc.util; +package net.opoc.util; import java.io.BufferedInputStream; diff --git a/app/src/main/java/net/gsantner/opoc/util/NetworkUtils.java b/app/src/main/java/net/opoc/util/NetworkUtils.java similarity index 99% rename from app/src/main/java/net/gsantner/opoc/util/NetworkUtils.java rename to app/src/main/java/net/opoc/util/NetworkUtils.java index 5212e5b..ecb970d 100644 --- a/app/src/main/java/net/gsantner/opoc/util/NetworkUtils.java +++ b/app/src/main/java/net/opoc/util/NetworkUtils.java @@ -8,7 +8,7 @@ * https://www.apache.org/licenses/LICENSE-2.0 * #########################################################*/ -package net.gsantner.opoc.util; +package net.opoc.util; import org.json.JSONObject; diff --git a/app/src/main/java/net/gsantner/opoc/util/PermissionChecker.java b/app/src/main/java/net/opoc/util/PermissionChecker.java similarity index 98% rename from app/src/main/java/net/gsantner/opoc/util/PermissionChecker.java rename to app/src/main/java/net/opoc/util/PermissionChecker.java index 2f0bbc6..171bf9a 100644 --- a/app/src/main/java/net/gsantner/opoc/util/PermissionChecker.java +++ b/app/src/main/java/net/opoc/util/PermissionChecker.java @@ -8,7 +8,7 @@ * https://www.apache.org/licenses/LICENSE-2.0 * #########################################################*/ -package net.gsantner.opoc.util; +package net.opoc.util; import android.Manifest; import android.app.Activity; diff --git a/app/src/main/java/net/gsantner/opoc/util/ShareUtil.java b/app/src/main/java/net/opoc/util/ShareUtil.java similarity index 99% rename from app/src/main/java/net/gsantner/opoc/util/ShareUtil.java rename to app/src/main/java/net/opoc/util/ShareUtil.java index d85abc6..07ada94 100644 --- a/app/src/main/java/net/gsantner/opoc/util/ShareUtil.java +++ b/app/src/main/java/net/opoc/util/ShareUtil.java @@ -8,7 +8,7 @@ * https://www.apache.org/licenses/LICENSE-2.0 * #########################################################*/ -package net.gsantner.opoc.util; +package net.opoc.util; import android.app.Activity; import android.content.ClipData; diff --git a/app/src/main/res/layout/about__activity.xml b/app/src/main/res/layout/about__activity.xml index 25933dc..fdd824b 100644 --- a/app/src/main/res/layout/about__activity.xml +++ b/app/src/main/res/layout/about__activity.xml @@ -6,7 +6,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:fitsSystemWindows="true" - tools:context="com.github.dfa.hubzilla_android.activity.AboutActivity"> + tools:context="com.dfa.hubzilla_android.activity.AboutActivity"> + tools:context="com.dfa.hubzilla_android.activity.AboutActivity$AboutFragment"> - + tools:context="com.dfa.hubzilla_android.activity.AboutActivity$DebugFragment"> + tools:context="com.dfa.hubzilla_android.activity.AboutActivity$LicenseFragment"> - - - + tools:context="com.dfa.hubzilla_android.activity.MainActivity"> - diff --git a/app/src/main/res/layout/main__app_bar.xml b/app/src/main/res/layout/main__app_bar.xml index 3116e8c..23e40c9 100644 --- a/app/src/main/res/layout/main__app_bar.xml +++ b/app/src/main/res/layout/main__app_bar.xml @@ -4,7 +4,7 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" - tools:context="com.github.dfa.hubzilla_android.activity.MainActivity"> + tools:context="com.dfa.hubzilla_android.activity.MainActivity"> This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see https://www.gnu.org/licenses/. -`---------------` - -If you want to publish AndHub in an app store, you have to change the app name (AndHub), package name & launcher icon (blue). See "7. Additional Terms" of GPL. -You also have to provide the modifications in source code somewhere online for free. This is explicitly not about building the app and sharing with some friends, it's about app stores. -The reason is, that most app stores allow an app id just once, which would block our uploads if somebody else uploaded. Also, we want to keep control on where the app is published, and want to make sure there is no malware in it. -The F-Droid project team is explicitly allowed to publish AndHub without listed required modifications above at official F-Droid repository. - -## Miscellaneous - -We took some inspiration and code from dandelion\*. Go check it out, its free software as well! - diff --git a/app/src/main/res/raw/.nfs0000000000ea0ec200000004 b/app/src/main/res/raw/.nfs0000000000ea0ec200000004 deleted file mode 100644 index 711efb3..0000000 --- a/app/src/main/res/raw/.nfs0000000000ea0ec200000004 +++ /dev/null @@ -1,16 +0,0 @@ - -**[Massimiliano](https://hub.disroot.org/channel/massimiliano)**
~° Current developer of AndHub diff --git a/app/src/main/res/values/.nfs0000000000ea063800000006 b/app/src/main/res/values/.nfs0000000000ea063800000006 deleted file mode 100644 index 515c188..0000000 --- a/app/src/main/res/values/.nfs0000000000ea063800000006 +++ /dev/null @@ -1,364 +0,0 @@ - - - - @color/d_purple - @color/d_green - @color/d_green - - - @color/d_purple - @color/d_green - @color/d_green - #BBDEFB - #212121 - #727272 - #FFFFFF - #B6B6B6 - - - #ffffff - #000000 - #eeeeee - #c4000000 - @color/md_grey_200 - - #50162d - #1f5c60 - - - - #f44336 - #e91e63 - #9c27b0 - #673ab7 - #3f51b5 - #2196f3 - #00bcd4 - #009688 - #4caf50 - #ffeb3b - #ffc107 - #ff9800 - #795548 - #FFFFFF - #9e9e9e - #000000 - - - #000000 - - #8A000000 - #DE000000 - #8A000000 - @color/md_grey_300 - @color/md_grey_100 - @color/md_grey_200 - @color/md_white_1000 - @color/md_white_1000 - #61000000 - #1F000000 - - @color/md_grey_900 - @color/md_grey_850 - @color/md_grey_800 - @color/md_grey_800 - #4DFFFFFF - #1FFFFFFF - #B3FFFFFF - #FFFFFFFF - #B3FFFFFF - @color/md_black_1000 - - - #FFECB3 - #FFE082 - #FFD54F - #FFCA28 - #FFF8E1 - #FFC107 - #FFB300 - #FFA000 - #FF8F00 - #FF6F00 - #FFE57F - #FFD740 - #FFC400 - #FFAB00 - - #BBDEFB - #90CAF9 - #64B5F6 - #42A5F5 - #E3F2FD - #2196F3 - #1E88E5 - #207be6 - #1976D2 - #195ed2 - #1565C0 - #0D47A1 - #82B1FF - #448AFF - #2979FF - #2962FF - - #CFD8DC - #B0BEC5 - #90A4AE - #78909C - #ECEFF1 - #607D8B - #546E7A - #455A64 - #37474F - #263238 - - #D7CCC8 - #BCAAA4 - #A1887F - #8D6E63 - #EFEBE9 - #795548 - #6D4C41 - #5D4037 - #4E342E - #3E2723 - - #B2EBF2 - #80DEEA - #4DD0E1 - #26C6DA - #E0F7FA - #00BCD4 - #00ACC1 - #0097A7 - #00838F - #006064 - #84FFFF - #18FFFF - #00E5FF - #00B8D4 - - - #FFCCBC - #FFAB91 - #FF8A65 - #FF7043 - #FBE9E7 - #FF5722 - #F4511E - #FF5300 - #E64A19 - #D84315 - #BF360C - #FF9E80 - #FF6E40 - #FF3D00 - #DD2C00 - - #D1C4E9 - #B39DDB - #9575CD - #7E57C2 - #EDE7F6 - #673AB7 - #5E35B1 - #512DA8 - #4527A0 - #311B92 - #B388FF - #7C4DFF - #651FFF - #6200EA - - #C8E6C9 - #A5D6A7 - #81C784 - #66BB6A - #E8F5E9 - #4CAF50 - #43A047 - #388E3C - #2E7D32 - #1B5E20 - #B9F6CA - #69F0AE - #00E676 - #00C853 - - #F5F5F5 - #EEEEEE - #E0E0E0 - #BDBDBD - #FAFAFA - #9E9E9E - #757575 - #616161 - #424242 - #303030 - #212121 - - #C5CAE9 - #9FA8DA - #7986CB - #5C6BC0 - #E8EAF6 - #3F51B5 - #3949AB - #303F9F - #283593 - #1A237E - #8C9EFF - #536DFE - #3D5AFE - #304FFE - - #B3E5FC - #81D4FA - #4FC3F7 - #29B6F6 - #E1F5FE - #03A9F4 - #039BE5 - #0288D1 - #0277BD - #01579B - #80D8FF - #40C4FF - #00B0FF - #0091EA - - #DCEDC8 - #C5E1A5 - #AED581 - #9CCC65 - #F1F8E9 - #8BC34A - #7CB342 - #689F38 - #558B2F - #33691E - #CCFF90 - #B2FF59 - #76FF03 - #64DD17 - - #F0F4C3 - #E6EE9C - #DCE775 - #D4E157 - #F9FBE7 - #CDDC39 - #C0CA33 - #AFB42B - #9E9D24 - #827717 - #F4FF81 - #EEFF41 - #C6FF00 - #AEEA00 - - #FFE0B2 - #FFCC80 - #FFB74D - #FFA726 - #FFF3E0 - #FF9800 - #FB8C00 - #F57C00 - #EF6C00 - #E65100 - #FFD180 - #FFAB40 - #FF9100 - #FF6D00 - - #F8BBD0 - #F48FB1 - #F06292 - #EC407A - #FCE4EC - #E91E63 - #D81B60 - #C2185B - #AD1457 - #880E4F - #FF80AB - #FF4081 - #F50057 - #C51162 - - #E1BEE7 - #CE93D8 - #BA68C8 - #AB47BC - #F3E5F5 - #9C27B0 - #8E24AA - #7B1FA2 - #6A1B9A - #4A148C - #EA80FC - #E040FB - #D500F9 - #AA00FF - - #FFCDD2 - #EF9A9A - #E57373 - #EF5350 - #FFEBEE - #F44336 - #E53935 - #D32F2F - #C62828 - #B71C1C - #FF8A80 - #FF5252 - #FF1744 - #D50000 - - #B2DFDB - #80CBC4 - #4DB6AC - #26A69A - #E0F2F1 - #009688 - #00897B - #00796B - #00695C - #004D40 - #A7FFEB - #64FFDA - #1DE9B6 - #00BFA5 - - #FFFFFF - #FFF9C4 - #FFF59D - #FFF176 - #FFEE58 - #FFFDE7 - #FFEB3B - #FDD835 - #FBC02D - #F9A825 - #F57F17 - #FFFF8D - #FFFF00 - #FFEA00 - #FFD600 - diff --git a/app/src/main/res/values/strings-not_translatable.xml b/app/src/main/res/values/strings-not_translatable.xml index b07d109..e6e2f38 100644 --- a/app/src/main/res/values/strings-not_translatable.xml +++ b/app/src/main/res/values/strings-not_translatable.xml @@ -27,7 +27,7 @@ https://www.gnu.org/licenses/gpl-3.0.html @string/pref_title__sub_miscelaneous https://github.com/gsantner/dandelion - https://f-droid.org/repository/browse/?fdid=com.github.dfa.hubzilla_android + https://f-droid.org/repository/browse/?fdid=com.dfa.hubzilla_android @string/app_name https://framagit.org/massimiliano/AndHub https://framagit.org/massimiliano/AndHub diff --git a/app/src/main/res/xml-v25/shortcuts.xml b/app/src/main/res/xml-v25/shortcuts.xml index d69802e..0af935b 100755 --- a/app/src/main/res/xml-v25/shortcuts.xml +++ b/app/src/main/res/xml-v25/shortcuts.xml @@ -9,8 +9,8 @@ android:shortcutDisabledMessage="@string/new_post"> + android:targetPackage="com.dfa.hubzilla_android" + android:targetClass="com.dfa.hubzilla_android.activity.MainActivity" /> @@ -26,8 +26,8 @@ android:shortcutDisabledMessage="@string/activities"> + android:targetPackage="com.dfa.hubzilla_android" + android:targetClass="com.dfa.hubzilla_android.activity.MainActivity" /> @@ -43,8 +43,8 @@ android:shortcutDisabledMessage="@string/aspects"> + android:targetPackage="com.dfa.hubzilla_android" + android:targetClass="com.dfa.hubzilla_android.activity.MainActivity" /> @@ -60,8 +60,8 @@ android:shortcutDisabledMessage="@string/nav_followed_tags"> + android:targetPackage="com.dfa.hubzilla_android" + android:targetClass="com.dfa.hubzilla_android.activity.MainActivity" /> diff --git a/app/src/main/res/xml/preferences__master.xml b/app/src/main/res/xml/preferences__master.xml index 06c9fc6..011cd13 100644 --- a/app/src/main/res/xml/preferences__master.xml +++ b/app/src/main/res/xml/preferences__master.xml @@ -1,7 +1,7 @@ - @@ -17,7 +17,7 @@ android:summary="@string/pref_desc__sub_nav_slider" android:title="@string/pref_title__sub_nav_slider"/> - - + - - - - - - - - + - - + - - - - + - @@ -170,5 +170,5 @@ android:summary="@string/pref_desc__sub_logging" android:title="@string/pref_title__sub_logging"/> - + \ No newline at end of file diff --git a/app/src/main/res/xml/preferences__sub_debugging.xml b/app/src/main/res/xml/preferences__sub_debugging.xml index c2f436d..2c77723 100644 --- a/app/src/main/res/xml/preferences__sub_debugging.xml +++ b/app/src/main/res/xml/preferences__sub_debugging.xml @@ -2,24 +2,24 @@ - - - - + - - + \ No newline at end of file diff --git a/app/src/main/res/xml/preferences__sub_navslider_vis.xml b/app/src/main/res/xml/preferences__sub_navslider_vis.xml index a7b9f8a..cae66db 100644 --- a/app/src/main/res/xml/preferences__sub_navslider_vis.xml +++ b/app/src/main/res/xml/preferences__sub_navslider_vis.xml @@ -2,85 +2,85 @@ - - - - - - - - - - - - + - - - - - + - - - - + diff --git a/app/src/main/res/xml/preferences__sub_proxy.xml b/app/src/main/res/xml/preferences__sub_proxy.xml index e08393f..aaf2564 100644 --- a/app/src/main/res/xml/preferences__sub_proxy.xml +++ b/app/src/main/res/xml/preferences__sub_proxy.xml @@ -1,9 +1,9 @@ - - - + diff --git a/app/src/main/res/xml/preferences__sub_themes.xml b/app/src/main/res/xml/preferences__sub_themes.xml index 27cd500..e5ea12e 100644 --- a/app/src/main/res/xml/preferences__sub_themes.xml +++ b/app/src/main/res/xml/preferences__sub_themes.xml @@ -1,25 +1,25 @@ - - - - - + \ No newline at end of file diff --git a/build/intermediates/lint-cache/api-versions-14-28.bin b/build/intermediates/lint-cache/api-versions-14-28.bin deleted file mode 100644 index 5501438..0000000 Binary files a/build/intermediates/lint-cache/api-versions-14-28.bin and /dev/null differ diff --git a/build/intermediates/lint-cache/maven.google/com/android/support/group-index.xml b/build/intermediates/lint-cache/maven.google/com/android/support/group-index.xml deleted file mode 100644 index 965ed46..0000000 --- a/build/intermediates/lint-cache/maven.google/com/android/support/group-index.xml +++ /dev/null @@ -1,92 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/build/intermediates/lint-cache/maven.google/master-index.xml b/build/intermediates/lint-cache/maven.google/master-index.xml deleted file mode 100644 index b779f73..0000000 --- a/build/intermediates/lint-cache/maven.google/master-index.xml +++ /dev/null @@ -1,107 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/build/intermediates/lint-cache/typos-de.txt-2.bin b/build/intermediates/lint-cache/typos-de.txt-2.bin deleted file mode 100644 index 547ecd8..0000000 Binary files a/build/intermediates/lint-cache/typos-de.txt-2.bin and /dev/null differ diff --git a/build/intermediates/lint-cache/typos-en.txt-2.bin b/build/intermediates/lint-cache/typos-en.txt-2.bin deleted file mode 100644 index 9ae915a..0000000 Binary files a/build/intermediates/lint-cache/typos-en.txt-2.bin and /dev/null differ diff --git a/build/intermediates/lint-cache/typos-es.txt-2.bin b/build/intermediates/lint-cache/typos-es.txt-2.bin deleted file mode 100644 index 270fd23..0000000 Binary files a/build/intermediates/lint-cache/typos-es.txt-2.bin and /dev/null differ diff --git a/build/intermediates/lint-cache/typos-hu.txt-2.bin b/build/intermediates/lint-cache/typos-hu.txt-2.bin deleted file mode 100644 index cc38715..0000000 Binary files a/build/intermediates/lint-cache/typos-hu.txt-2.bin and /dev/null differ diff --git a/build/intermediates/lint-cache/typos-it.txt-2.bin b/build/intermediates/lint-cache/typos-it.txt-2.bin deleted file mode 100644 index b1ee15a..0000000 Binary files a/build/intermediates/lint-cache/typos-it.txt-2.bin and /dev/null differ diff --git a/build/intermediates/lint-cache/typos-pt.txt-2.bin b/build/intermediates/lint-cache/typos-pt.txt-2.bin deleted file mode 100644 index c8a6b84..0000000 Binary files a/build/intermediates/lint-cache/typos-pt.txt-2.bin and /dev/null differ diff --git a/build/intermediates/lint-cache/typos-tr.txt-2.bin b/build/intermediates/lint-cache/typos-tr.txt-2.bin deleted file mode 100644 index 09e0871..0000000 Binary files a/build/intermediates/lint-cache/typos-tr.txt-2.bin and /dev/null differ diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 13372ae..1948b90 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 18a0cf9..d2c45a4 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,5 @@ -#Sun Apr 08 08:39:15 CEST 2018 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-4.8-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip diff --git a/gradlew b/gradlew index 9d82f78..cccdd3d 100755 --- a/gradlew +++ b/gradlew @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/usr/bin/env sh ############################################################################## ## @@ -6,42 +6,6 @@ ## ############################################################################## -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS="" - -APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` - -# Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD="maximum" - -warn ( ) { - echo "$*" -} - -die ( ) { - echo - echo "$*" - echo - exit 1 -} - -# OS specific support (must be 'true' or 'false'). -cygwin=false -msys=false -darwin=false -case "`uname`" in - CYGWIN* ) - cygwin=true - ;; - Darwin* ) - darwin=true - ;; - MINGW* ) - msys=true - ;; -esac - # Attempt to set APP_HOME # Resolve links: $0 may be a link PRG="$0" @@ -60,6 +24,46 @@ cd "`dirname \"$PRG\"`/" >/dev/null APP_HOME="`pwd -P`" cd "$SAVED" >/dev/null +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS="" + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn () { + echo "$*" +} + +die () { + echo + echo "$*" + echo + exit 1 +} + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MINGW* ) + msys=true + ;; + NONSTOP* ) + nonstop=true + ;; +esac + CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar # Determine the Java command to use to start the JVM. @@ -85,7 +89,7 @@ location of your Java installation." fi # Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then +if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then MAX_FD_LIMIT=`ulimit -H -n` if [ $? -eq 0 ] ; then if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then @@ -150,11 +154,19 @@ if $cygwin ; then esac fi -# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules -function splitJvmOpts() { - JVM_OPTS=("$@") +# Escape application args +save () { + for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done + echo " " } -eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS -JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME" +APP_ARGS=$(save "$@") -exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@" +# Collect all arguments for the java command, following the shell quoting and substitution rules +eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" + +# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong +if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then + cd "$(dirname "$0")" +fi + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat index aec9973..e95643d 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -8,14 +8,14 @@ @rem Set local scope for the variables with windows NT shell if "%OS%"=="Windows_NT" setlocal -@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS= - set DIRNAME=%~dp0 if "%DIRNAME%" == "" set DIRNAME=. set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS= + @rem Find java.exe if defined JAVA_HOME goto findJavaFromJavaHome @@ -46,10 +46,9 @@ echo location of your Java installation. goto fail :init -@rem Get command-line arguments, handling Windowz variants +@rem Get command-line arguments, handling Windows variants if not "%OS%" == "Windows_NT" goto win9xME_args -if "%@eval[2+2]" == "4" goto 4NT_args :win9xME_args @rem Slurp the command line arguments. @@ -60,11 +59,6 @@ set _SKIP=2 if "x%~1" == "x" goto execute set CMD_LINE_ARGS=%* -goto execute - -:4NT_args -@rem Get arguments from the 4NT Shell from JP Software -set CMD_LINE_ARGS=%$ :execute @rem Setup the command line