mirror of
https://github.com/mediathekview/zapp.git
synced 2024-09-20 20:23:04 +02:00
Add help dialog for channel selection
This commit is contained in:
parent
d4095fd00e
commit
d4561ba648
@ -1,8 +1,12 @@
|
||||
package de.christinecoenen.code.zapp.app.settings.ui;
|
||||
|
||||
import android.os.Bundle;
|
||||
import androidx.appcompat.app.ActionBar;
|
||||
import android.view.Menu;
|
||||
import android.view.MenuItem;
|
||||
|
||||
import androidx.annotation.NonNull;
|
||||
import androidx.appcompat.app.AppCompatActivity;
|
||||
import androidx.fragment.app.DialogFragment;
|
||||
import androidx.recyclerview.widget.RecyclerView;
|
||||
|
||||
import com.woxthebox.draglistview.DragListView;
|
||||
@ -29,11 +33,6 @@ public class ChannelSelectionActivity extends AppCompatActivity {
|
||||
setContentView(R.layout.activity_channel_selection);
|
||||
ButterKnife.bind(this);
|
||||
|
||||
ActionBar toolbar = getSupportActionBar();
|
||||
if (toolbar != null) {
|
||||
toolbar.setSubtitle(R.string.activity_channel_selection_subtitle);
|
||||
}
|
||||
|
||||
// adapter
|
||||
channelList = new SortableJsonChannelList(this);
|
||||
final ChannelSelectionAdapter listAdapter = new ChannelSelectionAdapter(this);
|
||||
@ -60,4 +59,26 @@ public class ChannelSelectionActivity extends AppCompatActivity {
|
||||
super.onPause();
|
||||
channelList.persistChannelOrder();
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean onCreateOptionsMenu(Menu menu) {
|
||||
getMenuInflater().inflate(R.menu.activity_channel_selection, menu);
|
||||
return super.onCreateOptionsMenu(menu);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean onOptionsItemSelected(@NonNull MenuItem item) {
|
||||
switch (item.getItemId()) {
|
||||
case R.id.menu_help:
|
||||
openHelpDialog();
|
||||
return true;
|
||||
}
|
||||
|
||||
return super.onOptionsItemSelected(item);
|
||||
}
|
||||
|
||||
private void openHelpDialog() {
|
||||
DialogFragment newFragment = new ChannelSelectionHelpDialog();
|
||||
newFragment.show(getSupportFragmentManager(), "help");
|
||||
}
|
||||
}
|
||||
|
@ -0,0 +1,28 @@
|
||||
package de.christinecoenen.code.zapp.app.settings.ui;
|
||||
|
||||
import android.app.Dialog;
|
||||
import android.os.Bundle;
|
||||
|
||||
import androidx.annotation.NonNull;
|
||||
import androidx.annotation.Nullable;
|
||||
import androidx.appcompat.app.AlertDialog;
|
||||
import androidx.fragment.app.DialogFragment;
|
||||
|
||||
import java.util.Objects;
|
||||
|
||||
import de.christinecoenen.code.zapp.R;
|
||||
|
||||
|
||||
class ChannelSelectionHelpDialog extends DialogFragment {
|
||||
|
||||
@NonNull
|
||||
@Override
|
||||
public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) {
|
||||
return new AlertDialog.Builder(Objects.requireNonNull(getActivity()))
|
||||
.setTitle(R.string.activity_channel_selection_title)
|
||||
.setMessage(R.string.activity_channel_selection_help_text)
|
||||
.setPositiveButton(android.R.string.ok, null)
|
||||
.create();
|
||||
}
|
||||
|
||||
}
|
5
app/src/main/res/drawable/ic_help_white_24dp.xml
Normal file
5
app/src/main/res/drawable/ic_help_white_24dp.xml
Normal file
@ -0,0 +1,5 @@
|
||||
<vector android:height="24dp" android:tint="#FFFFFF"
|
||||
android:viewportHeight="24.0" android:viewportWidth="24.0"
|
||||
android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<path android:fillColor="#FF000000" android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM13,19h-2v-2h2v2zM15.07,11.25l-0.9,0.92C13.45,12.9 13,13.5 13,15h-2v-0.5c0,-1.1 0.45,-2.1 1.17,-2.83l1.24,-1.26c0.37,-0.36 0.59,-0.86 0.59,-1.41 0,-1.1 -0.9,-2 -2,-2s-2,0.9 -2,2L8,9c0,-2.21 1.79,-4 4,-4s4,1.79 4,4c0,0.88 -0.36,1.68 -0.93,2.25z"/>
|
||||
</vector>
|
11
app/src/main/res/menu/activity_channel_selection.xml
Normal file
11
app/src/main/res/menu/activity_channel_selection.xml
Normal file
@ -0,0 +1,11 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<menu xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:app="http://schemas.android.com/apk/res-auto">
|
||||
|
||||
<item
|
||||
android:id="@+id/menu_help"
|
||||
android:title="@string/action_share"
|
||||
android:icon="@drawable/ic_help_white_24dp"
|
||||
app:showAsAction="ifRoom"/>
|
||||
|
||||
</menu>
|
@ -15,8 +15,8 @@
|
||||
<string name="activity_channel_detail_info_error">Keine Programminfo</string>
|
||||
|
||||
<string name="activity_settings_title">Einstellungen</string>
|
||||
<string name="activity_channel_selection_title">Sender anordnen</string>
|
||||
<string name="activity_channel_selection_subtitle">Ziehe an den grauen Balken</string>
|
||||
<string name="activity_channel_selection_title">Senderliste ändern</string>
|
||||
<string name="activity_channel_selection_help_text">Ziehe an den grauen Balken, um die Sender zu sortieren.\n\nEin Klick blendet einen Sender ein oder aus.</string>
|
||||
|
||||
<string name="view_program_info_show_time">%1$s – %2$s Uhr</string>
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user