config for preview-line-count

android/app/src/main/java/com/blackforestbytes/simplecloudnotifier/model/QueryLog.java

@@ -12,7 +12,7 @@ import java.util.List;
 
 public class QueryLog
 {
-    private final static int MAX_HISTORY_SIZE = 64;
+    private final static int MAX_HISTORY_SIZE = 192;
 
     private static QueryLog _instance;
     public static QueryLog instance() { if (_instance == null) synchronized (QueryLog.class) { if (_instance == null) _instance = new QueryLog(); } return _instance; }

android/app/src/main/java/com/blackforestbytes/simplecloudnotifier/model/SCNSettings.java

@@ -53,6 +53,7 @@ public class SCNSettings
     public boolean Enabled = true;
     public int LocalCacheSize = 500;
     public boolean EnableDeleteSwipe = false;
+    public int PreviewLineCount = 6;
 
     public final NotificationSettings PriorityLow  = new NotificationSettings(PriorityEnum.LOW);
     public final NotificationSettings PriorityNorm = new NotificationSettings(PriorityEnum.NORMAL);
@@ -77,6 +78,7 @@ public class SCNSettings
         Enabled                     = sharedPref.getBoolean("app_enabled",  Enabled);
         LocalCacheSize              = sharedPref.getInt("local_cache_size", LocalCacheSize);
         EnableDeleteSwipe           = sharedPref.getBoolean("do_del_swipe",  EnableDeleteSwipe);
+        PreviewLineCount            = sharedPref.getInt("preview_line_count", PreviewLineCount);
 
         PriorityLow.EnableLED         = sharedPref.getBoolean("priority_low:enabled_led",         PriorityLow.EnableLED);
         PriorityLow.EnableSound       = sharedPref.getBoolean("priority_low:enabled_sound",       PriorityLow.EnableSound);
@@ -124,6 +126,7 @@ public class SCNSettings
         e.putBoolean("app_enabled",                      Enabled);
         e.putInt(    "local_cache_size",                 LocalCacheSize);
         e.putBoolean("do_del_swipe",                     EnableDeleteSwipe);
+        e.putInt(    "preview_line_count",               PreviewLineCount);
 
         e.putBoolean("priority_low:enabled_led",         PriorityLow.EnableLED);
         e.putBoolean("priority_low:enabled_sound",       PriorityLow.EnableSound);

android/app/src/main/java/com/blackforestbytes/simplecloudnotifier/util/TextChangedListener.java

@@ -0,0 +1,25 @@
+package com.blackforestbytes.simplecloudnotifier.util;
+
+import android.text.Editable;
+import android.text.TextWatcher;
+
+public abstract class TextChangedListener<T> implements TextWatcher {
+    private T target;
+
+    public TextChangedListener(T target) {
+        this.target = target;
+    }
+
+    @Override
+    public void beforeTextChanged(CharSequence s, int start, int count, int after) {}
+
+    @Override
+    public void onTextChanged(CharSequence s, int start, int before, int count) {}
+
+    @Override
+    public void afterTextChanged(Editable s) {
+        this.onTextChanged(target, s);
+    }
+
+    public abstract void onTextChanged(T target, Editable s);
+}

android/app/src/main/java/com/blackforestbytes/simplecloudnotifier/view/MessageAdapter.java

@@ -13,6 +13,7 @@ import com.blackforestbytes.simplecloudnotifier.R;
 import com.blackforestbytes.simplecloudnotifier.SCNApp;
 import com.blackforestbytes.simplecloudnotifier.model.CMessage;
 import com.blackforestbytes.simplecloudnotifier.model.CMessageList;
+import com.blackforestbytes.simplecloudnotifier.model.SCNSettings;
 import com.google.android.material.button.MaterialButton;
 
 import java.lang.ref.WeakReference;
@@ -186,17 +187,19 @@ public class MessageAdapter extends RecyclerView.Adapter
         {
             if (data != null && data.IsExpandedInAdapter && !force) return;
             if (data != null) data.IsExpandedInAdapter = true;
-            if (tvMessage != null) tvMessage.setMaxLines(999);
+            if (tvMessage != null) tvMessage.setMaxLines(9999);
             if (btnDelete != null) btnDelete.setVisibility(View.VISIBLE);
             if (btnShare != null) btnShare.setVisibility(View.VISIBLE);
 
         }
 
+        private int norm(int i) { return (i<=0)?0:((i>9999)?9999:i); }
+
         private void collapse(boolean force)
         {
             if (data != null && !data.IsExpandedInAdapter && !force) return;
             if (data != null) data.IsExpandedInAdapter = false;
-            if (tvMessage != null) tvMessage.setMaxLines(6);
+            if (tvMessage != null) tvMessage.setMaxLines(norm(SCNSettings.inst().PreviewLineCount));
             if (btnDelete != null) btnDelete.setVisibility(View.GONE);
             if (btnShare != null) btnShare.setVisibility(View.GONE);
         }

android/app/src/main/java/com/blackforestbytes/simplecloudnotifier/view/SettingsFragment.java

@@ -1,5 +1,6 @@
 package com.blackforestbytes.simplecloudnotifier.view;
 
+import android.annotation.SuppressLint;
 import android.content.Context;
 import android.graphics.Color;
 import android.media.AudioAttributes;
@@ -10,6 +11,7 @@ import android.media.RingtoneManager;
 import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
+import android.text.Editable;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -17,6 +19,7 @@ import android.view.ViewGroup;
 import android.widget.AdapterView;
 import android.widget.ArrayAdapter;
 import android.widget.Button;
+import android.widget.EditText;
 import android.widget.ImageView;
 import android.widget.SeekBar;
 import android.widget.Spinner;
@@ -32,6 +35,7 @@ import com.blackforestbytes.simplecloudnotifier.lib.lambda.FI;
 import com.blackforestbytes.simplecloudnotifier.lib.string.Str;
 import com.blackforestbytes.simplecloudnotifier.model.SCNSettings;
 import com.blackforestbytes.simplecloudnotifier.service.IABService;
+import com.blackforestbytes.simplecloudnotifier.util.TextChangedListener;
 
 import org.jetbrains.annotations.NotNull;
 
@@ -51,6 +55,7 @@ public class SettingsFragment extends Fragment implements MusicPickerListener
     private TextView  prefUpgradeAccount_msg;
     private TextView  prefUpgradeAccount_info;
     private Switch    prefEnableDeleteSwipe;
+    private EditText  prefPreviewLineCount;
 
     private Switch    prefMsgLowEnableSound;
     private TextView  prefMsgLowRingtone_value;
@@ -117,6 +122,7 @@ public class SettingsFragment extends Fragment implements MusicPickerListener
         prefUpgradeAccount_msg        = v.findViewById(R.id.prefUpgradeAccount2);
         prefUpgradeAccount_info       = v.findViewById(R.id.prefUpgradeAccount_info);
         prefEnableDeleteSwipe         = v.findViewById(R.id.prefEnableDeleteSwipe);
+        prefPreviewLineCount          = v.findViewById(R.id.prefPreviewLineCount);
 
         prefMsgLowEnableSound         = v.findViewById(R.id.prefMsgLowEnableSound);
         prefMsgLowRingtone_value      = v.findViewById(R.id.prefMsgLowRingtone_value);
@@ -159,6 +165,7 @@ public class SettingsFragment extends Fragment implements MusicPickerListener
         prefLocalCacheSize.setAdapter(plcsa);
     }
 
