Added a "buy me a coffee" button to InfoFragment.kt

This commit is contained in:
Arty Bishop committed 2020-10-24 20:26:38 +01:00
1 parent 1c766abd24
commit 04fc4fd3aa
7 files changed
+86 -59

No files matched your search

@@ -36,14 +36,18 @@ class InfoFragment : Fragment(R.layout.fragment_info) {
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
super.onViewCreated(view, savedInstanceState)
FragmentInfoBinding.bind(view).apply {
version.text = String.format(getString(R.string.app_version), BuildConfig.VERSION_NAME)
btnGithub.setOnClickListener {
infoVersion.text =
String.format(getString(R.string.info_version), BuildConfig.VERSION_NAME)
infoGithub.setOnClickListener {
gotoUrl("https://github.com/rt-bishop/Look4Sat/")
}
btnFdroid.setOnClickListener {
infoFdroid.setOnClickListener {
gotoUrl("https://f-droid.org/en/packages/com.rtbishop.look4sat/")
}
message.movementMethod = LinkMovementMethod.getInstance()
infoBmc.setOnClickListener {
gotoUrl("https://www.buymeacoffee.com/rtbishop")
}
infoThanks.movementMethod = LinkMovementMethod.getInstance()
}
}
+14
View File
@@ -0,0 +1,14 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:width="16dp"
android:height="24dp"
android:viewportWidth="884"
android:viewportHeight="1279">
<path
android:fillColor="@color/themeLight"
android:pathData="M472.62,590.84C426.68,610.5 374.55,632.8 306.98,632.8C278.71,632.75 250.58,628.87 223.35,621.27L270.09,1101.08C271.74,1121.13 280.88,1139.83 295.68,1153.46C310.48,1167.09 329.87,1174.65 349.99,1174.65C349.99,1174.65 416.25,1178.09 438.36,1178.09C462.16,1178.09 533.52,1174.65 533.52,1174.65C553.64,1174.65 573.02,1167.08 587.82,1153.45C602.62,1139.82 611.75,1121.13 613.41,1101.08L663.46,570.88C641.09,563.24 618.52,558.16 593.07,558.16C549.05,558.14 513.59,573.3 472.62,590.84Z" />
<path
android:fillColor="@color/themeLight"
android:pathData="M879.57,341.85L872.53,306.35C866.22,274.5 851.88,244.41 819.19,232.9C808.71,229.21 796.82,227.63 788.79,220.01C780.75,212.39 778.38,200.55 776.52,189.57C773.08,169.42 769.84,149.26 766.31,129.14C763.27,111.85 760.86,92.42 752.93,76.56C742.6,55.26 721.18,42.8 699.88,34.56C688.97,30.48 677.83,27.04 666.52,24.24C613.3,10.19 557.34,5.03 502.59,2.09C436.88,-1.54 370.98,-0.44 305.42,5.36C256.63,9.8 205.23,15.17 158.86,32.05C141.91,38.22 124.44,45.64 111.56,58.73C95.74,74.82 90.58,99.7 102.13,119.76C110.34,134.01 124.24,144.08 138.99,150.74C158.19,159.32 178.25,165.85 198.83,170.21C256.13,182.88 315.47,187.85 374.01,189.97C438.89,192.59 503.87,190.46 568.44,183.62C584.41,181.86 600.35,179.76 616.26,177.3C634.99,174.43 647.02,149.93 641.5,132.86C634.89,112.45 617.13,104.54 597.05,107.62C594.09,108.08 591.15,108.51 588.19,108.94L586.06,109.25C579.26,110.11 572.46,110.92 565.65,111.66C551.6,113.18 537.52,114.41 523.39,115.38C491.77,117.58 460.06,118.6 428.36,118.65C397.22,118.65 366.06,117.77 334.98,115.72C320.8,114.79 306.66,113.61 292.55,112.18C286.13,111.51 279.73,110.8 273.33,110.01L267.24,109.24L265.92,109.05L259.6,108.13C246.7,106.19 233.79,103.95 221.02,101.25C219.74,100.96 218.58,100.25 217.76,99.22C216.93,98.19 216.48,96.91 216.48,95.59C216.48,94.27 216.93,92.99 217.76,91.96C218.58,90.93 219.74,90.22 221.02,89.93H221.27C232.33,87.57 243.48,85.56 254.66,83.8C258.39,83.22 262.13,82.65 265.88,82.08H265.98C272.99,81.62 280.03,80.36 286.99,79.54C347.62,73.23 408.61,71.08 469.54,73.1C499.11,73.96 528.68,75.7 558.12,78.69C564.45,79.35 570.75,80.04 577.04,80.81C579.45,81.1 581.88,81.45 584.3,81.74L589.19,82.44C603.44,84.57 617.61,87.14 631.71,90.17C652.6,94.71 679.42,96.19 688.71,119.08C691.67,126.34 693.02,134.41 694.65,142.03L696.73,151.75C696.79,151.93 696.83,152.1 696.85,152.29C701.77,175.23 706.7,198.17 711.63,221.11C711.99,222.81 712,224.56 711.66,226.26C711.31,227.95 710.62,229.56 709.63,230.98C708.63,232.4 707.35,233.6 705.88,234.5C704.4,235.41 702.75,236 701.03,236.24H700.9L697.88,236.65L694.91,237.04C685.48,238.27 676.04,239.42 666.59,240.49C647.97,242.61 629.32,244.44 610.65,245.99C573.54,249.08 536.36,251.1 499.1,252.07C480.11,252.57 461.14,252.81 442.16,252.77C366.64,252.71 291.19,248.32 216.17,239.63C208.05,238.66 199.93,237.63 191.81,236.58C198.11,237.39 187.23,235.96 185.03,235.65C179.87,234.93 174.71,234.18 169.54,233.4C152.22,230.8 134.99,227.6 117.7,224.79C96.79,221.35 76.8,223.07 57.89,233.4C42.37,241.89 29.81,254.92 21.88,270.73C13.72,287.6 11.3,305.96 7.65,324.08C4,342.19 -1.68,361.69 0.47,380.29C5.1,420.43 33.17,453.05 73.53,460.35C111.51,467.23 149.69,472.81 187.97,477.56C338.36,495.98 490.29,498.18 641.16,484.13C653.44,482.98 665.71,481.73 677.96,480.38C681.79,479.96 685.66,480.4 689.29,481.67C692.93,482.94 696.23,485.01 698.96,487.72C701.69,490.43 703.78,493.72 705.08,497.34C706.38,500.97 706.85,504.84 706.45,508.67L702.63,545.8C694.94,620.83 687.24,695.85 679.54,770.87C671.51,849.66 663.43,928.43 655.3,1007.2C653,1029.39 650.71,1051.57 648.42,1073.74C646.21,1095.58 645.9,1118.1 641.76,1139.68C635.22,1173.61 612.25,1194.45 578.73,1202.07C548.02,1209.06 516.65,1212.73 485.16,1213.01C450.25,1213.2 415.36,1211.65 380.44,1211.84C343.17,1212.05 297.52,1208.61 268.76,1180.87C243.48,1156.51 239.99,1118.36 236.54,1085.37C231.96,1041.7 227.41,998.04 222.9,954.38L197.61,711.61L181.24,554.54C180.97,551.94 180.69,549.38 180.43,546.76C178.47,528.02 165.21,509.68 144.3,510.63C126.41,511.42 106.07,526.63 108.17,546.76L120.3,663.21L145.38,904.1C152.53,972.53 159.66,1040.96 166.77,1109.41C168.15,1122.52 169.44,1135.67 170.88,1148.78C178.75,1220.43 233.46,1259.04 301.22,1269.91C340.8,1276.28 381.34,1277.59 421.5,1278.24C472.98,1279.07 524.98,1281.05 575.61,1271.72C650.65,1257.95 706.95,1207.85 714.99,1130.13C717.28,1107.69 719.58,1085.25 721.87,1062.8C729.5,988.56 737.11,914.31 744.72,840.06L769.6,597.45L781.01,486.26C781.58,480.75 783.91,475.57 787.65,471.48C791.39,467.39 796.35,464.62 801.79,463.57C823.25,459.39 843.76,452.24 859.02,435.92C883.32,409.92 888.15,376.02 879.57,341.85ZM72.43,365.83C72.76,365.68 72.15,368.48 71.9,369.79C71.85,367.81 71.95,366.06 72.43,365.83ZM74.51,381.94C74.68,381.82 75.2,382.51 75.73,383.33C74.93,382.58 74.41,382.01 74.49,381.94H74.51ZM76.56,384.64C77.3,385.9 77.7,386.69 76.56,384.64V384.64ZM80.67,387.98H80.78C80.78,388.1 80.96,388.22 81.03,388.34C80.92,388.21 80.79,388.09 80.65,387.98H80.67ZM800.8,382.99C793.09,390.32 781.47,393.73 770,395.43C641.29,414.53 510.71,424.2 380.6,419.93C287.48,416.75 195.34,406.41 103.14,393.38C94.11,392.11 84.32,390.46 78.11,383.8C66.41,371.24 72.15,345.94 75.2,330.77C77.99,316.86 83.32,298.33 99.86,296.36C125.67,293.33 155.64,304.22 181.18,308.09C211.92,312.78 242.77,316.54 273.74,319.36C405.92,331.4 540.33,329.53 671.92,311.91C695.91,308.69 719.8,304.94 743.62,300.67C764.84,296.87 788.36,289.73 801.17,311.7C809.97,326.67 811.14,346.7 809.78,363.61C809.36,370.98 806.14,377.92 800.78,382.99H800.8Z"
tools:ignore="VectorPath" />
</vector>
+41 -43
View File
@@ -29,20 +29,20 @@
android:layout_height="wrap_content">
<ImageView
android:id="@+id/title_img"
android:id="@+id/infoTitleImg"
android:layout_width="48dp"
android:layout_height="48dp"
android:layout_marginEnd="8dp"
android:contentDescription="@string/placeholder"
android:src="@drawable/ic_menu_entries"
app:layout_constraintBottom_toBottomOf="@+id/title"
app:layout_constraintEnd_toStartOf="@+id/title"
app:layout_constraintBottom_toBottomOf="@+id/infoTitle"
app:layout_constraintEnd_toStartOf="@+id/infoTitle"
app:layout_constraintHorizontal_chainStyle="packed"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="@+id/title" />
app:layout_constraintTop_toTopOf="@+id/infoTitle" />
<com.google.android.material.textview.MaterialTextView
android:id="@+id/title"
android:id="@+id/infoTitle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
@@ -50,90 +50,88 @@
android:textColor="@color/themeLight"
android:textSize="48sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@+id/title_img"
app:layout_constraintStart_toEndOf="@+id/infoTitleImg"
app:layout_constraintTop_toTopOf="parent" />
<com.google.android.material.textview.MaterialTextView
android:id="@+id/version"
android:id="@+id/infoVersion"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="4dp"
android:text="@string/app_version"
android:text="@string/info_version"
android:textColor="@color/themeLight"
android:textSize="18sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/title" />
app:layout_constraintTop_toBottomOf="@+id/infoTitle" />
<com.google.android.material.textview.MaterialTextView
android:id="@+id/subtitle"
android:id="@+id/infoSubtitle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:text="@string/about_subtitle"
android:text="@string/info_subtitle"
android:textSize="18sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/version" />
app:layout_constraintTop_toBottomOf="@+id/infoVersion" />
<com.google.android.material.button.MaterialButton
android:id="@+id/btn_github"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/infoGithub"
style="@style/InfoButton"
android:layout_marginTop="16dp"
android:backgroundTint="@color/greySurface"
android:text="@string/btn_github"
android:textAllCaps="false"
android:textColor="@color/themeLight"
android:textSize="16sp"
android:text="@string/info_github"
app:icon="@drawable/ic_github"
app:iconTint="@color/themeLight"
app:layout_constraintEnd_toStartOf="@+id/btn_fdroid"
app:layout_constraintEnd_toStartOf="@+id/infoFdroid"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/subtitle" />
app:layout_constraintTop_toBottomOf="@+id/infoSubtitle" />
<com.google.android.material.button.MaterialButton
android:id="@+id/btn_fdroid"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:backgroundTint="@color/greySurface"
android:text="@string/btn_fdroid"
android:textAllCaps="false"
android:textColor="@color/themeLight"
android:textSize="16sp"
android:id="@+id/infoFdroid"
style="@style/InfoButton"
android:text="@string/info_fdroid"
app:icon="@drawable/ic_fdroid"
app:iconTint="@color/themeLight"
app:layout_constraintBaseline_toBaselineOf="@+id/btn_github"
app:layout_constraintBaseline_toBaselineOf="@+id/infoGithub"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@+id/btn_github" />
app:layout_constraintStart_toEndOf="@+id/infoGithub" />
<com.google.android.material.button.MaterialButton
android:id="@+id/infoBmc"
style="@style/InfoButton"
android:layout_marginTop="16dp"
android:text="@string/info_bmc"
app:icon="@drawable/ic_bmc"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/infoGithub" />
<com.google.android.material.textview.MaterialTextView
android:id="@+id/message"
android:id="@+id/infoThanks"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:layout_marginTop="16dp"
android:layout_marginEnd="8dp"
android:gravity="center"
android:text="@string/about_thanks"
android:text="@string/info_thanks"
android:textSize="16sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/btn_github" />
app:layout_constraintTop_toBottomOf="@+id/infoBmc" />
<TextView
android:id="@+id/warranty"
android:id="@+id/infoWarranty"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:layout_marginTop="8dp"
android:layout_marginBottom="16dp"
android:gravity="center"
android:text="@string/about_warranty"
android:text="@string/info_warranty"
android:textSize="16sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="@+id/message"
app:layout_constraintStart_toStartOf="@+id/message"
app:layout_constraintTop_toBottomOf="@+id/message" />
app:layout_constraintEnd_toEndOf="@+id/infoThanks"
app:layout_constraintStart_toStartOf="@+id/infoThanks"
app:layout_constraintTop_toBottomOf="@+id/infoThanks" />
</androidx.constraintlayout.widget.ConstraintLayout>
</ScrollView>
+5 -5
View File
@@ -18,8 +18,6 @@
-->
<resources>
<string name="app_version">Версия: %s</string>
<string name="btn_yes">Да</string>
<string name="btn_no">Нет</string>
<string name="btn_cancel">Отмена</string>
@@ -68,8 +66,10 @@
<string name="pref_compass_title">Использовать компас</string>
<string name="pref_time_utc_title">Показывать время пролета по UTC</string>
<string name="about_subtitle">Трекер спутников для Android</string>
<string name="about_thanks">Огромное спасибо:
<string name="info_version">Версия: %s</string>
<string name="info_subtitle">Трекер спутников для Android</string>
<string name="info_bmc">Угостить кофе</string>
<string name="info_thanks">Огромное спасибо:
\n— Вам за использование этого приложения! \nЖелаю всегда чистого неба над головой!
\n— <a href="https://github.com/g4dpz">David A. B. Johnson</a> и
<a href="https://github.com/davidmoten">Dave Moten</a> за работу над библиотекой predict4java и
@@ -82,6 +82,6 @@
<a href="https://db.satnogs.org/">SatNOGS</a>, API и базу данных с огромным количеством информации о спутниках.
\n— <a href="https://square.github.io/">Square</a> за библиотеки OkHttp, Retrofit, Moshi и доступ
к ним по лицензии <a href="https://www.apache.org/licenses/LICENSE-2.0">Apache-2.0</a></string>
<string name="about_warranty">Это ПО поставляется без гарантий.
<string name="info_warranty">Это ПО поставляется без гарантий.
Подробности в лицензии <a href="https://gnu.org/licenses/old-licenses/gpl-2.0.en.html">GNU GPLv2</a></string>
</resources>
+7 -6
View File
@@ -19,15 +19,12 @@
<resources>
<string name="app_name" translatable="false">Look4Sat</string>
<string name="app_version">Version: %s</string>
<string name="placeholder" translatable="false">Placeholder</string>
<string name="btn_no">No</string>
<string name="btn_yes">Yes</string>
<string name="btn_cancel">Cancel</string>
<string name="btn_update">Update</string>
<string name="btn_github" translatable="false">GitHub</string>
<string name="btn_fdroid" translatable="false">F-Droid</string>
<string name="menu_entries">Satellites</string>
<string name="menu_passes">Passes</string>
@@ -88,8 +85,12 @@
<string name="pref_time_utc_title">Show pass time in UTC</string>
<string name="pref_compass_title">Use sensors to rotate PolarView</string>
<string name="about_subtitle">Satellite tracker for Android</string>
<string name="about_thanks">Huge thanks to:
<string name="info_version">Version: %s</string>
<string name="info_subtitle">Satellite tracker for Android</string>
<string name="info_github" translatable="false">GitHub</string>
<string name="info_fdroid" translatable="false">F-Droid</string>
<string name="info_bmc">Buy me a coffee</string>
<string name="info_thanks">Huge thanks to:
\n— You for downloading and using Look4Sat! \nMay your sky always be clear!
\n— <a href="https://github.com/g4dpz">David A. B. Johnson</a>
and <a href="https://github.com/davidmoten">Dave Moten</a> for creating predict4java library and making it
@@ -103,6 +104,6 @@
\n— <a href="https://square.github.io/">Square</a> for epic OkHttp, Retrofit and Moshi libs
available under the <a href="https://www.apache.org/licenses/LICENSE-2.0">Apache-2.0</a> license.
</string>
<string name="about_warranty">This application comes with absolutely no warranty. See the
<string name="info_warranty">This application comes with absolutely no warranty. See the
<a href="https://gnu.org/licenses/old-licenses/gpl-2.0.en.html">GNU GPLv2</a> for details.</string>
</resources>
+10
View File
@@ -32,4 +32,14 @@
<item name="cardCornerRadius">0dp</item>
</style>
<style name="InfoButton">
<item name="android:backgroundTint">@color/greySurface</item>
<item name="android:textColor">@color/themeLight</item>
<item name="android:textSize">16sp</item>
<item name="android:layout_width">wrap_content</item>
<item name="android:layout_height">wrap_content</item>
<item name="iconTint">@color/themeLight</item>
<item name="textAllCaps">false</item>
</style>
</resources>