From 6f256516f8a655230bea9fa6cfd63b6ac690d6be Mon Sep 17 00:00:00 2001 From: Cyb3rKo Date: Mon, 20 Jul 2020 21:51:52 +0200 Subject: [PATCH] improved icon credits by using own "About Icons" library --- app/build.gradle | 5 +- .../cyb3rko/logviewerforopenhab/About.java | 4 +- .../logviewerforopenhab/IconCredits.java | 47 +---------- .../logviewerforopenhab/MainFragment.java | 6 +- .../logviewerforopenhab/WebViewFragment.java | 4 +- ..._arrow_left.webp => _icon_arrow_left.webp} | Bin ...ation.webp => _icon_auto_orientation.webp} | Bin app/src/main/res/drawable-v24/_icon_eye.webp | Bin 0 -> 6832 bytes .../{icon_font.webp => _icon_font.webp} | Bin ....webp => _icon_landscape_orientation.webp} | Bin ...on_libraries.webp => _icon_libraries.webp} | Bin .../{icon_lock.webp => _icon_lock.webp} | Bin .../{icon_lock_2.webp => _icon_lock_2.webp} | Bin app/src/main/res/drawable-v24/_icon_log.webp | Bin 0 -> 3330 bytes ...n.webp => _icon_portrait_orientation.webp} | Bin ...icon_question.webp => _icon_question.webp} | Bin app/src/main/res/layout/fragment_web_view.xml | 6 +- app/src/main/res/values/about_icons.xml | 79 ++++++++++++++++++ 18 files changed, 95 insertions(+), 56 deletions(-) rename app/src/main/res/drawable-v24/{icon_arrow_left.webp => _icon_arrow_left.webp} (100%) rename app/src/main/res/drawable-v24/{icon_auto_orientation.webp => _icon_auto_orientation.webp} (100%) create mode 100644 app/src/main/res/drawable-v24/_icon_eye.webp rename app/src/main/res/drawable-v24/{icon_font.webp => _icon_font.webp} (100%) rename app/src/main/res/drawable-v24/{icon_landscape_orientation.webp => _icon_landscape_orientation.webp} (100%) rename app/src/main/res/drawable-v24/{icon_libraries.webp => _icon_libraries.webp} (100%) rename app/src/main/res/drawable-v24/{icon_lock.webp => _icon_lock.webp} (100%) rename app/src/main/res/drawable-v24/{icon_lock_2.webp => _icon_lock_2.webp} (100%) create mode 100644 app/src/main/res/drawable-v24/_icon_log.webp rename app/src/main/res/drawable-v24/{icon_portrait_orientation.webp => _icon_portrait_orientation.webp} (100%) rename app/src/main/res/drawable-v24/{icon_question.webp => _icon_question.webp} (100%) create mode 100644 app/src/main/res/values/about_icons.xml diff --git a/app/build.gradle b/app/build.gradle index 930aeb5..28d8b73 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -4,7 +4,7 @@ apply plugin: 'com.mikepenz.aboutlibraries.plugin' android { compileSdkVersion 29 - buildToolsVersion "29.0.2" + buildToolsVersion "29.0.3" defaultConfig { applicationId "com.cyb3rko.logviewerforopenhab" minSdkVersion 23 @@ -30,7 +30,7 @@ dependencies { implementation 'androidx.recyclerview:recyclerview:1.1.0' implementation 'com.amitshekhar.android:android-networking:1.0.2' implementation 'com.getkeepsafe.taptargetview:taptargetview:1.13.0' - implementation 'com.github.GrenderG:Toasty:1.4.2' + implementation 'com.github.GrenderG:Toasty:7be5e09' implementation 'com.github.medyo:android-about-page:1.3' implementation 'com.google.android.material:material:1.1.0' implementation 'com.google.firebase:firebase-analytics:17.4.3' @@ -39,4 +39,5 @@ dependencies { implementation 'com.mikepenz:aboutlibraries-core:8.3.0' implementation 'com.mikepenz:aboutlibraries:8.3.0' implementation 'org.adw.library:discrete-seekbar:1.0.1' + implementation 'com.github.cyb3rko:about-icons:a9e4ccc' } diff --git a/app/src/main/java/com/cyb3rko/logviewerforopenhab/About.java b/app/src/main/java/com/cyb3rko/logviewerforopenhab/About.java index b35d618..5e2b1cd 100644 --- a/app/src/main/java/com/cyb3rko/logviewerforopenhab/About.java +++ b/app/src/main/java/com/cyb3rko/logviewerforopenhab/About.java @@ -34,9 +34,9 @@ protected void onCreate(Bundle savedInstanceState) { // first group .addGroup(getString(R.string.about_group_1)) // second item - .addItem(new Element().setTitle(getString(R.string.about_element_2)).setIconDrawable(R.drawable.icon_libraries).setOnClickListener(showLibraries())) + .addItem(new Element().setTitle(getString(R.string.about_element_2)).setIconDrawable(R.drawable._icon_libraries).setOnClickListener(showLibraries())) // third item - .addItem(new Element().setTitle(getString(R.string.about_element_3)).setIconDrawable(R.drawable.icon_question).setOnClickListener(showIcons())) + .addItem(new Element().setTitle(getString(R.string.about_element_3)).setIconDrawable(R.drawable._icon_question).setOnClickListener(showIcons())) // second group .addGroup(getString(R.string.about_group_2)) // feddback item diff --git a/app/src/main/java/com/cyb3rko/logviewerforopenhab/IconCredits.java b/app/src/main/java/com/cyb3rko/logviewerforopenhab/IconCredits.java index bf1afe5..ed1ab5b 100644 --- a/app/src/main/java/com/cyb3rko/logviewerforopenhab/IconCredits.java +++ b/app/src/main/java/com/cyb3rko/logviewerforopenhab/IconCredits.java @@ -1,20 +1,13 @@ package com.cyb3rko.logviewerforopenhab; -import android.content.Intent; import android.content.SharedPreferences; import android.content.pm.ActivityInfo; -import android.net.Uri; import android.os.Bundle; -import android.text.SpannableString; -import android.text.Spanned; -import android.text.method.LinkMovementMethod; -import android.text.style.ClickableSpan; -import android.view.View; -import android.widget.TextView; -import androidx.annotation.NonNull; import androidx.appcompat.app.AppCompatActivity; +import com.cyb3rko.abouticons.AboutIcons; + public class IconCredits extends AppCompatActivity { @Override protected void onCreate(Bundle savedInstanceState) { @@ -27,40 +20,6 @@ protected void onCreate(Bundle savedInstanceState) { setRequestedOrientation(mySPR.getInt("orientation", ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED)); // set view - setContentView(R.layout.activity_icon_credits); - - // set text of textviews and add links to authors - TextView[] textViews = new TextView[9]; - String[] credits = getResources().getStringArray(R.array.credits_icons); - String[] creditsLinks = getResources().getStringArray(R.array.credits_icons_links); - - for (int i = 1; i <= 9; i++) { - // find textviews and set text - textViews[i-1] = findViewById(getResources().getIdentifier("credits_icons_" + i, "id", getPackageName())); - textViews[i-1].setText(getResources().getStringArray(R.array.credits_icons)[i-1]); - - // split string array items into link, authorAlias and authorName - String link = creditsLinks[i-1].split(",")[0]; - String authorAlias = creditsLinks[i-1].split(",")[1].split(";")[0]; - String authorName = creditsLinks[i-1].split(",")[1].split(";")[1]; - - // add clickable links - setSpans(textViews[i-1], credits[i-1], link, credits[i-1].indexOf(authorAlias), credits[i-1].indexOf(authorAlias) + authorName.length()); - } - } - - // method to add clickable links - private void setSpans(TextView textView, String string, final String link, int startChar, int endChar) { - ClickableSpan clickableSpan = new ClickableSpan() { - @Override - public void onClick(@NonNull View view) { - startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(link))); - } - }; - - SpannableString spannableString = new SpannableString(string); - spannableString.setSpan(clickableSpan, startChar, endChar != 0 ? endChar : string.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE); - textView.setText(spannableString); - textView.setMovementMethod(LinkMovementMethod.getInstance()); + setContentView(new AboutIcons(this, R.drawable.class).get()); } } diff --git a/app/src/main/java/com/cyb3rko/logviewerforopenhab/MainFragment.java b/app/src/main/java/com/cyb3rko/logviewerforopenhab/MainFragment.java index 1c36324..392bb00 100644 --- a/app/src/main/java/com/cyb3rko/logviewerforopenhab/MainFragment.java +++ b/app/src/main/java/com/cyb3rko/logviewerforopenhab/MainFragment.java @@ -174,13 +174,13 @@ public void run() { private void setOrientationIcon() { switch (mySPR.getInt("orientation", ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED)) { case ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE: - orientation.setImageResource(R.drawable.icon_landscape_orientation); + orientation.setImageResource(R.drawable._icon_landscape_orientation); break; case ActivityInfo.SCREEN_ORIENTATION_PORTRAIT: - orientation.setImageResource(R.drawable.icon_portrait_orientation); + orientation.setImageResource(R.drawable._icon_portrait_orientation); break; case ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED: - orientation.setImageResource(R.drawable.icon_auto_orientation); + orientation.setImageResource(R.drawable._icon_auto_orientation); break; default: break; diff --git a/app/src/main/java/com/cyb3rko/logviewerforopenhab/WebViewFragment.java b/app/src/main/java/com/cyb3rko/logviewerforopenhab/WebViewFragment.java index 63073da..5f37a1d 100644 --- a/app/src/main/java/com/cyb3rko/logviewerforopenhab/WebViewFragment.java +++ b/app/src/main/java/com/cyb3rko/logviewerforopenhab/WebViewFragment.java @@ -104,14 +104,14 @@ private void setViewButtonClickListener() { public void onClick(View view) { // if scrolling locked if (viewLocked) { - viewButton.setImageResource(R.drawable.icon_lock_2); + viewButton.setImageResource(R.drawable._icon_lock_2); viewLocked = false; setTouchable(true); // show toast Toasty.info(view.getContext(), getString(R.string.lock_button_1), Toasty.LENGTH_SHORT).show(); } else { - viewButton.setImageResource(R.drawable.icon_lock); + viewButton.setImageResource(R.drawable._icon_lock); viewLocked = true; setTouchable(false); diff --git a/app/src/main/res/drawable-v24/icon_arrow_left.webp b/app/src/main/res/drawable-v24/_icon_arrow_left.webp similarity index 100% rename from app/src/main/res/drawable-v24/icon_arrow_left.webp rename to app/src/main/res/drawable-v24/_icon_arrow_left.webp diff --git a/app/src/main/res/drawable-v24/icon_auto_orientation.webp b/app/src/main/res/drawable-v24/_icon_auto_orientation.webp similarity index 100% rename from app/src/main/res/drawable-v24/icon_auto_orientation.webp rename to app/src/main/res/drawable-v24/_icon_auto_orientation.webp diff --git a/app/src/main/res/drawable-v24/_icon_eye.webp b/app/src/main/res/drawable-v24/_icon_eye.webp new file mode 100644 index 0000000000000000000000000000000000000000..774839c64a553555616dfb65eebdfc67fac85433 GIT binary patch literal 6832 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 literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-v24/icon_font.webp b/app/src/main/res/drawable-v24/_icon_font.webp similarity index 100% rename from app/src/main/res/drawable-v24/icon_font.webp rename to app/src/main/res/drawable-v24/_icon_font.webp diff --git a/app/src/main/res/drawable-v24/icon_landscape_orientation.webp b/app/src/main/res/drawable-v24/_icon_landscape_orientation.webp similarity index 100% rename from app/src/main/res/drawable-v24/icon_landscape_orientation.webp rename to app/src/main/res/drawable-v24/_icon_landscape_orientation.webp diff --git a/app/src/main/res/drawable-v24/icon_libraries.webp b/app/src/main/res/drawable-v24/_icon_libraries.webp similarity index 100% rename from app/src/main/res/drawable-v24/icon_libraries.webp rename to app/src/main/res/drawable-v24/_icon_libraries.webp diff --git a/app/src/main/res/drawable-v24/icon_lock.webp b/app/src/main/res/drawable-v24/_icon_lock.webp similarity index 100% rename from app/src/main/res/drawable-v24/icon_lock.webp rename to app/src/main/res/drawable-v24/_icon_lock.webp diff --git a/app/src/main/res/drawable-v24/icon_lock_2.webp b/app/src/main/res/drawable-v24/_icon_lock_2.webp similarity index 100% rename from app/src/main/res/drawable-v24/icon_lock_2.webp rename to app/src/main/res/drawable-v24/_icon_lock_2.webp diff --git a/app/src/main/res/drawable-v24/_icon_log.webp b/app/src/main/res/drawable-v24/_icon_log.webp new file mode 100644 index 0000000000000000000000000000000000000000..61322b59945c5bb10435346e3fd79fc90404fa2c GIT binary patch literal 3330 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 VA8MP^PSww%1+_4nTfN2?{sl2=qM`r* literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-v24/icon_portrait_orientation.webp b/app/src/main/res/drawable-v24/_icon_portrait_orientation.webp similarity index 100% rename from app/src/main/res/drawable-v24/icon_portrait_orientation.webp rename to app/src/main/res/drawable-v24/_icon_portrait_orientation.webp diff --git a/app/src/main/res/drawable-v24/icon_question.webp b/app/src/main/res/drawable-v24/_icon_question.webp similarity index 100% rename from app/src/main/res/drawable-v24/icon_question.webp rename to app/src/main/res/drawable-v24/_icon_question.webp diff --git a/app/src/main/res/layout/fragment_web_view.xml b/app/src/main/res/layout/fragment_web_view.xml index e8f1e5e..8c068d6 100644 --- a/app/src/main/res/layout/fragment_web_view.xml +++ b/app/src/main/res/layout/fragment_web_view.xml @@ -11,7 +11,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginEnd="8dp" - android:src="@drawable/icon_lock" + android:src="@drawable/_icon_lock" app:backgroundTint="#A6FF7E29" app:elevation="0.01dp" app:layout_constraintBottom_toBottomOf="@id/webview" @@ -24,7 +24,7 @@ android:layout_height="wrap_content" android:layout_marginTop="8dp" android:layout_marginEnd="8dp" - android:src="@drawable/icon_font" + android:src="@drawable/_icon_font" app:backgroundTint="#A6FF7E29" app:elevation="0.01dp" app:layout_constraintEnd_toEndOf="@+id/webview" @@ -35,7 +35,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="8dp" - android:src="@drawable/icon_arrow_left" + android:src="@drawable/_icon_arrow_left" app:backgroundTint="#80FF7E29" app:elevation="0.01dp" app:fabSize="mini" diff --git a/app/src/main/res/values/about_icons.xml b/app/src/main/res/values/about_icons.xml new file mode 100644 index 0000000..021e2cf --- /dev/null +++ b/app/src/main/res/values/about_icons.xml @@ -0,0 +1,79 @@ + + + + Lyolya + flaticon.com + https://www.flaticon.com/free-icon/left-arrow_109618 + false + + + + Freepik + flaticon.com + https://www.flaticon.com/free-icon/orientation_1302037 + false + + + + Dave Gandy + flaticon.com + https://www.flaticon.com/free-icon/eye-open_25186 + false + + + + Those Icons + flaticon.com + https://www.flaticon.com/free-icon/font_2087728 + false + + + + Freepik + flaticon.com + https://www.flaticon.com/free-icon/orientation_1302037 + true + + + + Freepik + flaticon.com + https://www.flaticon.com/free-icon/books-stack-of-three_29302 + false + + + + Those Icons + flaticon.com + https://www.flaticon.com/free-icon/lock_483408 + false + + + + Those Icons + flaticon.com + https://www.flaticon.com/free-icon/lock_483412 + false + + + + Smartline + flaticon.com + https://www.flaticon.com/free-icon/files_569837 + true + + + + Freepik + flaticon.com + https://www.flaticon.com/free-icon/orientation_1302037 + true + + + + Freepik + flaticon.com + https://www.flaticon.com/free-icon/information_906794 + false + + \ No newline at end of file