Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Issue/76/add option to reply in days #78

Merged
merged 4 commits into from
Feb 18, 2021
Merged

Issue/76/add option to reply in days #78

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1bcc20c
remove material time picker
adeekshith Feb 16, 2021
dd346b6
changed time picker to choose in days
adeekshith Feb 16, 2021
726f094
Change SVG icon colors to respect the theme
adeekshith Feb 16, 2021
36df2c0
Change text color to respect the theme
adeekshith Feb 16, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
75 changes: 32 additions & 43 deletions app/src/main/java/com/parishod/watomatic/activity/main/MainActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
import android.view.View;
import com.google.android.material.switchmaterial.SwitchMaterial;

import android.widget.ImageView;
import android.widget.RelativeLayout;
import android.widget.TextView;
import android.widget.Toast;
Expand All @@ -22,8 +23,6 @@
import androidx.appcompat.app.AppCompatActivity;
import androidx.cardview.widget.CardView;

import com.google.android.material.timepicker.MaterialTimePicker;
import com.google.android.material.timepicker.TimeFormat;

import com.parishod.watomatic.activity.about.AboutActivity;
import com.parishod.watomatic.activity.customreplyeditor.CustomReplyEditorActivity;
Expand All @@ -35,6 +34,8 @@
import com.parishod.watomatic.model.utils.CustomDialog;

import static android.provider.Settings.ACTION_NOTIFICATION_LISTENER_SETTINGS;
import static com.parishod.watomatic.model.utils.Constants.MAX_DAYS;
import static com.parishod.watomatic.model.utils.Constants.MIN_DAYS;

