Pārlūkot izejas kodu

Revert the Nunito font

Signed-off-by: Mario Danic <mario@lovelyhq.com>
Mario Danic 6 gadi atpakaļ
vecāks
revīzija
2223b0549a

+ 0 - 2
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', {

BIN
app/src/main/assets/fonts/Nunito-Black.ttf


BIN
app/src/main/assets/fonts/Nunito-BlackItalic.ttf


BIN
app/src/main/assets/fonts/Nunito-Bold.ttf


BIN
app/src/main/assets/fonts/Nunito-BoldItalic.ttf


BIN
app/src/main/assets/fonts/Nunito-ExtraBold.ttf


BIN
app/src/main/assets/fonts/Nunito-ExtraBoldItalic.ttf


BIN
app/src/main/assets/fonts/Nunito-ExtraLight.ttf


BIN
app/src/main/assets/fonts/Nunito-ExtraLightItalic.ttf


BIN
app/src/main/assets/fonts/Nunito-Italic.ttf


BIN
app/src/main/assets/fonts/Nunito-Light.ttf


BIN
app/src/main/assets/fonts/Nunito-LightItalic.ttf


BIN
app/src/main/assets/fonts/Nunito-Regular.ttf


BIN
app/src/main/assets/fonts/Nunito-SemiBold.ttf


BIN
app/src/main/assets/fonts/Nunito-SemiBoldItalic.ttf


BIN
app/src/main/assets/fonts/NunitoHeavy-Italic.ttf


BIN
app/src/main/assets/fonts/NunitoHeavy-Regular.ttf


+ 0 - 9
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);

+ 0 - 6
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();