Change some colors

app/build.gradle

@@ -7,8 +7,8 @@ android {
         applicationId "app.fedilab.nitterizeme"
         minSdkVersion 15
         targetSdkVersion 29
-        versionCode 11
+        versionCode 12
-        versionName "1.7.0"
+        versionName "1.7.1"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     lintOptions {

app/src/main/AndroidManifest.xml

@@ -60,6 +60,7 @@
                 <data android:host="www.twitter.com" />
                 <data android:host="twitter.com" />
                 <data android:host="pbs.twimg.com" />
+                <data android:host="pic.twitter.com" />
 
                 <!-- YOUTUBE URLs  -->
                 <data android:host="www.youtube.com" />

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",

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);

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"

app/src/main/res/values/colors.xml

@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="colorPrimary">#424242</color>
+    <color name="colorPrimary">#000000</color>
     <color name="colorPrimaryDark">#212121</color>
     <color name="colorAccent">#607D8B</color>
+    <color name="topBar">#222222</color>
+    <color name="containerCard">#333333</color>
 </resources>

app/src/main/res/values/styles.xml

@@ -6,6 +6,8 @@
         <item name="colorPrimary">@color/colorPrimary</item>
         <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
         <item name="colorAccent">@color/colorAccent</item>
+        <item name="android:windowBackground">@color/colorPrimary</item>
+        <item name="android:colorBackground">@color/colorPrimary</item>
     </style>
 
     <!-- Base application theme. -->
@@ -36,7 +38,7 @@
 
     <style name="containerCard">
         <item name="android:layout_margin">6dp</item>
-        <item name="cardBackgroundColor">#505050</item>
+        <item name="cardBackgroundColor">@color/containerCard</item>
         <item name="cardCornerRadius">5dp</item>
     </style>
 

fastlane/metadata/android/en-US/changelogs/12.txt

@@ -0,0 +1,6 @@
+Added:
+- Support for pic.twitter.com
+
+Changed:
+- App name
+- App icon