diff --git a/LICENSE.md b/LICENSE.md index 02b7bbc..283270c 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -631,7 +631,7 @@ to attach them to the start of each source file to most effectively state the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. - NitterizeMe is an Android client for transforming Twitter and YouTube links into Nitter and Invidious ones + UntrackMe is an Android client for transforming Twitter and YouTube links into Nitter and Invidious ones Copyright (C) 2020 Thomas Schneider This program is free software: you can redistribute it and/or modify @@ -652,7 +652,7 @@ Also add information on how to contact you by electronic and paper mail. If the program does terminal interaction, make it output a short notice like this when it starts in an interactive mode: - NitterizeMe Copyright (C) 2020 Thomas Schneider + UntrackMe Copyright (C) 2020 Thomas Schneider This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details. @@ -671,4 +671,4 @@ into proprietary programs. If your program is a subroutine library, you may consider it more useful to permit linking proprietary applications with the library. If this is what you want to do, use the GNU Lesser General Public License instead of this License. But first, please read -. \ No newline at end of file + \ No newline at end of file diff --git a/README.md b/README.md index c6f0ef0..80b5758 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ -# NitterizeMe [![License: GPL v3](https://img.shields.io/badge/License-GPL%20v3-blue.svg)](https://www.gnu.org/licenses/gpl-3.0) [![Crowdin](https://badges.crowdin.net/nitterizeme/localized.svg)](https://crowdin.com/project/nitterizeme) [![pipeline status](https://framagit.org/tom79/nitterizeme/badges/develop/pipeline.svg)](https://framagit.org/tom79/nitterizeme/commits/develop) +# UntrackMe [![License: GPL v3](https://img.shields.io/badge/License-GPL%20v3-blue.svg)](https://www.gnu.org/licenses/gpl-3.0) [![Crowdin](https://badges.crowdin.net/nitterizeme/localized.svg)](https://crowdin.com/project/nitterizeme) [![pipeline status](https://framagit.org/tom79/nitterizeme/badges/develop/pipeline.svg)](https://framagit.org/tom79/nitterizeme/commits/develop) -NitterizeMe once set by default to open Twitter and YouTube links will transform them into Nitter and Invidious links and delegate the action to another app. +UntrackMe once set by default to open Twitter and YouTube links will transform them into Nitter and Invidious links and delegate the action to another app. ## Donate diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index eb06cc7..735ce90 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -182,18 +182,19 @@ + android:theme="@style/AppThemeDialog" /> - + android:theme="@style/AppTheme" /> \ No newline at end of file diff --git a/app/src/main/java/app/fedilab/nitterizeme/AboutActivity.java b/app/src/main/java/app/fedilab/nitterizeme/AboutActivity.java index 16836fd..4901370 100644 --- a/app/src/main/java/app/fedilab/nitterizeme/AboutActivity.java +++ b/app/src/main/java/app/fedilab/nitterizeme/AboutActivity.java @@ -1,17 +1,17 @@ package app.fedilab.nitterizeme; /* Copyright 2020 Thomas Schneider * - * This file is a part of NitterizeMe + * This file is a part of UntrackMe * * 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. * - * NitterizeMe is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even + * UntrackMe 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 NitterizeMe; if not, + * You should have received a copy of the GNU General Public License along with UntrackMe; if not, * see . */ import android.content.Intent; diff --git a/app/src/main/java/app/fedilab/nitterizeme/AppInfo.java b/app/src/main/java/app/fedilab/nitterizeme/AppInfo.java index fcfdb31..a58dc28 100644 --- a/app/src/main/java/app/fedilab/nitterizeme/AppInfo.java +++ b/app/src/main/java/app/fedilab/nitterizeme/AppInfo.java @@ -1,17 +1,17 @@ package app.fedilab.nitterizeme; /* Copyright 2020 Thomas Schneider * - * This file is a part of NitterizeMe + * This file is a part of UntrackMe * * 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. * - * NitterizeMe is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even + * UntrackMe 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 NitterizeMe; if not, + * You should have received a copy of the GNU General Public License along with UntrackMe; if not, * see . */ diff --git a/app/src/main/java/app/fedilab/nitterizeme/AppInfoAdapter.java b/app/src/main/java/app/fedilab/nitterizeme/AppInfoAdapter.java index fcfa39c..a057016 100644 --- a/app/src/main/java/app/fedilab/nitterizeme/AppInfoAdapter.java +++ b/app/src/main/java/app/fedilab/nitterizeme/AppInfoAdapter.java @@ -1,17 +1,17 @@ package app.fedilab.nitterizeme; /* Copyright 2020 Thomas Schneider * - * This file is a part of NitterizeMe + * This file is a part of UntrackMe * * 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. * - * NitterizeMe is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even + * UntrackMe 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 NitterizeMe; if not, + * You should have received a copy of the GNU General Public License along with UntrackMe; if not, * see . */ import android.content.Context; diff --git a/app/src/main/java/app/fedilab/nitterizeme/Instance.java b/app/src/main/java/app/fedilab/nitterizeme/Instance.java index a743848..629f48c 100644 --- a/app/src/main/java/app/fedilab/nitterizeme/Instance.java +++ b/app/src/main/java/app/fedilab/nitterizeme/Instance.java @@ -2,17 +2,17 @@ package app.fedilab.nitterizeme; /* Copyright 2020 Thomas Schneider * - * This file is a part of NitterizeMe + * This file is a part of UntrackMe * * 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. * - * NitterizeMe is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even + * UntrackMe 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 NitterizeMe; if not, + * You should have received a copy of the GNU General Public License along with UntrackMe; if not, * see . */ class Instance { diff --git a/app/src/main/java/app/fedilab/nitterizeme/InstanceActivity.java b/app/src/main/java/app/fedilab/nitterizeme/InstanceActivity.java index 3820255..ad423f3 100644 --- a/app/src/main/java/app/fedilab/nitterizeme/InstanceActivity.java +++ b/app/src/main/java/app/fedilab/nitterizeme/InstanceActivity.java @@ -1,17 +1,17 @@ package app.fedilab.nitterizeme; /* Copyright 2020 Thomas Schneider * - * This file is a part of NitterizeMe + * This file is a part of UntrackMe * * 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. * - * NitterizeMe is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even + * UntrackMe 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 NitterizeMe; if not, + * You should have received a copy of the GNU General Public License along with UntrackMe; if not, * see . */ import android.app.Activity; diff --git a/app/src/main/java/app/fedilab/nitterizeme/InstanceAdapter.java b/app/src/main/java/app/fedilab/nitterizeme/InstanceAdapter.java index 83c719e..cd4a629 100644 --- a/app/src/main/java/app/fedilab/nitterizeme/InstanceAdapter.java +++ b/app/src/main/java/app/fedilab/nitterizeme/InstanceAdapter.java @@ -1,17 +1,17 @@ package app.fedilab.nitterizeme; /* Copyright 2020 Thomas Schneider * - * This file is a part of NitterizeMe + * This file is a part of UntrackMe * * 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. * - * NitterizeMe is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even + * UntrackMe 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 NitterizeMe; if not, + * You should have received a copy of the GNU General Public License along with UntrackMe; if not, * see . */ import android.content.Context; diff --git a/app/src/main/java/app/fedilab/nitterizeme/MainActivity.java b/app/src/main/java/app/fedilab/nitterizeme/MainActivity.java index 60a214f..2073517 100644 --- a/app/src/main/java/app/fedilab/nitterizeme/MainActivity.java +++ b/app/src/main/java/app/fedilab/nitterizeme/MainActivity.java @@ -1,17 +1,17 @@ package app.fedilab.nitterizeme; /* Copyright 2020 Thomas Schneider * - * This file is a part of NitterizeMe + * This file is a part of UntrackMe * * 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. * - * NitterizeMe is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even + * UntrackMe 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 NitterizeMe; if not, + * You should have received a copy of the GNU General Public License along with UntrackMe; if not, * see . */ import android.content.Context; @@ -53,7 +53,7 @@ public class MainActivity extends AppCompatActivity { public static final String SET_OSM_HOST = "set_osm_host"; public static final String SET_BIBLIOGRAM_HOST = "set_bibliogram_host"; @SuppressWarnings("unused") - public static String TAG = "NitterizeMe"; + public static String TAG = "UntrackMe"; public static String DEFAULT_NITTER_HOST = "nitter.net"; public static String DEFAULT_INVIDIOUS_HOST = "invidio.us"; public static String SET_INVIDIOUS_ENABLED = "set_invidious_enabled"; diff --git a/app/src/main/java/app/fedilab/nitterizeme/PlayerChromeClient.java b/app/src/main/java/app/fedilab/nitterizeme/PlayerChromeClient.java index c45ea03..8f7c8db 100644 --- a/app/src/main/java/app/fedilab/nitterizeme/PlayerChromeClient.java +++ b/app/src/main/java/app/fedilab/nitterizeme/PlayerChromeClient.java @@ -1,17 +1,17 @@ package app.fedilab.nitterizeme; /* Copyright 2020 Thomas Schneider * - * This file is a part of NitterizeMe + * This file is a part of UntrackMe * * 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. * - * NitterizeMe is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even + * UntrackMe 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 NitterizeMe; if not, + * You should have received a copy of the GNU General Public License along with UntrackMe; if not, * see . */ import android.app.Activity; diff --git a/app/src/main/java/app/fedilab/nitterizeme/TransformActivity.java b/app/src/main/java/app/fedilab/nitterizeme/TransformActivity.java index 861a254..7fc9d9c 100644 --- a/app/src/main/java/app/fedilab/nitterizeme/TransformActivity.java +++ b/app/src/main/java/app/fedilab/nitterizeme/TransformActivity.java @@ -1,17 +1,17 @@ package app.fedilab.nitterizeme; /* Copyright 2020 Thomas Schneider * - * This file is a part of NitterizeMe + * This file is a part of UntrackMe * * 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. * - * NitterizeMe is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even + * UntrackMe 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 NitterizeMe; if not, + * You should have received a copy of the GNU General Public License along with UntrackMe; if not, * see . */ import android.app.Activity; @@ -101,7 +101,7 @@ public class TransformActivity extends Activity { //Shortened URLs if (Arrays.asList(shortener_domains).contains(host)) { - AlertDialog.Builder unshortenAlertBuilder = new AlertDialog.Builder(TransformActivity.this); + AlertDialog.Builder unshortenAlertBuilder = new AlertDialog.Builder(TransformActivity.this, R.style.AppThemeDialog); unshortenAlertBuilder.setTitle(R.string.shortened_detected); unshortenAlertBuilder.setOnDismissListener(dialog -> finish()); View view = getLayoutInflater().inflate(R.layout.popup_unshorten, new LinearLayout(getApplicationContext()), false); @@ -475,13 +475,13 @@ public class TransformActivity extends Activity { if (nitter_enabled) { String nitterHost = sharedpreferences.getString(MainActivity.SET_NITTER_HOST, MainActivity.DEFAULT_NITTER_HOST).toLowerCase(); assert host != null; - if( host.compareTo("pbs.twimg.com") != 0 || host.compareTo("pic.twitter.com") != 0) { + if (host.compareTo("pbs.twimg.com") != 0 || host.compareTo("pic.twitter.com") != 0) { Matcher matcher = nitterPattern.matcher(url); while (matcher.find()) { final String nitter_directory = matcher.group(2); newUrl = "https://" + nitterHost + nitter_directory; } - }else{ + } else { try { newUrl = "https://" + nitterHost + "/pic/" + URLEncoder.encode(url, "utf-8"); } catch (UnsupportedEncodingException e) { @@ -621,13 +621,13 @@ public class TransformActivity extends Activity { String nitterHost = sharedpreferences.getString(MainActivity.SET_NITTER_HOST, MainActivity.DEFAULT_NITTER_HOST).toLowerCase(); assert host != null; - if( host.compareTo("pbs.twimg.com") != 0 || host.compareTo("pic.twitter.com") != 0) { + if (host.compareTo("pbs.twimg.com") != 0 || host.compareTo("pic.twitter.com") != 0) { Matcher matcher = nitterPattern.matcher(url); while (matcher.find()) { final String nitter_directory = matcher.group(2); newUrl = "https://" + nitterHost + nitter_directory; } - }else{ + } else { try { newUrl = "https://" + nitterHost + "/pic/" + URLEncoder.encode(url, "utf-8"); } catch (UnsupportedEncodingException e) { diff --git a/app/src/main/java/app/fedilab/nitterizeme/Utils.java b/app/src/main/java/app/fedilab/nitterizeme/Utils.java index 7c0eeec..afd7a82 100644 --- a/app/src/main/java/app/fedilab/nitterizeme/Utils.java +++ b/app/src/main/java/app/fedilab/nitterizeme/Utils.java @@ -1,17 +1,17 @@ package app.fedilab.nitterizeme; /* Copyright 2020 Thomas Schneider * - * This file is a part of NitterizeMe + * This file is a part of UntrackMe * * 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. * - * NitterizeMe is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even + * UntrackMe 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 NitterizeMe; if not, + * You should have received a copy of the GNU General Public License along with UntrackMe; if not, * see . */ @@ -182,7 +182,7 @@ class Utils { try { SimpleDateFormat formatter = new SimpleDateFormat("yyyy_MM_dd_HH_mm_ss", Locale.ENGLISH); Date now = new Date(); - final String fileName = "NitterizeMe_" + formatter.format(now) + ".mp4"; + final String fileName = "UntrackMe_" + formatter.format(now) + ".mp4"; request.allowScanningByMediaScanner(); request.setDestinationInExternalPublicDir(Environment.DIRECTORY_DOWNLOADS, fileName); request.setNotificationVisibility(DownloadManager.Request.VISIBILITY_VISIBLE_NOTIFY_COMPLETED); diff --git a/app/src/main/java/app/fedilab/nitterizeme/WebviewPlayerActivity.java b/app/src/main/java/app/fedilab/nitterizeme/WebviewPlayerActivity.java index 32496f0..ae6a3f9 100644 --- a/app/src/main/java/app/fedilab/nitterizeme/WebviewPlayerActivity.java +++ b/app/src/main/java/app/fedilab/nitterizeme/WebviewPlayerActivity.java @@ -1,17 +1,17 @@ package app.fedilab.nitterizeme; /* Copyright 2020 Thomas Schneider * - * This file is a part of NitterizeMe + * This file is a part of UntrackMe * * 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. * - * NitterizeMe is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even + * UntrackMe 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 NitterizeMe; if not, + * You should have received a copy of the GNU General Public License along with UntrackMe; if not, * see . */ import android.Manifest; @@ -34,6 +34,7 @@ import android.view.WindowManager; import android.webkit.WebView; import android.widget.FrameLayout; import android.widget.RelativeLayout; + import androidx.appcompat.app.AppCompatActivity; import androidx.core.app.ActivityCompat; import androidx.core.content.ContextCompat; diff --git a/app/src/main/res/drawable/ic_download.xml b/app/src/main/res/drawable/ic_download.xml index b8e8361..97bdac0 100644 --- a/app/src/main/res/drawable/ic_download.xml +++ b/app/src/main/res/drawable/ic_download.xml @@ -1,5 +1,10 @@ - - + + diff --git a/app/src/main/res/drawable/ic_info_outline.xml b/app/src/main/res/drawable/ic_info_outline.xml index af0d4d0..2465f78 100644 --- a/app/src/main/res/drawable/ic_info_outline.xml +++ b/app/src/main/res/drawable/ic_info_outline.xml @@ -1,5 +1,10 @@ - - + + diff --git a/app/src/main/res/drawable/ic_launcher_foreground.xml b/app/src/main/res/drawable/ic_launcher_foreground.xml index ce5e9b8..ee9dea9 100644 --- a/app/src/main/res/drawable/ic_launcher_foreground.xml +++ b/app/src/main/res/drawable/ic_launcher_foreground.xml @@ -3,16 +3,17 @@ android:height="108dp" android:viewportWidth="34.79452" android:viewportHeight="34.79452"> - - - - + + + + diff --git a/app/src/main/res/drawable/ic_share.xml b/app/src/main/res/drawable/ic_share.xml index 045bbc0..9dad7b8 100644 --- a/app/src/main/res/drawable/ic_share.xml +++ b/app/src/main/res/drawable/ic_share.xml @@ -1,5 +1,10 @@ - - + + diff --git a/app/src/main/res/layout/activity_about.xml b/app/src/main/res/layout/activity_about.xml index 4060fe8..99490e4 100644 --- a/app/src/main/res/layout/activity_about.xml +++ b/app/src/main/res/layout/activity_about.xml @@ -1,17 +1,17 @@ diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index e27426d..0c4b101 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -1,17 +1,17 @@ diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml index 7353dbd..ac94b34 100644 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -1,5 +1,5 @@ - - + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml index 7353dbd..ac94b34 100644 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -1,5 +1,5 @@ - - + + \ No newline at end of file diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 445725a..553459d 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -1,8 +1,9 @@ #000000 - #212121 - #607D8B - #222222 - #333333 + #000000 + #1da1f2 + #212121 + #272727 + #EFEFEF diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index f29d919..afb6aa6 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -6,18 +6,20 @@ @color/colorPrimary @color/colorPrimaryDark @color/colorAccent - @color/colorPrimary - @color/colorPrimary + @color/colorPrimaryDark + @color/colorPrimaryDark + @color/textColor -