Page Menu
Home
GitPull.it
Search
Configure Global Search
Log In
Files
F12277075
D93.1775507941.diff
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Award Token
Flag For Later
Size
10 KB
Referenced Files
None
Subscribers
None
D93.1775507941.diff
View Options
diff --git a/res/drawable/telegram_logo.xml b/res/drawable/telegram_logo.xml
new file mode 100644
--- /dev/null
+++ b/res/drawable/telegram_logo.xml
@@ -0,0 +1,30 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:aapt="http://schemas.android.com/aapt"
+ android:width="1000dp"
+ android:height="1000dp"
+ android:viewportWidth="1000"
+ android:viewportHeight="1000">
+ <path
+ android:pathData="M500,500m-500,0a500,500 0,1 1,1000 0a500,500 0,1 1,-1000 0"
+ android:strokeWidth="1"
+ android:fillType="evenOdd"
+ android:strokeColor="#00000000">
+ <aapt:attr name="android:fillColor">
+ <gradient
+ android:startY="-2.4350396E-14"
+ android:startX="500"
+ android:endY="992.5834"
+ android:endX="500"
+ android:type="linear">
+ <item android:offset="0" android:color="#FF2AABEE"/>
+ <item android:offset="1" android:color="#FF229ED9"/>
+ </gradient>
+ </aapt:attr>
+ </path>
+ <path
+ android:pathData="M226.33,494.72C372.09,431.22 469.28,389.35 517.92,369.12C656.77,311.37 685.63,301.33 704.43,301C708.57,300.93 717.82,301.96 723.81,306.82C728.86,310.92 730.26,316.47 730.92,320.36C731.59,324.25 732.42,333.11 731.76,340.04C724.23,419.1 691.68,610.96 675.11,699.52C668.1,736.98 654.3,749.55 640.94,750.78C611.9,753.45 589.86,731.59 561.73,713.15C517.73,684.31 492.87,666.35 450.15,638.2C400.78,605.67 432.79,587.79 460.92,558.57C468.28,550.92 596.22,434.56 598.69,424C599,422.68 599.29,417.76 596.36,415.16C593.44,412.56 589.13,413.45 586.01,414.16C581.6,415.16 511.3,461.63 375.11,553.56C355.15,567.26 337.08,573.93 320.89,573.59C303.03,573.2 268.69,563.49 243.16,555.19C211.85,545.01 186.96,539.63 189.13,522.35C190.26,513.34 202.66,504.13 226.33,494.72Z"
+ android:strokeWidth="1"
+ android:fillColor="#FFFFFF"
+ android:fillType="evenOdd"
+ android:strokeColor="#00000000"/>
+</vector>
diff --git a/res/drawable/telegram_logo_50.xml b/res/drawable/telegram_logo_50.xml
new file mode 100644
--- /dev/null
+++ b/res/drawable/telegram_logo_50.xml
@@ -0,0 +1,28 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:aapt="http://schemas.android.com/aapt"
+ android:width="50dp"
+ android:height="50dp"
+ android:viewportWidth="50"
+ android:viewportHeight="50">
+ <path
+ android:pathData="M50,25C50,38.8086 38.8086,50 25,50C11.1914,50 0,38.8086 0,25C0,11.1914 11.1914,0 25,0C38.8086,0 50,11.1914 50,25ZM50,25"
+ android:fillType="evenOdd"
+ android:strokeColor="#00000000">
+ <aapt:attr name="android:fillColor">
+ <gradient
+ android:startY="0"
+ android:startX="25"
+ android:endY="49.62915"
+ android:endX="25"
+ android:type="linear">
+ <item android:offset="0" android:color="#FF2AABEE"/>
+ <item android:offset="1" android:color="#FF229ED9"/>
+ </gradient>
+ </aapt:attr>
+ </path>
+ <path
+ android:pathData="M11.3164,24.7344C18.6055,21.5625 23.4648,19.4688 25.8945,18.457C32.8398,15.5703 34.2813,15.0664 35.2227,15.0508C35.4297,15.0469 35.8906,15.0977 36.1914,15.3398C36.4414,15.5469 36.5117,15.8242 36.5469,16.0195C36.5781,16.2109 36.6211,16.6563 36.5898,17.0039C36.2109,20.957 34.582,30.5469 33.7539,34.9766C33.4063,36.8477 32.7148,37.4766 32.0469,37.5391C30.5938,37.6719 29.4922,36.5781 28.0859,35.6563C25.8867,34.2148 24.6445,33.3164 22.5078,31.9102C20.0391,30.2852 21.6406,29.3906 23.0469,27.9297C23.4141,27.5469 29.8125,21.7266 29.9336,21.1992C29.9492,21.1328 29.9648,20.8867 29.8164,20.7578C29.6719,20.6289 29.457,20.6719 29.3008,20.707C29.0781,20.7578 25.5664,23.082 18.7539,27.6797C17.7578,28.3633 16.8555,28.6953 16.043,28.6797C15.1523,28.6602 13.4336,28.1758 12.1563,27.7578C10.5938,27.25 9.3477,26.9805 9.457,26.1172C9.5117,25.668 10.1328,25.207 11.3164,24.7344ZM11.3164,24.7344"
+ android:fillColor="#FFFFFF"
+ android:fillType="evenOdd"
+ android:strokeColor="#00000000"/>
+</vector>
diff --git a/res/layout/activity_about.xml b/res/layout/activity_about.xml
--- a/res/layout/activity_about.xml
+++ b/res/layout/activity_about.xml
@@ -1,8 +1,9 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:tools="http://schemas.android.com/tools"
- android:layout_width="match_parent"
+ android:layout_width="match_parent"
android:layout_height="match_parent"
- tools:context="it.reyboz.bustorino.ActivityAbout" android:orientation="vertical">
+ tools:context="it.reyboz.bustorino.ActivityAbout" android:orientation="vertical"
+ android:gravity="center">
<!-- The ActionBar displayed at the top -->
<include
@@ -30,6 +31,16 @@
android:layout_marginTop="2dp"
android:id="@+id/theDivider"
android:background="@android:color/darker_gray"/>
+
+ <Button
+ android:text="@string/open_telegram"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:paddingLeft="10dp"
+ android:id="@+id/openTelegramButton"
+ android:drawableLeft = "@drawable/telegram_logo_50"
+ android:drawableStart="@drawable/telegram_logo_50" />
+
<TextView
android:text="@string/app_version"
android:layout_width="match_parent"
diff --git a/res/layout/stop_line_element.xml b/res/layout/stop_line_element.xml
--- a/res/layout/stop_line_element.xml
+++ b/res/layout/stop_line_element.xml
@@ -39,7 +39,8 @@
app:layout_constraintStart_toStartOf="@id/busStopID"
app:layout_constraintBottom_toBottomOf="parent"
android:layout_marginLeft="26dp"
- android:layout_marginStart="26dp"/>
+ android:layout_marginStart="26dp"
+ />
<TextView
android:id="@+id/busStopName"
@@ -54,7 +55,7 @@
app:layout_constraintTop_toTopOf="@id/busStopID"
android:layout_marginStart="10dp"
android:layout_marginLeft="10dp"
- android:layout_marginTop="0dp"
+ android:layout_marginTop="3dp"
android:layout_marginEnd="10dp"
android:layout_marginRight="10dp"
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -129,6 +129,10 @@
<string name="show_stops">Mostra fermate</string>
<string name="nearby_arrivals_message">Arrivi qui vicino</string>
<string name="removed_from_favorites">Fermata rimossa dai preferiti</string>
+ <!--
+ Mixed button strings
+ !-->
+ <string name="open_telegram">Entra nel canale Telegram</string>
<!--
Map view buttons strings
diff --git a/res/values/strings.xml b/res/values/strings.xml
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -143,7 +143,10 @@
<string name="two_strings_format" translatable="false">%1$s - %2$s</string>
<string name="show_arrivals">Show arrivals</string>
<string name="show_stops">Show stops</string>
-
+ <!--
+ Mixed button strings
+ !-->
+ <string name="open_telegram">Join Telegram channel</string>
<!--
Map view buttons strings
!-->
diff --git a/res/values/styles.xml b/res/values/styles.xml
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -25,6 +25,10 @@
</style>
+ <style name="Widget.MyApp.Button" parent="Widget.MaterialComponents.Button">
+ <item name="backgroundTint">?attr/colorSecondary</item>
+ </style>
+
<style name="AppTheme.NoActionBar" parent="AppTheme">
<item name="windowActionBar">false</item>
diff --git a/src/it/reyboz/bustorino/ActivityAbout.java b/src/it/reyboz/bustorino/ActivityAbout.java
--- a/src/it/reyboz/bustorino/ActivityAbout.java
+++ b/src/it/reyboz/bustorino/ActivityAbout.java
@@ -17,6 +17,8 @@
*/
package it.reyboz.bustorino;
+import android.content.Intent;
+import android.net.Uri;
import android.util.Log;
import androidx.appcompat.widget.Toolbar;
import androidx.appcompat.app.AppCompatActivity;
@@ -25,7 +27,12 @@
import android.text.method.LinkMovementMethod;
import android.os.Bundle;
import android.view.MenuItem;
+import android.view.View;
+import android.widget.Button;
import android.widget.TextView;
+import android.widget.Toast;
+
+import it.reyboz.bustorino.middleware.BarcodeScanUtils;
public class ActivityAbout extends AppCompatActivity {
@@ -35,7 +42,7 @@
setContentView(R.layout.activity_about);
Spanned htmlText = Html.fromHtml(getResources().getString(
R.string.about_history));
- TextView aboutTextView = (TextView) findViewById(R.id.aboutTextView);
+ TextView aboutTextView = findViewById(R.id.aboutTextView);
assert aboutTextView != null;
aboutTextView.setText(htmlText);
aboutTextView.setMovementMethod(LinkMovementMethod.getInstance());
@@ -48,6 +55,20 @@
TextView versionText = findViewById(R.id.versionTextView);
Log.d("BusTO About", "The version text view is: "+versionText);
versionText.setText(getResources().getText(R.string.app_version)+": "+BuildConfig.VERSION_NAME);
+
+ Button openTelegramButton = findViewById(R.id.openTelegramButton);
+ openTelegramButton.setOnClickListener(view -> {
+
+ Intent trueIntent = new Intent(Intent.ACTION_VIEW, Uri.parse("tg://resolve?domain=busto_fdroid"));
+ if(BarcodeScanUtils.checkTargetPackageExists(this, trueIntent))
+ startActivity(trueIntent);
+ else{
+ Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse("https://t.me/busto_fdroid"));
+ startActivity(intent);
+ // Toast.makeText(this, "Install Telegram and retry", Toast.LENGTH_SHORT).show();
+ }
+
+ });
}
@Override
diff --git a/src/it/reyboz/bustorino/adapters/StopRecyclerAdapter.java b/src/it/reyboz/bustorino/adapters/StopRecyclerAdapter.java
--- a/src/it/reyboz/bustorino/adapters/StopRecyclerAdapter.java
+++ b/src/it/reyboz/bustorino/adapters/StopRecyclerAdapter.java
@@ -28,6 +28,7 @@
import androidx.recyclerview.widget.RecyclerView;
import java.util.List;
+import java.util.Locale;
import it.reyboz.bustorino.R;
import it.reyboz.bustorino.backend.Stop;
@@ -195,7 +196,7 @@
}
}
- if (stop.location == null) {
+ if (stop.location == null || stop.location.toLowerCase(Locale.ROOT).equals("null")) {
vh.busStopLocaLityTextView.setVisibility(View.GONE);
} else {
vh.busStopLocaLityTextView.setText(NameCapitalize.capitalizePass(stop.location, capitalizeLocation));
File Metadata
Details
Attached
Mime Type
text/plain
Expires
Mon, Apr 6, 22:39 (20 h, 48 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
1822384
Default Alt Text
D93.1775507941.diff (10 KB)
Attached To
Mode
D93: Avoid showing nulls in location string and add Telegram button
Attached
Detach File
Event Timeline
Log In to Comment