+    @SuppressLint("SetTextI18n")
     private void updateUI()
     {
         SCNSettings s = SCNSettings.inst();
@@ -167,6 +174,7 @@ public class SettingsFragment extends Fragment implements MusicPickerListener
 
         if (prefAppEnabled.isChecked() != s.Enabled) prefAppEnabled.setChecked(s.Enabled);
         if (prefEnableDeleteSwipe.isChecked() != s.EnableDeleteSwipe) prefEnableDeleteSwipe.setChecked(s.EnableDeleteSwipe);
+        if (!prefPreviewLineCount.getText().toString().equals(Integer.toString(s.PreviewLineCount))) prefPreviewLineCount.setText(Integer.toString(s.PreviewLineCount));
 
         prefUpgradeAccount.setVisibility(     SCNSettings.inst().promode_local ? View.GONE    : View.VISIBLE);
         prefUpgradeAccount_info.setVisibility(SCNSettings.inst().promode_local ? View.GONE    : View.VISIBLE);
@@ -220,6 +228,12 @@ public class SettingsFragment extends Fragment implements MusicPickerListener
 
         prefAppEnabled.setOnCheckedChangeListener((a,b) -> { boolean prev=s.Enabled; s.Enabled=b; saveAndUpdate(); updateEnabled(prev, b); });
         prefEnableDeleteSwipe.setOnCheckedChangeListener((a,b) -> { s.EnableDeleteSwipe=b; saveAndUpdate(); });
+        prefPreviewLineCount.addTextChangedListener(new TextChangedListener<EditText>(prefPreviewLineCount) {
+            @Override
+            public void onTextChanged(EditText target, Editable ed) {
+                if (!ed.toString().isEmpty()) try { s.PreviewLineCount=Integer.parseInt(ed.toString()); saveAndUpdate(); } catch (Exception e) { /* */ }
+            }
+        });
 
         prefLocalCacheSize.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener()
         {

android/app/src/main/res/layout/activity_main.xml

@@ -1,15 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout
+<RelativeLayout android:id="@+id/layoutRoot"
-    android:id="@+id/layoutRoot"
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <androidx.appcompat.widget.Toolbar
         android:id="@+id/toolbar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_alignParentTop="true"
+        app:titleTextColor="@color/colorOnPrimary"
         android:background="?attr/colorPrimary"
         android:elevation="6dp"
         android:minHeight="?attr/actionBarSize" />
@@ -19,6 +20,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_below="@+id/toolbar"
+        app:titleTextColor="@color/colorOnPrimary"
+        app:tabTextColor="@color/colorOnPrimary"
+        app:tabSelectedTextColor="@color/colorSecondary"
         android:background="?attr/colorPrimary"
         android:elevation="6dp"
         android:minHeight="?attr/actionBarSize" />

android/app/src/main/res/layout/fragment_settings.xml

@@ -95,6 +95,46 @@
                     android:layout_height="wrap_content"
                     android:minHeight="48dp" />
 
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="1dp"
+                    android:layout_marginBottom="2dp"
+                    android:layout_marginTop="2dp"
+                    android:background="#c0c0c0"/>
+
+                <androidx.constraintlayout.widget.ConstraintLayout
+                    android:layout_marginStart="4dp"
+                    android:layout_marginEnd="4dp"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:minHeight="48dp">
+
+                    <TextView
+                        android:id="@+id/tvPreviewLineCount"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:text="@string/str_previewlinecount"
+                        android:textColor="#000"
+                        app:layout_constraintBottom_toBottomOf="parent"
+                        app:layout_constraintEnd_toStartOf="@+id/prefPreviewLineCount"
+                        app:layout_constraintHorizontal_bias="0"
+                        app:layout_constraintStart_toStartOf="parent"
+                        app:layout_constraintTop_toTopOf="parent" />
+
+                    <EditText
+                        android:minWidth="64dp"
+                        android:id="@+id/prefPreviewLineCount"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:inputType="number"
+                        app:layout_constraintBottom_toBottomOf="parent"
+                        app:layout_constraintEnd_toEndOf="parent"
+                        app:layout_constraintTop_toTopOf="parent"
+                        android:importantForAutofill="no"
+                        tools:ignore="LabelFor,UnusedAttribute" />
+
+                </androidx.constraintlayout.widget.ConstraintLayout>
+
                 <View
                     android:layout_width="match_parent"
                     android:layout_height="1dp"

android/app/src/main/res/values/colors.xml

@@ -6,6 +6,9 @@
     <color name="colorHeader">#3F51B5</color>
     <color name="colorHeaderForeground">#FFFFFF</color>
 
+    <color name="colorOnPrimary">#ecf0f1</color>
+    <color name="colorSecondary">#FF5722</color>
+
     <color name="colorBlack">#000</color>
 
     <color name="bg_row_background">#fa315b</color>

android/app/src/main/res/values/strings.xml

@@ -30,6 +30,7 @@
     <string name="str_enable_vibration">Enable notification vibration</string>
     <string name="str_upgrade_account">Upgrade account</string>
     <string name="str_deleteswipe">Delete messages by swiping left</string>
+    <string name="str_previewlinecount">Number of visibile lines in collapsed messages</string>
     <string name="str_promode">Thank you for supporting the app and using the pro mode</string>
     <string name="str_promode_info">Increase your daily quota, remove the ad banner and support the developer (that\'s me)</string>
     <string name="volume_icon">Volume icon</string>

android/app/src/main/res/values/styles.xml

@@ -4,14 +4,17 @@
     <style name="AppTheme" parent="Theme.MaterialComponents.Light.NoActionBar">
         <!--   your app branding color for the app bar -->
         <item name="colorPrimary">#3F51B5</item>
+
         <!--   darker variant for the status bar and contextual app bars -->
         <item name="colorPrimaryDark">#303F9F</item>
+
         <!--   theme UI controls like checkboxes and text fields -->
         <item name="colorAccent">#FF5722</item>
+        <item name="colorSecondary">#FF5722</item>
     </style>
 
-    <style name="AppTheme.AppBarOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar" />
+    <style name="AppTheme.AppBarOverlay" parent="ThemeOverlay.MaterialComponents.Dark.ActionBar" />
 
-    <style name="AppTheme.PopupOverlay" parent="ThemeOverlay.AppCompat.Light" />
+    <style name="AppTheme.PopupOverlay" parent="ThemeOverlay.MaterialComponents.Light" />
 
 </resources>