Revert the Nunito font

Signed-off-by: Mario Danic <mario@lovelyhq.com>
This commit is contained in:
Mario Danic 2019-01-09 01:03:06 +01:00
parent b7a933e917
commit 2223b0549a
19 changed files with 0 additions and 17 deletions

View File

@ -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', {

View File

@ -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);

View File

@ -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();