From adbdee7b3c4f9c87a5e14c7fb38723eb10ac9bc5 Mon Sep 17 00:00:00 2001 From: iamBedant Date: Fri, 7 Jul 2017 13:56:20 +0530 Subject: [PATCH 1/2] feat: Improvement bumped up supportlibrary version to 26+, Removed calligraphy library --- app/build.gradle | 2 -- .../mvp/di/module/ApplicationTestModule.java | 2 +- .../com/mindorks/framework/mvp/MvpApp.java | 5 ---- .../mvp/di/module/ApplicationModule.java | 9 ------- .../framework/mvp/ui/base/BaseActivity.java | 6 +---- .../font/sourcesanspro_bold.ttf} | Bin .../font/sourcesanspro_italic.ttf} | Bin .../font/sourcesanspro_light.ttf} | Bin .../font/sourcesanspro_regular.ttf} | Bin app/src/main/res/values/styles.xml | 25 ++++-------------- build.gradle | 11 ++++---- gradle/wrapper/gradle-wrapper.properties | 19 ++----------- 12 files changed, 14 insertions(+), 65 deletions(-) rename app/src/main/{assets/fonts/source-sans-pro/SourceSansPro-Bold.ttf => res/font/sourcesanspro_bold.ttf} (100%) rename app/src/main/{assets/fonts/source-sans-pro/SourceSansPro-Italic.ttf => res/font/sourcesanspro_italic.ttf} (100%) rename app/src/main/{assets/fonts/source-sans-pro/SourceSansPro-Light.ttf => res/font/sourcesanspro_light.ttf} (100%) rename app/src/main/{assets/fonts/source-sans-pro/SourceSansPro-Regular.ttf => res/font/sourcesanspro_regular.ttf} (100%) diff --git a/app/build.gradle b/app/build.gradle index b5ff17d..e22b825 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -59,8 +59,6 @@ dependencies { compile "com.android.support:support-vector-drawable:$rootProject.supportLibraryVersion" compile "com.android.support:animated-vector-drawable:$rootProject.supportLibraryVersion" - // font - compile "uk.co.chrisjenx:calligraphy:$rootProject.calligraphyVersion" // network compile "com.amitshekhar.android:rx2-android-networking:$rootProject.rx2AndroidNetworking" diff --git a/app/src/androidTest/java/com/mindorks/framework/mvp/di/module/ApplicationTestModule.java b/app/src/androidTest/java/com/mindorks/framework/mvp/di/module/ApplicationTestModule.java index 5610862..215b428 100644 --- a/app/src/androidTest/java/com/mindorks/framework/mvp/di/module/ApplicationTestModule.java +++ b/app/src/androidTest/java/com/mindorks/framework/mvp/di/module/ApplicationTestModule.java @@ -122,7 +122,7 @@ ApiHeader.ProtectedApiHeader provideProtectedApiHeader(@ApiInfo String apiKey, @Singleton CalligraphyConfig provideCalligraphyDefaultConfig() { return new CalligraphyConfig.Builder() - .setDefaultFontPath("fonts/source-sans-pro/SourceSansPro-Regular.ttf") + .setDefaultFontPath("fonts/source-sans-pro/sourcesanspro_regular.ttf") .setFontAttrId(R.attr.fontPath) .build(); } diff --git a/app/src/main/java/com/mindorks/framework/mvp/MvpApp.java b/app/src/main/java/com/mindorks/framework/mvp/MvpApp.java index 98e5416..4043b9b 100644 --- a/app/src/main/java/com/mindorks/framework/mvp/MvpApp.java +++ b/app/src/main/java/com/mindorks/framework/mvp/MvpApp.java @@ -27,7 +27,6 @@ import javax.inject.Inject; -import uk.co.chrisjenx.calligraphy.CalligraphyConfig; /** @@ -39,9 +38,6 @@ public class MvpApp extends Application { @Inject DataManager mDataManager; - @Inject - CalligraphyConfig mCalligraphyConfig; - private ApplicationComponent mApplicationComponent; @Override @@ -60,7 +56,6 @@ public void onCreate() { AndroidNetworking.enableLogging(Level.BODY); } - CalligraphyConfig.initDefault(mCalligraphyConfig); } public ApplicationComponent getComponent() { diff --git a/app/src/main/java/com/mindorks/framework/mvp/di/module/ApplicationModule.java b/app/src/main/java/com/mindorks/framework/mvp/di/module/ApplicationModule.java index 59d2933..d4fea2a 100644 --- a/app/src/main/java/com/mindorks/framework/mvp/di/module/ApplicationModule.java +++ b/app/src/main/java/com/mindorks/framework/mvp/di/module/ApplicationModule.java @@ -39,7 +39,6 @@ import dagger.Module; import dagger.Provides; -import uk.co.chrisjenx.calligraphy.CalligraphyConfig; /** * Created by janisharali on 27/01/17. @@ -117,12 +116,4 @@ ApiHeader.ProtectedApiHeader provideProtectedApiHeader(@ApiInfo String apiKey, preferencesHelper.getAccessToken()); } - @Provides - @Singleton - CalligraphyConfig provideCalligraphyDefaultConfig() { - return new CalligraphyConfig.Builder() - .setDefaultFontPath("fonts/source-sans-pro/SourceSansPro-Regular.ttf") - .setFontAttrId(R.attr.fontPath) - .build(); - } } diff --git a/app/src/main/java/com/mindorks/framework/mvp/ui/base/BaseActivity.java b/app/src/main/java/com/mindorks/framework/mvp/ui/base/BaseActivity.java index 8497feb..c0c6776 100644 --- a/app/src/main/java/com/mindorks/framework/mvp/ui/base/BaseActivity.java +++ b/app/src/main/java/com/mindorks/framework/mvp/ui/base/BaseActivity.java @@ -40,7 +40,6 @@ import com.mindorks.framework.mvp.utils.NetworkUtils; import butterknife.Unbinder; -import uk.co.chrisjenx.calligraphy.CalligraphyContextWrapper; /** * Created by janisharali on 27/01/17. @@ -69,10 +68,7 @@ public ActivityComponent getActivityComponent() { return mActivityComponent; } - @Override - protected void attachBaseContext(Context newBase) { - super.attachBaseContext(CalligraphyContextWrapper.wrap(newBase)); - } + @TargetApi(Build.VERSION_CODES.M) public void requestPermissionsSafely(String[] permissions, int requestCode) { diff --git a/app/src/main/assets/fonts/source-sans-pro/SourceSansPro-Bold.ttf b/app/src/main/res/font/sourcesanspro_bold.ttf similarity index 100% rename from app/src/main/assets/fonts/source-sans-pro/SourceSansPro-Bold.ttf rename to app/src/main/res/font/sourcesanspro_bold.ttf diff --git a/app/src/main/assets/fonts/source-sans-pro/SourceSansPro-Italic.ttf b/app/src/main/res/font/sourcesanspro_italic.ttf similarity index 100% rename from app/src/main/assets/fonts/source-sans-pro/SourceSansPro-Italic.ttf rename to app/src/main/res/font/sourcesanspro_italic.ttf diff --git a/app/src/main/assets/fonts/source-sans-pro/SourceSansPro-Light.ttf b/app/src/main/res/font/sourcesanspro_light.ttf similarity index 100% rename from app/src/main/assets/fonts/source-sans-pro/SourceSansPro-Light.ttf rename to app/src/main/res/font/sourcesanspro_light.ttf diff --git a/app/src/main/assets/fonts/source-sans-pro/SourceSansPro-Regular.ttf b/app/src/main/res/font/sourcesanspro_regular.ttf similarity index 100% rename from app/src/main/assets/fonts/source-sans-pro/SourceSansPro-Regular.ttf rename to app/src/main/res/font/sourcesanspro_regular.ttf diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 8b12c1a..8c5ebaa 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -28,7 +28,7 @@ 16sp sans @style/MaterialDrawer.DrawerArrowStyle - @style/TextAppearance.Text.Regular + @font/sourcesanspro_regular - - - - - - -