From f84d48435f6a54448b8df6b5512de5230bc41b4b Mon Sep 17 00:00:00 2001 From: Peter Storch Date: Sun, 7 May 2017 10:32:52 +0200 Subject: [PATCH] Flattened SettingsActivity, Nickname highlighting, Launcher Icon --- app/src/main/ic_launcher-web.png | Bin 0 -> 17012 bytes .../androidirclogviewer/MainActivity.java | 15 ++++- .../androidirclogviewer/SettingsActivity.java | 61 ++++-------------- app/src/main/res/mipmap-hdpi/ic_launcher.png | Bin 3418 -> 1491 bytes app/src/main/res/mipmap-mdpi/ic_launcher.png | Bin 2206 -> 995 bytes app/src/main/res/mipmap-xhdpi/ic_launcher.png | Bin 4842 -> 2001 bytes .../main/res/mipmap-xxhdpi/ic_launcher.png | Bin 7718 -> 3221 bytes .../main/res/mipmap-xxxhdpi/ic_launcher.png | Bin 10486 -> 4545 bytes app/src/main/res/values/strings.xml | 4 +- app/src/main/res/xml/pref_headers.xml | 11 ---- .../xml/{pref_general.xml => preferences.xml} | 9 +++ 11 files changed, 38 insertions(+), 62 deletions(-) create mode 100644 app/src/main/ic_launcher-web.png delete mode 100644 app/src/main/res/xml/pref_headers.xml rename app/src/main/res/xml/{pref_general.xml => preferences.xml} (63%) diff --git a/app/src/main/ic_launcher-web.png b/app/src/main/ic_launcher-web.png new file mode 100644 index 0000000000000000000000000000000000000000..db367d635233191dbdab65621f40e92d63ec7fc2 GIT binary patch literal 17012 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 literal 0 HcmV?d00001 diff --git a/app/src/main/java/org/pstorch/androidirclogviewer/MainActivity.java b/app/src/main/java/org/pstorch/androidirclogviewer/MainActivity.java index c7318a7..2a78085 100644 --- a/app/src/main/java/org/pstorch/androidirclogviewer/MainActivity.java +++ b/app/src/main/java/org/pstorch/androidirclogviewer/MainActivity.java @@ -1,6 +1,7 @@ package org.pstorch.androidirclogviewer; import android.content.Intent; +import android.content.SharedPreferences; import android.os.AsyncTask; import android.os.Bundle; import android.preference.PreferenceManager; @@ -38,6 +39,7 @@ public class MainActivity extends AppCompatActivity { private final SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd", Locale.US); private String baseUrl = null; + private String nickname = null; private BottomNavigationView.OnNavigationItemSelectedListener mOnNavigationItemSelectedListener = new BottomNavigationView.OnNavigationItemSelectedListener() { @@ -115,7 +117,9 @@ protected void onCreate(final Bundle savedInstanceState) { BottomNavigationView navigation = (BottomNavigationView) findViewById(R.id.navigation); navigation.setOnNavigationItemSelectedListener(mOnNavigationItemSelectedListener); - baseUrl = PreferenceManager.getDefaultSharedPreferences(this).getString("base_url", null); + final SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(this); + baseUrl = preferences.getString("base_url", null); + nickname = preferences.getString("nickname", null); loadLog(); } @@ -150,9 +154,16 @@ private void appendFormatted(final StringBuilder formattedText, final String lin if (matcher.matches()) { final String user = matcher.group(2); final String color = "#" + Integer.toHexString(user.hashCode()).substring(0, 6); + final String message = matcher.group(3); + if (nickname != null && message.contains(nickname)) { + formattedText.append(""); + } formattedText.append(matcher.group(1)) .append(" ").append(user).append(": ") - .append(Html.escapeHtml(matcher.group(3))); + .append(Html.escapeHtml(message)); + if (nickname != null && message.contains(nickname)) { + formattedText.append(""); + } } else { formattedText.append("").append(Html.escapeHtml(line)).append(""); } diff --git a/app/src/main/java/org/pstorch/androidirclogviewer/SettingsActivity.java b/app/src/main/java/org/pstorch/androidirclogviewer/SettingsActivity.java index 2174524..0dc3339 100644 --- a/app/src/main/java/org/pstorch/androidirclogviewer/SettingsActivity.java +++ b/app/src/main/java/org/pstorch/androidirclogviewer/SettingsActivity.java @@ -2,9 +2,6 @@ import android.annotation.TargetApi; -import android.content.Context; -import android.content.Intent; -import android.content.res.Configuration; import android.os.Build; import android.os.Bundle; import android.preference.ListPreference; @@ -15,8 +12,6 @@ import android.support.v7.app.ActionBar; import android.view.MenuItem; -import java.util.List; - /** * A {@link PreferenceActivity} that presents a set of application settings. On * handset devices, settings are presented as a single list. On tablets, @@ -59,15 +54,6 @@ public boolean onPreferenceChange(Preference preference, Object value) { } }; - /** - * Helper method to determine if the device has an extra-large screen. For - * example, 10" tablets are extra-large. - */ - private static boolean isXLargeTablet(Context context) { - return (context.getResources().getConfiguration().screenLayout - & Configuration.SCREENLAYOUT_SIZE_MASK) >= Configuration.SCREENLAYOUT_SIZE_XLARGE; - } - /** * Binds a preference's summary to its value. More specifically, when the * preference's value is changed, its summary (line of text below the @@ -92,6 +78,8 @@ private static void bindPreferenceSummaryToValue(Preference preference) { @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); + getFragmentManager().beginTransaction().replace(android.R.id.content, + new GeneralPreferenceFragment()).commit(); setupActionBar(); } @@ -106,32 +94,6 @@ private void setupActionBar() { } } - /** - * {@inheritDoc} - */ - @Override - public boolean onIsMultiPane() { - return isXLargeTablet(this); - } - - /** - * {@inheritDoc} - */ - @Override - @TargetApi(Build.VERSION_CODES.HONEYCOMB) - public void onBuildHeaders(List
target) { - loadHeadersFromResource(R.xml.pref_headers, target); - } - - /** - * This method stops fragment injection in malicious applications. - * Make sure to deny any unknown fragments here. - */ - protected boolean isValidFragment(String fragmentName) { - return PreferenceFragment.class.getName().equals(fragmentName) - || GeneralPreferenceFragment.class.getName().equals(fragmentName); - } - /** * This fragment shows general preferences only. It is used when the * activity is showing a two-pane settings UI. @@ -141,7 +103,7 @@ public static class GeneralPreferenceFragment extends PreferenceFragment { @Override public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - addPreferencesFromResource(R.xml.pref_general); + addPreferencesFromResource(R.xml.preferences); setHasOptionsMenu(true); // Bind the summaries of EditText/List/Dialog/Ringtone preferences @@ -149,17 +111,20 @@ public void onCreate(Bundle savedInstanceState) { // updated to reflect the new value, per the Android Design // guidelines. bindPreferenceSummaryToValue(findPreference("base_url")); + bindPreferenceSummaryToValue(findPreference("nickname")); } - @Override - public boolean onOptionsItemSelected(MenuItem item) { - int id = item.getItemId(); - if (id == android.R.id.home) { - startActivity(new Intent(getActivity(), SettingsActivity.class)); + } + + @Override + public boolean onOptionsItemSelected(MenuItem item) { + switch (item.getItemId()) { + // Respond to the action bar's Up/Home button + case android.R.id.home: + super.onBackPressed(); return true; - } - return super.onOptionsItemSelected(item); } + return super.onOptionsItemSelected(item); } } diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png index cde69bcccec65160d92116f20ffce4fce0b5245c..d9f0c62b70d231e5183add1a974bac7cc2055339 100644 GIT binary patch delta 1474 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 delta 2195 zcmV;E2yFM`2c8j-BYyw{XF*Lt006O%3;baP0000WV@Og>004R>004l5008;`004mK z004C`008P>0026e000+ooVrmw00006VoOIv00000008+zyMF)x010qNS#tmY3ljhU z3ljkVnw%H_00*E+L_t(&-tAdkY!ufO{?475^{#iq-c;^Dmy#{tlF zn2UDq+?oI&B7XskqVt14KD48|Z|2gspW4!NjY-f0yVrcCZHvtAf9?KnMZp(|!29oH z21uZ${mz;f0I1iHfV!f0?jb3Sns?v0Fc8I9Q3%Mx2i|z^lXDZt;&r^?splVDAE6(G ze9B_k_1t~y<7uqB@b`&Ve|zw~(*U>@6A1>4^+}vU}5!#{kHC?rGQ7Y+rpxY>wQfCgoNV z##{y$v463{hy((3%FgE0mkO8pmxuQL_0*X&X9@tszTe&dY^o8DoH+W)6TkU!{|f-d zucik8K#j-at$U7ac&)yrw(G(v+1D^%X-_oKexc~|z&2o8`~(1inTzdgD5K*U-Ze2| z47GOCTVo$ho!tAtu}uIn018np8&wEEqPutLU4PpTbRPo<4CzExH39p7vh;rX*vY=L z?+*0?n2HKYsfNJv8hbJGL1hvZ>p(|GM{LcbZNFD*c)4xWqGdTKXsRIOeX_>WQs{Z` z@x`woLeZ>5K-qqvXHR@C^}2wEf_H+uvOKW+ChB;@_g>z#6BVMQTqEszc57GTXT=d8 zL1ChYk%#g27yiTmWxn;r8 zQ^yC#!p1Gx+V$jfPz7dN?& zCr=};q>z_WI5qkzE{vZH?WxAmmVejkpF4l@<4IpzfWBz!O0KH};#~Fw&Sg&&trVyo zP$TR&IeiSrhks!!mK_HGZtqI>y$u}pS|TWfltiO?UnyXmA1@e=2;RHZa4Cj@cGjC@ zv)B@3@E`(OGDTks8_@YLbm9Q;-jPDVhRB?`T5lu*D^_&WYH_M%aAd$v;D2G@1Iu2S z(D7D#rADNeE^SFvB0#O3^{I+TL%@ewx!TYPR0mMEqM;U^<<#ercuI}svV~zok`QFL zlqDjDm@E@z_FOmem(+`3@1;Dc^JK9vWG9aTVR))dSR>%&?)-GA1XUaMCFz8VkYb)BPL zi72XxP8O`x_T&K-mrdI%c0L3FF9Y5ptLw9s3t2#QFHb@-Yl4)e&>=fXsTBJprL&@y zjrSn%Y!B`cUkK>|`;AH>RBN+kZ86NHwX}lR;OSF=2lT?M^v&&k@wYz>U7FQ(-{Cn( zoQEA!7>Z(V7=PIHZG-n8OxZV982FhPIq{cc=P!FP_--Y}$7e|z+CLU{roXIe!oPnl zBV=vZ?1hKPT=&@#I#I3e)XGijldu15;2R&jf9Wg$-94vY6ae*_hMN~IYi?2$<%(A- z!zf(w1*u^eY=4iO{clFs@ezP509P1=rK|u@gKPUI)qkkMF#p_?_ku4+AZq*dBymIj zFXewDA7BDFxU!7^001R)MObuXVRU6WV{&C-bY%cCFflYOFgYzSHB>P$IyE;sH8?FW zH##sdyvITA0000bbVXQnWMOn=I&E)cX=ZrgFgH3d VFwL6zQVak9002ovPDHLkV1ga{3Jm}N diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/app/src/main/res/mipmap-xhdpi/ic_launcher.png index bfa42f0e7b91d006d22352c9ff2f134e504e3c1d..5f94fdca9bd896116ba601e9e81aef79f3e441ad 100644 GIT binary patch delta 1988 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 diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png index 324e72cdd7480cb983fa1bcc7ce686e51ef87fe7..185e224c234c3f9a9ef1eca0b37863a4d3de77be 100644 GIT binary patch delta 3218 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 diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png index aee44e138434630332d88b1680f33c4b24c70ab3..5eb101483717b36bdbca654208f23b1196b21984 100644 GIT binary patch literal 4545 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 Z8y5rLLYtd&|5-BttfqlRm6~1T{{a(=kl+9S literal 10486 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 - Android IRC LogViewer + IRC LogViewer Forward Refresh Back @@ -12,5 +12,7 @@ Base URL http://krul.finf.uni-hannover.de/~sammyshp/cgeo-logs + Nickname + Nickname diff --git a/app/src/main/res/xml/pref_headers.xml b/app/src/main/res/xml/pref_headers.xml deleted file mode 100644 index 794f33c..0000000 --- a/app/src/main/res/xml/pref_headers.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - -
- - - diff --git a/app/src/main/res/xml/pref_general.xml b/app/src/main/res/xml/preferences.xml similarity index 63% rename from app/src/main/res/xml/pref_general.xml rename to app/src/main/res/xml/preferences.xml index 9aed912..f99782c 100644 --- a/app/src/main/res/xml/pref_general.xml +++ b/app/src/main/res/xml/preferences.xml @@ -12,5 +12,14 @@ android:singleLine="true" android:title="@string/pref_title_base_url"/> +