public class MainActivity extends AppCompatActivity {
private static final int REQ_NOTIFICATION_LISTENER = 100;
Expand All @@ -45,8 +46,9 @@ public class MainActivity extends AppCompatActivity {
String autoReplyTextPlaceholder;
SwitchMaterial mainAutoReplySwitch, groupReplySwitch;
private PreferencesManager preferencesManager;
private MaterialTimePicker materialTimePicker;
private RelativeLayout share_layout;
private int days = 0;
private ImageView imgMinus, imgPlus;

@Override
protected void onCreate(Bundle savedInstanceState) {
Expand All @@ -65,9 +67,13 @@ protected void onCreate(Bundle savedInstanceState) {
autoReplyTextPlaceholder = getResources().getString(R.string.mainAutoReplyTextPlaceholder);

timePickerCard = findViewById(R.id.timePickerCardView);
timeSelectedTextPreview = findViewById(R.id.timeSelectedText);
timePickerSubTitleTextPreview = findViewById(R.id.timePickerSubTitle);

timeSelectedTextPreview = findViewById(R.id.timeSelectedText);

imgMinus = findViewById(R.id.imgMinus);
imgPlus = findViewById(R.id.imgPlus);

autoReplyTextPreviewCard.setOnClickListener(this::openCustomReplyEditorActivity);
autoReplyTextPreview.setText(customRepliesData.getOrElse(autoReplyTextPlaceholder));
// Enable group chat switch only if main switch id ON
Expand Down Expand Up @@ -103,54 +109,37 @@ protected void onCreate(Bundle savedInstanceState) {
preferencesManager.setGroupReplyPref(isChecked);
});

// Hide throttle feature until a little cleanup is done
timePickerCard.setVisibility(View.GONE);

timePickerCard.setOnClickListener(v -> launchTimePicker());
setSelectedTime();

share_layout = findViewById(R.id.share_layout);
share_layout.setOnClickListener(v -> launchShareIntent());
}
imgMinus.setOnClickListener(v -> {
if(days > MIN_DAYS){
days--;
saveNumDays();
}
});

private void launchShareIntent() {
Intent sharingIntent = new Intent(android.content.Intent.ACTION_SEND);
sharingIntent.setType("text/plain");
sharingIntent.putExtra(android.content.Intent.EXTRA_SUBJECT, getResources().getString(R.string.share_subject));
sharingIntent.putExtra(android.content.Intent.EXTRA_TEXT, getResources().getString(R.string.share_app_text));
startActivity(Intent.createChooser(sharingIntent, "Share app via"));
}
imgPlus.setOnClickListener(v -> {
if(days < MAX_DAYS){
days++;
saveNumDays();
}
});

private void launchTimePicker(){
int timeDelay = (int) (preferencesManager.getAutoReplyDelay()/(60 * 1000));//convert back to minutes
int hour = timeDelay/MINUTE_FACTOR;
int min = timeDelay%MINUTE_FACTOR;
materialTimePicker = new MaterialTimePicker.Builder()
.setTimeFormat(TimeFormat.CLOCK_24H)
.setInputMode(MaterialTimePicker.INPUT_MODE_KEYBOARD)
.setHour(hour)
.setMinute(min)
.build();
materialTimePicker.show(getSupportFragmentManager(), "time_picker");
materialTimePicker.addOnPositiveButtonClickListener(v -> saveSelectedTime());
setNumDays();
}

private void saveSelectedTime(){
long delay = ((materialTimePicker.getHour() * MINUTE_FACTOR) + materialTimePicker.getMinute()) * 60 * 1000;//Save it in milliseconds
preferencesManager.setAutoReplyDelay(delay);
setSelectedTime();
private void saveNumDays(){
preferencesManager.setAutoReplyDelay(days * 24 * 60 * 60 * 1000);//Save in Milliseconds
setNumDays();
}

private void setSelectedTime(){
private void setNumDays(){
long timeDelay = (preferencesManager.getAutoReplyDelay()/(60 * 1000));//convert back to minutes
String hour = "" + timeDelay/MINUTE_FACTOR;
String min = "" + timeDelay%MINUTE_FACTOR;
String time = hour + "h " + min + "m";
timeSelectedTextPreview.setText(time);
if(time.equalsIgnoreCase("0h 0m")){
days = (int)timeDelay/(60 * 24);//convert back to days
if(days == 0){
timeSelectedTextPreview.setText("•");
timePickerSubTitleTextPreview.setText(R.string.time_picker_sub_title_default);
}else{
timePickerSubTitleTextPreview.setText(String.format(getResources().getString(R.string.time_picker_sub_title), hour, min));
timeSelectedTextPreview.setText("" + days);
timePickerSubTitleTextPreview.setText(String.format(getResources().getString(R.string.time_picker_sub_title), days));
}
}

Expand Down
3 changes: 3 additions & 0 deletions app/src/main/java/com/parishod/watomatic/model/utils/Constants.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,7 @@ public class Constants {
public static final String PERMISSION_DIALOG_DENIED_MSG = "permission_dialog_denied_msg";
public static final String PERMISSION_DIALOG_DENIED = "permission_dialog_denied";
public static final String WHATSAPP_LOGS_DB_NAME = "logs_whatsapp_autoreply_db";

public static final int MIN_DAYS = 0;
public static final int MAX_DAYS = 7;
}
5 changes: 5 additions & 0 deletions app/src/main/res/drawable/minus.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<vector android:height="24dp" android:tint="?attr/colorControlNormal"
android:viewportHeight="24" android:viewportWidth="24"
android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="@android:color/white" android:pathData="M7,10l5,5 5,-5z"/>
</vector>
5 changes: 5 additions & 0 deletions app/src/main/res/drawable/plus.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<vector android:height="24dp" android:tint="?attr/colorControlNormal"
android:viewportHeight="24" android:viewportWidth="24"
android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="@android:color/white" android:pathData="M7,14l5,-5 5,5z"/>
</vector>
60 changes: 42 additions & 18 deletions app/src/main/res/layout/activity_main.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,18 +139,6 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />

<TextView
android:id="@+id/timeSelectedText"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingStart="20dp"
android:paddingTop="5dp"
android:paddingEnd="10dp"
android:text="@string/time_format_placeholder"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/editTimeButton"
app:layout_constraintTop_toTopOf="parent" />

<TextView
android:id="@+id/timePickerSubTitle"
android:layout_width="wrap_content"
Expand All @@ -166,16 +154,52 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/timePickerTitle"/>

<ImageView
android:id="@+id/editTimeButton"
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="8dp"
android:contentDescription="@string/time_picker_edit_btn_tooltip"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:srcCompat="@drawable/ic_edit" />
app:layout_constraintTop_toTopOf="parent">

<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/constraint_inner"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent">

<ImageView
android:id="@+id/imgMinus"
android:layout_width="30dp"
android:layout_height="30dp"
android:src="@drawable/minus"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintStart_toStartOf="parent"/>

<TextView
android:id="@+id/timeSelectedText"
android:layout_width="30dp"
android:layout_height="wrap_content"
android:text="0"
android:textSize="20sp"
android:gravity="center_horizontal"
android:inputType="number"
android:textColor="?attr/colorOnSurface"
app:layout_constraintTop_toTopOf="@+id/imgMinus"
app:layout_constraintBottom_toBottomOf="@id/imgMinus"
app:layout_constraintStart_toEndOf="@+id/imgMinus"/>

<ImageView
android:id="@+id/imgPlus"
android:layout_width="30dp"
android:layout_height="30dp"
android:src="@drawable/plus"
app:layout_constraintStart_toEndOf="@+id/timeSelectedText"
app:layout_constraintTop_toTopOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout>

</androidx.constraintlayout.widget.ConstraintLayout>

Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@

<string name="time_picker_title">Choose time between replies</string>
<string name="time_picker_sub_title_default">Auto Reply will respond always</string>
<string name="time_picker_sub_title">(Auto Reply will respond after \nevery %1$s hours, %2$s minutes)</string>
<string name="time_picker_sub_title">(Auto Reply will respond after \nevery %1$d day\/s)</string>
<string name="time_format_placeholder">00:00</string>
<string name="time_picker_edit_btn_tooltip">Click to edit time delay between replies</string>
<string name="app_version">v%1$s</string>
Expand Down