msb-public
/
FairEmail
mirror of https://github.com/M66B/FairEmail.git
1
0
Code Issues Projects Releases Wiki Activity

Revert "Inline hide pro banner"

Browse Source 
This reverts commit 8d4f396757.
pull/213/head
M66B 1 year ago
parent 2fb2e054db
commit 554a382184
3 changed files with 17 additions and 41 deletions
Show Stats Download Patch File Download Diff File

29
app/src/main/java/eu/faircode/email/FragmentMessages.java
Unescape View File

@ -251,8 +251,7 @@ public class FragmentMessages extends FragmentBase
private TextView tvAirplane; private TextView tvAirplane;
private TextView tvNotifications; private TextView tvNotifications;
private TextView tvBatteryOptimizations; private TextView tvBatteryOptimizations;
private TextView tvHintPro; private TextView tvSupport;
private ImageButton ibHintPro;
private ImageButton ibHintSupport; private ImageButton ibHintSupport;
private ImageButton ibHintSwipe; private ImageButton ibHintSwipe;
private ImageButton ibHintSelect; private ImageButton ibHintSelect;
@ -276,7 +275,7 @@ public class FragmentMessages extends FragmentBase
private Group grpAirplane; private Group grpAirplane;
private Group grpNotifications; private Group grpNotifications;
private Group grpBatteryOptimizations; private Group grpBatteryOptimizations;
private Group grpPro; private Group grpSupport;
private Group grpHintSupport; private Group grpHintSupport;
private Group grpHintSwipe; private Group grpHintSwipe;
private Group grpHintSelect; private Group grpHintSelect;
@ -558,8 +557,7 @@ public class FragmentMessages extends FragmentBase
tvAirplane = view.findViewById(R.id.tvAirplane); tvAirplane = view.findViewById(R.id.tvAirplane);
tvNotifications = view.findViewById(R.id.tvNotifications); tvNotifications = view.findViewById(R.id.tvNotifications);
tvBatteryOptimizations = view.findViewById(R.id.tvBatteryOptimizations); tvBatteryOptimizations = view.findViewById(R.id.tvBatteryOptimizations);
tvHintPro = view.findViewById(R.id.tvHintPro); tvSupport = view.findViewById(R.id.tvSupport);
ibHintPro = view.findViewById(R.id.ibHintPro);
ibHintSupport = view.findViewById(R.id.ibHintSupport); ibHintSupport = view.findViewById(R.id.ibHintSupport);
ibHintSwipe = view.findViewById(R.id.ibHintSwipe); ibHintSwipe = view.findViewById(R.id.ibHintSwipe);
ibHintSelect = view.findViewById(R.id.ibHintSelect); ibHintSelect = view.findViewById(R.id.ibHintSelect);
@ -584,7 +582,7 @@ public class FragmentMessages extends FragmentBase
grpAirplane = view.findViewById(R.id.grpAirplane); grpAirplane = view.findViewById(R.id.grpAirplane);
grpNotifications = view.findViewById(R.id.grpNotifications); grpNotifications = view.findViewById(R.id.grpNotifications);
grpBatteryOptimizations = view.findViewById(R.id.grpBatteryOptimizations); grpBatteryOptimizations = view.findViewById(R.id.grpBatteryOptimizations);
grpPro = view.findViewById(R.id.grpPro); grpSupport = view.findViewById(R.id.grpSupport);
grpHintSupport = view.findViewById(R.id.grpHintSupport); grpHintSupport = view.findViewById(R.id.grpHintSupport);
grpHintSwipe = view.findViewById(R.id.grpHintSwipe); grpHintSwipe = view.findViewById(R.id.grpHintSwipe);
grpHintSelect = view.findViewById(R.id.grpHintSelect); grpHintSelect = view.findViewById(R.id.grpHintSelect);
@ -659,20 +657,11 @@ public class FragmentMessages extends FragmentBase
} }
}); });
grpPro.setVisibility(View.GONE); grpSupport.setVisibility(View.GONE);
tvHintPro.setOnClickListener(new View.OnClickListener() { tvSupport.setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
startActivity(new Intent(v.getContext(), ActivityBilling.class)); startActivity(new Intent(getContext(), ActivityBilling.class));
}
});
ibHintPro.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
long banner_hidden = new Date().getTime() + FragmentPro.HIDE_BANNER * 7 * 24 * 3600 * 1000L;
prefs.edit().putLong("banner_hidden", banner_hidden).apply();
startActivity(new Intent(v.getContext(), ActivityBilling.class));
} }
}); });
@ -5158,11 +5147,11 @@ public class FragmentMessages extends FragmentBase
@Override @Override
public void onSharedPreferenceChanged(SharedPreferences prefs, String key) { public void onSharedPreferenceChanged(SharedPreferences prefs, String key) {
if (grpPro != null && if (grpSupport != null &&
("pro".equals(key) || "banner_hidden".equals(key))) { ("pro".equals(key) || "banner_hidden".equals(key))) {
boolean pro = ActivityBilling.isPro(getContext()); boolean pro = ActivityBilling.isPro(getContext());
long banner_hidden = prefs.getLong("banner_hidden", 0); long banner_hidden = prefs.getLong("banner_hidden", 0);
grpPro.setVisibility( grpSupport.setVisibility(
!pro && banner_hidden == 0 && viewType == AdapterMessage.ViewType.UNIFIED !pro && banner_hidden == 0 && viewType == AdapterMessage.ViewType.UNIFIED
? View.VISIBLE : View.GONE); ? View.VISIBLE : View.GONE);
} }

2
app/src/main/java/eu/faircode/email/FragmentPro.java
Unescape View File

@ -68,7 +68,7 @@ public class FragmentPro extends FragmentBase implements SharedPreferences.OnSha
private Button btnConsume; private Button btnConsume;
private ImageView ivConnected; private ImageView ivConnected;
static final int HIDE_BANNER = 4; // weeks private static final int HIDE_BANNER = 4; // weeks
@Override @Override
@Nullable @Nullable

27
app/src/main/res/layout/fragment_messages.xml
Unescape View File

@ -92,37 +92,24 @@
app:layout_constraintTop_toBottomOf="@id/tvBatteryOptimizations" /> app:layout_constraintTop_toBottomOf="@id/tvBatteryOptimizations" />
<TextView <TextView
android:id="@+id/tvHintPro" android:id="@+id/tvSupport"
android:layout_width="0dp" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="center_vertical" android:layout_gravity="center_vertical"
android:minHeight="36dp"
android:padding="6dp" android:padding="6dp"
android:text="@string/title_pro_support" android:text="@string/title_pro_support"
android:textAppearance="@style/TextAppearance.AppCompat.Small" android:textAppearance="@style/TextAppearance.AppCompat.Small"
app:layout_constraintEnd_toStartOf="@+id/ibHintPro" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/vSeparatorBatteryOptimizations" /> app:layout_constraintTop_toBottomOf="@+id/vSeparatorBatteryOptimizations" />
<ImageButton
android:id="@+id/ibHintPro"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="?android:attr/selectableItemBackgroundBorderless"
android:contentDescription="@string/title_legend_close_hint"
android:padding="9dp"
app:layout_constraintBottom_toBottomOf="@id/tvHintPro"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="@id/tvHintPro"
app:srcCompat="@drawable/twotone_close_24" />
<View <View
android:id="@+id/vSeparatorSupport" android:id="@+id/vSeparatorSupport"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="1dp" android:layout_height="1dp"
android:background="?attr/colorSeparator" android:background="?attr/colorSeparator"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tvHintPro" /> app:layout_constraintTop_toBottomOf="@id/tvSupport" />
<TextView <TextView
android:id="@+id/tvHintSupport" android:id="@+id/tvHintSupport"
@ -510,10 +497,10 @@
app:constraint_referenced_ids="tvBatteryOptimizations,vSeparatorBatteryOptimizations" /> app:constraint_referenced_ids="tvBatteryOptimizations,vSeparatorBatteryOptimizations" />
<androidx.constraintlayout.widget.Group <androidx.constraintlayout.widget.Group
android:id="@+id/grpPro" android:id="@+id/grpSupport"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="0dp" android:layout_height="0dp"
app:constraint_referenced_ids="tvHintPro,ibHintPro,vSeparatorSupport" /> app:constraint_referenced_ids="tvSupport,vSeparatorSupport" />
<androidx.constraintlayout.widget.Group <androidx.constraintlayout.widget.Group
android:id="@+id/grpHintSupport" android:id="@+id/grpHintSupport"

Write Preview
Loading…
Cancel
Save