volkan/Pizzalemon
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

androidx fix for calligraphy at android 10

Browse Source
This commit is contained in:
mustafa içmen
2020-11-04 14:57:16 +03:00
parent 2a4a9b1685
commit 744f95509f
4 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
.idea/caches/build_file_checksums.ser generated
View File

Binary file not shown.

3
app/build.gradle
View File

@@ -91,7 +91,8 @@ dependencies {
implementation 'com.onesignal:OneSignal:[3.9.1, 3.99.99]' implementation 'com.onesignal:OneSignal:[3.9.1, 3.99.99]'
implementation 'com.afollestad.material-dialogs:core:0.9.6.0' implementation 'com.afollestad.material-dialogs:core:0.9.6.0'
implementation 'uk.co.chrisjenx:calligraphy:2.3.0' implementation 'io.github.inflationx:calligraphy3:3.1.1'
implementation 'io.github.inflationx:viewpump:2.0.3'
implementation 'com.wdullaer:materialdatetimepicker:3.6.3' implementation 'com.wdullaer:materialdatetimepicker:3.6.3'
implementation 'io.nlopez.smartlocation:library:3.3.3' implementation 'io.nlopez.smartlocation:library:3.3.3'
implementation 'q.rorbin:badgeview:1.1.0' implementation 'q.rorbin:badgeview:1.1.0'

17
app/src/main/java/ch/pizzacucina/android/App.java
View File

@@ -8,7 +8,10 @@ import com.onesignal.OneSignal;
import com.squareup.picasso.Picasso; import com.squareup.picasso.Picasso;
import io.fabric.sdk.android.Fabric; import io.fabric.sdk.android.Fabric;
import uk.co.chrisjenx.calligraphy.CalligraphyConfig; import io.github.inflationx.calligraphy3.CalligraphyConfig;
import io.github.inflationx.calligraphy3.CalligraphyInterceptor;
import io.github.inflationx.calligraphy3.CalligraphyUtils;
import io.github.inflationx.viewpump.ViewPump;
/** /**
* Created by cimenmus on 11/09/2017. * Created by cimenmus on 11/09/2017.
@@ -26,11 +29,13 @@ public class App extends MultiDexApplication {
} }
private void initCalligraphy(){ private void initCalligraphy(){
CalligraphyConfig.initDefault(new CalligraphyConfig.Builder() ViewPump.init(ViewPump.builder()
.setDefaultFontPath("fonts/Quicksand-Regular.ttf") .addInterceptor(new CalligraphyInterceptor(
.setFontAttrId(R.attr.fontPath) new CalligraphyConfig.Builder()
.build() .setDefaultFontPath("fonts/Quicksand-Regular.ttf")
); .setFontAttrId(R.attr.fontPath)
.build()))
.build());
} }
private void initPicasso(){ private void initPicasso(){

4
app/src/main/java/ch/pizzacucina/android/activity/BaseActivity.java
View File

@@ -9,7 +9,7 @@ import androidx.annotation.Nullable;
import androidx.appcompat.app.AppCompatActivity; import androidx.appcompat.app.AppCompatActivity;
import ch.pizzacucina.android.helper.DisplayHelper; import ch.pizzacucina.android.helper.DisplayHelper;
import uk.co.chrisjenx.calligraphy.CalligraphyContextWrapper; import io.github.inflationx.viewpump.ViewPumpContextWrapper;
/** /**
* Created by cimenmus on 11/09/2017. * Created by cimenmus on 11/09/2017.
@@ -36,7 +36,7 @@ public class BaseActivity extends AppCompatActivity {
@Override @Override
protected void attachBaseContext(Context newBase) { protected void attachBaseContext(Context newBase) {
super.attachBaseContext(CalligraphyContextWrapper.wrap(newBase)); super.attachBaseContext(ViewPumpContextWrapper.wrap(newBase));
} }
public static void setCurrentActivity(BaseActivity currentActivity) { public static void setCurrentActivity(BaseActivity currentActivity) {