diff --git a/app/build.gradle b/app/build.gradle index 0c3ecfd4..58cdafad 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -44,6 +44,7 @@ dependencies { transitive = true } compile 'com.mikepenz:fontawesome-typeface:4.7.0.0@aar' + compile 'com.mikepenz:google-material-typeface:3.0.1.2.original@aar' compile 'pl.droidsonroids.gif:android-gif-drawable:1.2.7' compile 'com.bignerdranch.android:expandablerecyclerview:3.0.0-RC1' //TODO: Deprecated - needs replacement! compile 'me.zhanghai.android.materialprogressbar:library:1.4.2' diff --git a/app/src/main/assets/apache_libraries.html b/app/src/main/assets/apache_libraries.html index 0fd5216e..090b8039 100644 --- a/app/src/main/assets/apache_libraries.html +++ b/app/src/main/assets/apache_libraries.html @@ -38,27 +38,27 @@ diff --git a/app/src/main/java/gr/thmmy/mthmmy/base/BaseActivity.java b/app/src/main/java/gr/thmmy/mthmmy/base/BaseActivity.java index 1724d0f7..6c77c5ec 100644 --- a/app/src/main/java/gr/thmmy/mthmmy/base/BaseActivity.java +++ b/app/src/main/java/gr/thmmy/mthmmy/base/BaseActivity.java @@ -20,6 +20,7 @@ import android.widget.ImageButton; import android.widget.Toast; import com.mikepenz.fontawesome_typeface_library.FontAwesome; +import com.mikepenz.google_material_typeface_library.GoogleMaterial; import com.mikepenz.iconics.IconicsDrawable; import com.mikepenz.materialdrawer.AccountHeader; import com.mikepenz.materialdrawer.AccountHeaderBuilder; @@ -156,27 +157,27 @@ public abstract class BaseActivity extends AppCompatActivity { //Drawer Icons homeIcon = new IconicsDrawable(this) - .icon(FontAwesome.Icon.faw_home) + .icon(GoogleMaterial.Icon.gmd_home) .color(primaryColor); homeIconSelected = new IconicsDrawable(this) - .icon(FontAwesome.Icon.faw_home) + .icon(GoogleMaterial.Icon.gmd_home) .color(selectedSecondaryColor); - downloadsIcon = new IconicsDrawable(this) - .icon(FontAwesome.Icon.faw_download) + bookmarksIcon = new IconicsDrawable(this) + .icon(GoogleMaterial.Icon.gmd_bookmark) .color(primaryColor); - downloadsIconSelected = new IconicsDrawable(this) - .icon(FontAwesome.Icon.faw_download) + bookmarksIconSelected = new IconicsDrawable(this) + .icon(GoogleMaterial.Icon.gmd_bookmark) .color(selectedSecondaryColor); - bookmarksIcon = new IconicsDrawable(this) - .icon(FontAwesome.Icon.faw_bookmark) + downloadsIcon = new IconicsDrawable(this) + .icon(GoogleMaterial.Icon.gmd_file_download) .color(primaryColor); - bookmarksIconSelected = new IconicsDrawable(this) - .icon(FontAwesome.Icon.faw_bookmark) + downloadsIconSelected = new IconicsDrawable(this) + .icon(GoogleMaterial.Icon.gmd_file_download) .color(selectedSecondaryColor); loginIcon = new IconicsDrawable(this) @@ -188,11 +189,11 @@ public abstract class BaseActivity extends AppCompatActivity { .color(primaryColor); aboutIcon = new IconicsDrawable(this) - .icon(FontAwesome.Icon.faw_info_circle) + .icon(GoogleMaterial.Icon.gmd_info) .color(primaryColor); aboutIconSelected = new IconicsDrawable(this) - .icon(FontAwesome.Icon.faw_info_circle) + .icon(GoogleMaterial.Icon.gmd_info) .color(selectedSecondaryColor); //Drawer Items