Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c5c1c2cd authored by Fahim Salam Chowdhury's avatar Fahim Salam Chowdhury 👽
Browse files

Merge branch 'main' into 1292-Update_with_upstream

parents 0f47a4fc 6d2b6b78

app/build.gradle

+0 −7
Original line number Diff line number Diff line 
apply plugin: 'com.android.application'

apply plugin: 'kotlin-android'

apply plugin: 'kotlin-kapt'

apply plugin: 'com.mikepenz.aboutlibraries.plugin'

apply plugin: 'com.google.devtools.ksp'



android {
@@ -124,7 +123,6 @@ dependencies { 
    implementation 'com.google.accompanist:accompanist-themeadapter-material:0.30.1'



    implementation 'com.jaredrummler:colorpicker:1.1.0'

    implementation "com.mikepenz:aboutlibraries-compose:${versions.aboutLibs}"

    implementation "com.squareup.okhttp3:okhttp:${versions.okhttp}"

    implementation "com.squareup.okhttp3:okhttp-brotli:${versions.okhttp}"

    implementation "com.squareup.okhttp3:okhttp-coroutines:${versions.okhttp}"
@@ -150,8 +148,3 @@ dependencies { 


    testImplementation 'junit:junit:4.13.2'

}
 


aboutLibraries {

    duplicationMode = com.mikepenz.aboutlibraries.plugin.DuplicateMode.MERGE

    includePlatform = false

}
 
 No newline at end of file

app/src/main/AndroidManifest.xml

+1 −0
Original line number Diff line number Diff line
@@ -121,6 +121,7 @@ 
            android:parentActivityName=".ui.CalendarListActivity"

            android:windowSoftInputMode="stateAlwaysHidden" />

        <activity android:name=".ui.ColorPickerActivity" />



        <activity

            android:name=".ui.InfoActivity"

            android:label="@string/activity_app_info"

app/src/main/java/at/bitfire/icsdroid/ui/InfoActivity.kt

+6 −9
Original line number Diff line number Diff line
@@ -4,13 +4,8 @@ 


package at.bitfire.icsdroid.ui



import android.content.ActivityNotFoundException

import android.content.Intent

import android.net.Uri

import android.os.Bundle

import android.util.Log

import android.widget.TextView

import android.widget.Toast

import androidx.activity.ComponentActivity

import androidx.activity.compose.setContent

import androidx.annotation.StringRes
@@ -42,7 +37,6 @@ import androidx.compose.ui.Modifier 
import androidx.compose.ui.draw.alpha

import androidx.compose.ui.graphics.asImageBitmap

import androidx.compose.ui.platform.LocalContext

import androidx.compose.ui.res.painterResource

import androidx.compose.ui.res.stringResource

import androidx.compose.ui.tooling.preview.Preview

import androidx.compose.ui.unit.dp
@@ -50,10 +44,8 @@ import androidx.compose.ui.viewinterop.AndroidView 
import androidx.core.graphics.drawable.toBitmap

import androidx.core.text.HtmlCompat

import at.bitfire.icsdroid.BuildConfig

import at.bitfire.icsdroid.Constants

import at.bitfire.icsdroid.R

import com.google.accompanist.themeadapter.material.MdcTheme

import com.mikepenz.aboutlibraries.ui.compose.LibrariesContainer



class InfoActivity: ComponentActivity() {
@@ -91,7 +83,6 @@ class InfoActivity: ComponentActivity() { 
                Column(Modifier.padding(contentPadding)) {

                    Header()

                    License()

                    LibrariesContainer()

                }

            }

        }
@@ -120,6 +111,12 @@ class InfoActivity: ComponentActivity() { 
                style = MaterialTheme.typography.h5,

                color = MaterialTheme.colors.onBackground

            )

            Text(

                text = stringResource(R.string.app_fork_info),

                style = MaterialTheme.typography.subtitle1,

                color = MaterialTheme.colors.onBackground,

                modifier = Modifier.alpha(ContentAlpha.medium)

            )

            Text(

                text = stringResource(

                    R.string.app_info_version,

app/src/main/res/menu/activity_calendar_list.xml

+0 −5
Original line number Diff line number Diff line
@@ -17,11 +17,6 @@ 
          android:onClick="onToggleDarkMode"

          app:showAsAction="never" />



    <item android:id="@+id/privacy_policy"

          android:title="@string/calendar_list_privacy_policy"

          android:onClick="onShowPrivacyPolicy"

          app:showAsAction="never"/>



    <item android:title="@string/calendar_list_info"

          android:onClick="onShowInfo"

          app:showAsAction="never"/>

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

+1 −0
Original line number Diff line number Diff line
@@ -108,6 +108,7 @@ 
    <!-- InfoActivity -->

    <string name="activity_app_info">App info</string>

    <string name="app_info_version">Version %1$s-%2$s</string>

    <string name="app_fork_info">Web Calendar Manager is forked from ICSx⁵</string>

    <string name="app_info_gplv3" translatable="false">GPLv3</string>

    <string name="app_info_gplv3_note"><![CDATA["

This program is free software: you can redistribute it and/or modify