github/wulkanowy-mirror
Archived
1
0
Fork 1
Code Activity

Add single support advert (#1484)

Browse Source
This commit is contained in:
Rafał Borcz
2021-10-21 10:51:00 +02:00
committed by GitHub
parent 09a134d442
commit 94fd303f8e
18 changed files with 324 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
app/src/main/AndroidManifest.xml
View File

@ -165,33 +165,32 @@
<meta-data
android:name="install_channel"
android:value="${install_channel}" />
<meta-data
android:name="firebase_analytics_collection_enabled"
android:value="${firebase_enabled}" />
<meta-data
android:name="google_analytics_adid_collection_enabled"
android:value="${firebase_enabled}" />
<meta-data
android:name="firebase_crashlytics_collection_enabled"
android:value="${firebase_enabled}" />
<meta-data
android:name="firebase_messaging_auto_init_enabled"
android:value="${firebase_enabled}" />
<meta-data
android:name="firebase_inapp_messaging_auto_data_collection_enabled"
android:value="${firebase_enabled}" />
<meta-data
android:name="com.google.firebase.messaging.default_notification_icon"
android:resource="@drawable/ic_stat_all" />
<meta-data
android:name="com.google.firebase.messaging.default_notification_channel_id"
android:value="push_channel" />
<meta-data
android:name="com.google.android.gms.ads.APPLICATION_ID"
android:value="${admob_project_id}" />
<meta-data
android:name="com.google.android.gms.ads.DELAY_APP_MEASUREMENT_INIT"
android:value="true" />
</application>
</manifest>

26
app/src/main/java/io/github/wulkanowy/ui/modules/about/AboutPresenter.kt
View File

@ -82,18 +82,20 @@ class AboutPresenter @Inject constructor(
private fun loadData() {
view?.run {
updateData(listOfNotNull(
versionRes,
creatorsRes,
feedbackRes,
faqRes,
discordRes,
facebookRes,
twitterRes,
homepageRes,
licensesRes,
privacyRes
))
updateData(
listOfNotNull(
versionRes,
creatorsRes,
feedbackRes,
faqRes,
discordRes,
facebookRes,
twitterRes,
homepageRes,
licensesRes,
privacyRes
)
)
}
}
}

3
app/src/main/java/io/github/wulkanowy/ui/modules/dashboard/DashboardAdapter.kt
View File

@ -299,7 +299,8 @@ class DashboardAdapter @Inject constructor() : RecyclerView.Adapter<RecyclerView
val currentDayHeader =
timetableFull?.headers.orEmpty().singleOrNull { it.date == currentDate }
val tomorrowTimetable = timetableFull?.lessons.orEmpty()
val tomorrowTimetable = timetableFull?.lessons
.orEmpty()
.filter { it.date == currentDate.plusDays(1) }
.filterNot { it.canceled }
val tomorrowDayHeader =

4
app/src/main/java/io/github/wulkanowy/ui/modules/settings/advanced/AdvancedFragment.kt
View File

@ -27,10 +27,6 @@ class AdvancedFragment : PreferenceFragmentCompat(),
@Inject
lateinit var lingver: Lingver
companion object {
fun newInstance() = AdvancedFragment()
}
override val titleStringId get() = R.string.pref_settings_advanced_title
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {

4
app/src/main/java/io/github/wulkanowy/ui/modules/settings/appearance/AppearanceFragment.kt
View File

@ -27,10 +27,6 @@ class AppearanceFragment : PreferenceFragmentCompat(),
@Inject
lateinit var lingver: Lingver
companion object {
fun newInstance() = AppearanceFragment()
}
override val titleStringId get() = R.string.pref_settings_appearance_title
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {

4
app/src/main/java/io/github/wulkanowy/ui/modules/settings/notifications/NotificationsFragment.kt
View File

@ -40,10 +40,6 @@ class NotificationsFragment : PreferenceFragmentCompat(),
@Inject
lateinit var appInfo: AppInfo
companion object {
fun newInstance() = NotificationsFragment()
}
override val titleStringId get() = R.string.pref_settings_notifications_title
override val isNotificationPermissionGranted: Boolean

4
app/src/main/java/io/github/wulkanowy/ui/modules/settings/sync/SyncFragment.kt
View File

@ -20,10 +20,6 @@ class SyncFragment : PreferenceFragmentCompat(),
@Inject
lateinit var presenter: SyncPresenter
companion object {
fun newInstance() = SyncFragment()
}
override val titleStringId get() = R.string.pref_settings_sync_title
override val syncSuccessString get() = getString(R.string.pref_services_message_sync_success)

22
app/src/main/res/drawable/ic_settings_ads.xml Normal file
View File

@ -0,0 +1,22 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:tint="?attr/colorOnSurface"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="@android:color/white"
android:pathData="M18,11c0,0.67 0,1.33 0,2c1.2,0 2.76,0 4,0c0,-0.67 0,-1.33 0,-2C20.76,11 19.2,11 18,11z" />
<path
android:fillColor="@android:color/white"
android:pathData="M16,17.61c0.96,0.71 2.21,1.65 3.2,2.39c0.4,-0.53 0.8,-1.07 1.2,-1.6c-0.99,-0.74 -2.24,-1.68 -3.2,-2.4C16.8,16.54 16.4,17.08 16,17.61z" />
<path
android:fillColor="@android:color/white"
android:pathData="M20.4,5.6C20,5.07 19.6,4.53 19.2,4c-0.99,0.74 -2.24,1.68 -3.2,2.4c0.4,0.53 0.8,1.07 1.2,1.6C18.16,7.28 19.41,6.35 20.4,5.6z" />
<path
android:fillColor="@android:color/white"
android:pathData="M4,9c-1.1,0 -2,0.9 -2,2v2c0,1.1 0.9,2 2,2h1v4h2v-4h1l5,3V6L8,9H4zM9.03,10.71L11,9.53v4.94l-1.97,-1.18L8.55,13H8H4v-2h4h0.55L9.03,10.71z" />
<path
android:fillColor="@android:color/white"
android:pathData="M15.5,12c0,-1.33 -0.58,-2.53 -1.5,-3.35v6.69C14.92,14.53 15.5,13.33 15.5,12z" />
</vector>

1
app/src/main/res/values/preferences_keys.xml
View File

@ -34,4 +34,5 @@
<string name="pref_key_message_send_draft">message_send_recipients</string>
<string name="pref_key_last_sync_date">last_sync_date</string>
<string name="pref_key_notifications_piggyback">notifications_piggyback</string>
<string name="pref_key_ads_single_support">single_ad_support</string>
</resources>

10
app/src/main/res/values/strings.xml
View File

@ -658,10 +658,19 @@
<string name="pref_other_fill_message_content">Reply with message history</string>
<string name="pref_other_optional_arithmetic_average">Show arithmetic average when no weights provided</string>
<string name="pref_ads_support_category_name">Support</string>
<string name="pref_ads_support">Watch single ad to support project</string>
<string name="pref_ads_privacy_title">Consent to data processing</string>
<string name="pref_ads_privacy_description">To view an advertisement you must agree to the data processing terms of our Privacy Policy</string>
<string name="pref_ads_privacy_agree">Agree</string>
<string name="pref_ads_privacy_link">Privacy policy</string>
<string name="pref_ads_loading">Ad is loading</string>
<string name="pref_settings_advanced_title">Advanced</string>
<string name="pref_settings_appearance_title">Appearance &amp; Behavior</string>
<string name="pref_settings_notifications_title">Notifications</string>
<string name="pref_settings_sync_title">Synchronization</string>
<string name="pref_settings_ads_title">Advertisements</string>
<string name="pref_grades_appearance_header">Grades</string>
<string name="pref_dashboard_appearance_header">Dashboard</string>
@ -681,6 +690,7 @@
<string name="pref_advanced_category_summary">Plus and minus values, average calculation</string>
<string name="pref_advanced_category">Advanced</string>
<string name="pref_about_category_summary">App version, contributors, social portals, licenses</string>
<string name="pref_ads_category_summary">Displaying advertisements, project support</string>
<!--Notification Channels-->

30
app/src/main/res/xml/scheme_preferences.xml
View File

@ -1,33 +1,33 @@
<?xml version="1.0" encoding="utf-8"?>
<PreferenceScreen xmlns:app="http://schemas.android.com/apk/res-auto">
<Preference
app:key="appearance"
app:fragment="io.github.wulkanowy.ui.modules.settings.appearance.AppearanceFragment"
app:icon="@drawable/ic_settings_appearance"
app:key="appearance"
app:summary="@string/pref_appearance_category_summary"
app:title="@string/pref_appearance_category"
app:fragment="io.github.wulkanowy.ui.modules.settings.appearance.AppearanceFragment" />
app:title="@string/pref_appearance_category" />
<Preference
app:key="notifications"
app:fragment="io.github.wulkanowy.ui.modules.settings.notifications.NotificationsFragment"
app:icon="@drawable/ic_settings_notifications"
app:key="notifications"
app:summary="@string/pref_notifications_category_summary"
app:title="@string/pref_notifications_category"
app:fragment="io.github.wulkanowy.ui.modules.settings.notifications.NotificationsFragment" />
app:title="@string/pref_notifications_category" />
<Preference
app:key="sync"
app:fragment="io.github.wulkanowy.ui.modules.settings.sync.SyncFragment"
app:icon="@drawable/ic_settings_sync"
app:key="sync"
app:summary="@string/pref_sync_category_summary"
app:title="@string/pref_sync_category"
app:fragment="io.github.wulkanowy.ui.modules.settings.sync.SyncFragment" />
app:title="@string/pref_sync_category" />
<Preference
app:key="advanced"
app:fragment="io.github.wulkanowy.ui.modules.settings.advanced.AdvancedFragment"
app:icon="@drawable/ic_settings_advanced"
app:key="advanced"
app:summary="@string/pref_advanced_category_summary"
app:title="@string/pref_advanced_category"
app:fragment="io.github.wulkanowy.ui.modules.settings.advanced.AdvancedFragment" />
app:title="@string/pref_advanced_category" />
<Preference
app:key="about"
app:fragment="io.github.wulkanowy.ui.modules.about.AboutFragment"
app:icon="@drawable/ic_all_about"
app:key="about"
app:summary="@string/pref_about_category_summary"
app:title="@string/about_title"
app:fragment="io.github.wulkanowy.ui.modules.about.AboutFragment" />
app:title="@string/about_title" />
</PreferenceScreen>