diff --git a/app/build.gradle b/app/build.gradle index 87ce9a49d..7be9cb984 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -199,8 +199,6 @@ dependencies { implementation 'com.amulyakhare:com.amulyakhare.textdrawable:1.0.1' implementation 'com.kevalpatel2106:emoticongifkeyboard:1.1' - implementation 'uk.co.chrisjenx:calligraphy:2.3.0' - implementation group: 'eu.medsea.mimeutil', name: 'mime-util', version: '2.1.3' testImplementation 'junit:junit:4.12' androidTestImplementation ('androidx.test.espresso:espresso-core:3.1.0-alpha4', { diff --git a/app/src/main/assets/fonts/Nunito-Black.ttf b/app/src/main/assets/fonts/Nunito-Black.ttf deleted file mode 100644 index 45fdbcc81..000000000 Binary files a/app/src/main/assets/fonts/Nunito-Black.ttf and /dev/null differ diff --git a/app/src/main/assets/fonts/Nunito-BlackItalic.ttf b/app/src/main/assets/fonts/Nunito-BlackItalic.ttf deleted file mode 100644 index ef7b7f3c9..000000000 Binary files a/app/src/main/assets/fonts/Nunito-BlackItalic.ttf and /dev/null differ diff --git a/app/src/main/assets/fonts/Nunito-Bold.ttf b/app/src/main/assets/fonts/Nunito-Bold.ttf deleted file mode 100644 index 56087d9db..000000000 Binary files a/app/src/main/assets/fonts/Nunito-Bold.ttf and /dev/null differ diff --git a/app/src/main/assets/fonts/Nunito-BoldItalic.ttf b/app/src/main/assets/fonts/Nunito-BoldItalic.ttf deleted file mode 100644 index f22b33466..000000000 Binary files a/app/src/main/assets/fonts/Nunito-BoldItalic.ttf and /dev/null differ diff --git a/app/src/main/assets/fonts/Nunito-ExtraBold.ttf b/app/src/main/assets/fonts/Nunito-ExtraBold.ttf deleted file mode 100644 index 198757110..000000000 Binary files a/app/src/main/assets/fonts/Nunito-ExtraBold.ttf and /dev/null differ diff --git a/app/src/main/assets/fonts/Nunito-ExtraBoldItalic.ttf b/app/src/main/assets/fonts/Nunito-ExtraBoldItalic.ttf deleted file mode 100644 index 247967ed3..000000000 Binary files a/app/src/main/assets/fonts/Nunito-ExtraBoldItalic.ttf and /dev/null differ diff --git a/app/src/main/assets/fonts/Nunito-ExtraLight.ttf b/app/src/main/assets/fonts/Nunito-ExtraLight.ttf deleted file mode 100644 index 5c06e7577..000000000 Binary files a/app/src/main/assets/fonts/Nunito-ExtraLight.ttf and /dev/null differ diff --git a/app/src/main/assets/fonts/Nunito-ExtraLightItalic.ttf b/app/src/main/assets/fonts/Nunito-ExtraLightItalic.ttf deleted file mode 100644 index d44c53c42..000000000 Binary files a/app/src/main/assets/fonts/Nunito-ExtraLightItalic.ttf and /dev/null differ diff --git a/app/src/main/assets/fonts/Nunito-Italic.ttf b/app/src/main/assets/fonts/Nunito-Italic.ttf deleted file mode 100644 index 97476e09f..000000000 Binary files a/app/src/main/assets/fonts/Nunito-Italic.ttf and /dev/null differ diff --git a/app/src/main/assets/fonts/Nunito-Light.ttf b/app/src/main/assets/fonts/Nunito-Light.ttf deleted file mode 100644 index 9f3e7ddf5..000000000 Binary files a/app/src/main/assets/fonts/Nunito-Light.ttf and /dev/null differ diff --git a/app/src/main/assets/fonts/Nunito-LightItalic.ttf b/app/src/main/assets/fonts/Nunito-LightItalic.ttf deleted file mode 100644 index 513fb3722..000000000 Binary files a/app/src/main/assets/fonts/Nunito-LightItalic.ttf and /dev/null differ diff --git a/app/src/main/assets/fonts/Nunito-Regular.ttf b/app/src/main/assets/fonts/Nunito-Regular.ttf deleted file mode 100644 index d3d345a85..000000000 Binary files a/app/src/main/assets/fonts/Nunito-Regular.ttf and /dev/null differ diff --git a/app/src/main/assets/fonts/Nunito-SemiBold.ttf b/app/src/main/assets/fonts/Nunito-SemiBold.ttf deleted file mode 100644 index 6f17695e9..000000000 Binary files a/app/src/main/assets/fonts/Nunito-SemiBold.ttf and /dev/null differ diff --git a/app/src/main/assets/fonts/Nunito-SemiBoldItalic.ttf b/app/src/main/assets/fonts/Nunito-SemiBoldItalic.ttf deleted file mode 100644 index d932fe952..000000000 Binary files a/app/src/main/assets/fonts/Nunito-SemiBoldItalic.ttf and /dev/null differ diff --git a/app/src/main/assets/fonts/NunitoHeavy-Italic.ttf b/app/src/main/assets/fonts/NunitoHeavy-Italic.ttf deleted file mode 100644 index c6554c78d..000000000 Binary files a/app/src/main/assets/fonts/NunitoHeavy-Italic.ttf and /dev/null differ diff --git a/app/src/main/assets/fonts/NunitoHeavy-Regular.ttf b/app/src/main/assets/fonts/NunitoHeavy-Regular.ttf deleted file mode 100644 index acefb3ad2..000000000 Binary files a/app/src/main/assets/fonts/NunitoHeavy-Regular.ttf and /dev/null differ diff --git a/app/src/main/java/com/nextcloud/talk/activities/BaseActivity.java b/app/src/main/java/com/nextcloud/talk/activities/BaseActivity.java index 537f9cc01..80f2408d1 100644 --- a/app/src/main/java/com/nextcloud/talk/activities/BaseActivity.java +++ b/app/src/main/java/com/nextcloud/talk/activities/BaseActivity.java @@ -21,10 +21,8 @@ package com.nextcloud.talk.activities; import android.annotation.SuppressLint; -import android.content.Context; import android.os.Bundle; import android.util.Log; -import android.view.WindowManager; import android.webkit.SslErrorHandler; import com.nextcloud.talk.R; @@ -47,7 +45,6 @@ import javax.inject.Inject; import androidx.annotation.Nullable; import androidx.appcompat.app.AppCompatActivity; import autodagger.AutoInjector; -import uk.co.chrisjenx.calligraphy.CalligraphyContextWrapper; @AutoInjector(NextcloudTalkApplication.class) public class BaseActivity extends AppCompatActivity { @@ -58,16 +55,10 @@ public class BaseActivity extends AppCompatActivity { @Override protected void onCreate(Bundle savedInstanceState) { - getWindow().setFlags(WindowManager.LayoutParams.FLAG_SECURE, WindowManager.LayoutParams.FLAG_SECURE); NextcloudTalkApplication.getSharedApplication().getComponentApplication().inject(this); super.onCreate(savedInstanceState); } - @Override - protected void attachBaseContext(Context newBase) { - super.attachBaseContext(CalligraphyContextWrapper.wrap(newBase)); - } - public void showCertificateDialog(X509Certificate cert, MagicTrustManager magicTrustManager, @Nullable SslErrorHandler sslErrorHandler) { DateFormat formatter = DateFormat.getDateInstance(DateFormat.LONG); diff --git a/app/src/main/java/com/nextcloud/talk/application/NextcloudTalkApplication.java b/app/src/main/java/com/nextcloud/talk/application/NextcloudTalkApplication.java index be3e6e011..eff51cfca 100644 --- a/app/src/main/java/com/nextcloud/talk/application/NextcloudTalkApplication.java +++ b/app/src/main/java/com/nextcloud/talk/application/NextcloudTalkApplication.java @@ -61,7 +61,6 @@ import androidx.work.WorkManager; import autodagger.AutoComponent; import autodagger.AutoInjector; import okhttp3.OkHttpClient; -import uk.co.chrisjenx.calligraphy.CalligraphyConfig; @AutoComponent( modules = { @@ -120,11 +119,6 @@ public class NextcloudTalkApplication extends MultiDexApplication implements Lif public void onCreate() { super.onCreate(); - CalligraphyConfig.initDefault(new CalligraphyConfig.Builder() - .setDefaultFontPath("fonts/Nunito-Regular.ttf") - .build() - ); - sharedApplication = this; initializeWebRtc();