diff --git a/library/build.gradle b/library/build.gradle index 3d39f32..5528534 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -17,6 +17,8 @@ android { proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } } + + resourcePrefix 'about_' } dependencies { diff --git a/library/src/main/java/mehdi/sakout/aboutpage/AboutPage.java b/library/src/main/java/mehdi/sakout/aboutpage/AboutPage.java index 76b24a7..e6875b2 100644 --- a/library/src/main/java/mehdi/sakout/aboutpage/AboutPage.java +++ b/library/src/main/java/mehdi/sakout/aboutpage/AboutPage.java @@ -67,7 +67,7 @@ public AboutPage addFacebook(String id){ Element facebookElement = new Element(); facebookElement.setTitle(mContext.getString(R.string.about_facebook)); facebookElement.setIcon(R.drawable.about_icon_facebook); - facebookElement.setColor(ContextCompat.getColor(mContext, R.color.facebook_color)); + facebookElement.setColor(ContextCompat.getColor(mContext, R.color.about_facebook_color)); facebookElement.setValue(id); Intent intent = new Intent(); @@ -108,7 +108,7 @@ public AboutPage addTwitter(String id){ Element twitterElement = new Element(); twitterElement.setTitle(mContext.getString(R.string.about_twitter)); twitterElement.setIcon(R.drawable.about_icon_twitter); - twitterElement.setColor(ContextCompat.getColor(mContext, R.color.twitter_color)); + twitterElement.setColor(ContextCompat.getColor(mContext, R.color.about_twitter_color)); twitterElement.setValue(id); Intent intent = new Intent(); @@ -134,7 +134,7 @@ public AboutPage addPlayStore(String id){ Element playStoreElement = new Element(); playStoreElement.setTitle(mContext.getString(R.string.about_play_store)); playStoreElement.setIcon(R.drawable.about_icon_google_play); - playStoreElement.setColor(ContextCompat.getColor(mContext, R.color.play_store_color)); + playStoreElement.setColor(ContextCompat.getColor(mContext, R.color.about_play_store_color)); playStoreElement.setValue(id); Uri uri = Uri.parse("market://details?id=" + id); @@ -152,7 +152,7 @@ public AboutPage addYoutube(String id){ Element youtubeElement = new Element(); youtubeElement.setTitle(mContext.getString(R.string.about_youtube)); youtubeElement.setIcon(R.drawable.about_icon_youtube); - youtubeElement.setColor(ContextCompat.getColor(mContext, R.color.youtube_color)); + youtubeElement.setColor(ContextCompat.getColor(mContext, R.color.about_youtube_color)); youtubeElement.setValue(id); Intent intent = new Intent(); @@ -176,7 +176,7 @@ public AboutPage addInstagram(String id){ Element instagramElement = new Element(); instagramElement.setTitle(mContext.getString(R.string.about_instagram)); instagramElement.setIcon(R.drawable.about_icon_instagram); - instagramElement.setColor(ContextCompat.getColor(mContext, R.color.instagram_color)); + instagramElement.setColor(ContextCompat.getColor(mContext, R.color.about_instagram_color)); instagramElement.setValue(id); Intent intent = new Intent(); @@ -200,7 +200,7 @@ public AboutPage addGitHub(String id){ Element gitHubElement = new Element(); gitHubElement.setTitle(mContext.getString(R.string.about_github)); gitHubElement.setIcon(R.drawable.about_icon_github); - gitHubElement.setColor(ContextCompat.getColor(mContext, R.color.github_color)); + gitHubElement.setColor(ContextCompat.getColor(mContext, R.color.about_github_color)); gitHubElement.setValue(id); Intent intent = new Intent(); @@ -253,9 +253,9 @@ public AboutPage addGroup(String name){ TextView textView = new TextView(mContext); textView.setText(name); if (Build.VERSION.SDK_INT < 23) { - textView.setTextAppearance(mContext, R.style.About_GroupTextAppearance); + textView.setTextAppearance(mContext, R.style.about_groupTextAppearance); } else { - textView.setTextAppearance(R.style.About_GroupTextAppearance); + textView.setTextAppearance(R.style.about_groupTextAppearance); } LinearLayout.LayoutParams textParams = new LinearLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT); @@ -339,9 +339,9 @@ public void onClick(View view) { TextView textView = new TextView(mContext); if (Build.VERSION.SDK_INT < 23) { - textView.setTextAppearance(mContext, R.style.About_elementTextAppearance); + textView.setTextAppearance(mContext, R.style.about_elementTextAppearance); } else { - textView.setTextAppearance(R.style.About_elementTextAppearance); + textView.setTextAppearance(R.style.about_elementTextAppearance); } LinearLayout.LayoutParams textParams = new LinearLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT); diff --git a/library/src/main/res/layout/about_page.xml b/library/src/main/res/layout/about_page.xml index eaf10ce..402d5e1 100644 --- a/library/src/main/res/layout/about_page.xml +++ b/library/src/main/res/layout/about_page.xml @@ -1,18 +1,18 @@ + style="@style/about_About.wrapper"> - - - - + + + + - + diff --git a/library/src/main/res/layout/about_page_separator.xml b/library/src/main/res/layout/about_page_separator.xml index 49c8810..9992bd9 100644 --- a/library/src/main/res/layout/about_page_separator.xml +++ b/library/src/main/res/layout/about_page_separator.xml @@ -1,4 +1,4 @@ \ No newline at end of file diff --git a/library/src/main/res/values/colors.xml b/library/src/main/res/values/colors.xml index f5c04b6..f50b11c 100644 --- a/library/src/main/res/values/colors.xml +++ b/library/src/main/res/values/colors.xml @@ -1,12 +1,12 @@ - #3b5998 - #55acee - #3f729b - #45BBC2 - #cd201f - #333333 + #3b5998 + #55acee + #3f729b + #45BBC2 + #cd201f + #333333 #313131 #595959 #e1e1e1 diff --git a/library/src/main/res/values/styles.xml b/library/src/main/res/values/styles.xml index 963ddc1..3281157 100644 --- a/library/src/main/res/values/styles.xml +++ b/library/src/main/res/values/styles.xml @@ -1,28 +1,28 @@ - - - - - - -