diff --git a/app/build.gradle b/app/build.gradle
index 3bbbce1..d7f4f6f 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -7,8 +7,8 @@ android {
applicationId "app.fedilab.nitterizeme"
minSdkVersion 15
targetSdkVersion 29
- versionCode 11
- versionName "1.7.0"
+ versionCode 12
+ versionName "1.7.1"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}
lintOptions {
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index fe8f464..eb06cc7 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -60,6 +60,7 @@
+
diff --git a/app/src/main/java/app/fedilab/nitterizeme/MainActivity.java b/app/src/main/java/app/fedilab/nitterizeme/MainActivity.java
index 7c5f6d4..60a214f 100644
--- a/app/src/main/java/app/fedilab/nitterizeme/MainActivity.java
+++ b/app/src/main/java/app/fedilab/nitterizeme/MainActivity.java
@@ -69,7 +69,8 @@ public class MainActivity extends AppCompatActivity {
"twitter.com",
"mobile.twitter.com",
"www.twitter.com",
- "pbs.twimg.com"
+ "pbs.twimg.com",
+ "pic.twitter.com"
};
public static String[] instagram_domains = {
"instagram.com",
diff --git a/app/src/main/java/app/fedilab/nitterizeme/TransformActivity.java b/app/src/main/java/app/fedilab/nitterizeme/TransformActivity.java
index 45e42ae..861a254 100644
--- a/app/src/main/java/app/fedilab/nitterizeme/TransformActivity.java
+++ b/app/src/main/java/app/fedilab/nitterizeme/TransformActivity.java
@@ -475,7 +475,7 @@ 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 ) {
+ 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);
@@ -621,7 +621,7 @@ 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 ) {
+ 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);
diff --git a/app/src/main/res/layout/content_main.xml b/app/src/main/res/layout/content_main.xml
index 54a4bbf..382fdf2 100644
--- a/app/src/main/res/layout/content_main.xml
+++ b/app/src/main/res/layout/content_main.xml
@@ -55,7 +55,7 @@
android:id="@+id/top_part_bg_nitter"
android:layout_width="match_parent"
android:layout_height="0dp"
- android:background="#404040"
+ android:background="@color/topBar"
app:layout_constraintBottom_toBottomOf="@id/guide_nitter"
app:layout_constraintTop_toTopOf="parent" />
@@ -197,7 +197,7 @@
android:id="@+id/top_part_bg_invidious"
android:layout_width="match_parent"
android:layout_height="0dp"
- android:background="#404040"
+ android:background="@color/topBar"
app:layout_constraintBottom_toBottomOf="@id/guide_invidious"
app:layout_constraintTop_toTopOf="parent" />
@@ -355,7 +355,7 @@
android:id="@+id/top_part_bg_bibliogram"
android:layout_width="match_parent"
android:layout_height="0dp"
- android:background="#404040"
+ android:background="@color/topBar"
app:layout_constraintBottom_toBottomOf="@id/guide_bibliogram"
app:layout_constraintTop_toTopOf="parent" />
@@ -497,7 +497,7 @@
android:id="@+id/top_part_bg_osm"
android:layout_width="match_parent"
android:layout_height="0dp"
- android:background="#404040"
+ android:background="@color/topBar"
app:layout_constraintBottom_toBottomOf="@id/guide_osm"
app:layout_constraintTop_toTopOf="parent" />
@@ -692,7 +692,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:layout_marginBottom="10dp"
- android:minHeight="2000dp"
+ android:minHeight="2100dp"
android:overScrollMode="never"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="parent"
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 14ce480..445725a 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -1,6 +1,8 @@
- #424242
+ #000000
#212121
#607D8B
+ #222222
+ #333333
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 2835245..d39ce34 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -6,6 +6,8 @@
- @color/colorPrimary
- @color/colorPrimaryDark
- @color/colorAccent
+ - @color/colorPrimary
+ - @color/colorPrimary
@@ -36,7 +38,7 @@
diff --git a/fastlane/metadata/android/en-US/changelogs/12.txt b/fastlane/metadata/android/en-US/changelogs/12.txt
new file mode 100644
index 0000000..a29c195
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/12.txt
@@ -0,0 +1,6 @@
+Added:
+- Support for pic.twitter.com
+
+Changed:
+- App name
+- App icon
\ No newline at end of file