Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c90e95e3 authored by Stefan Niedermann's avatar Stefan Niedermann
Browse files

Fix SelectSingleNoteActivity, added previeImage for SingleNoteWidget and added...

Fix SelectSingleNoteActivity, added previeImage for SingleNoteWidget and added labels for SingleNoteWidget and AllNotesWidget.
parent e8e8c0c9
Loading
Loading
Loading
Loading
+6 −2
Original line number Diff line number Diff line
@@ -64,7 +64,9 @@

        <!-- All Notes Widget -->

        <receiver android:name="it.niedermann.owncloud.notes.android.widget.AllNotesWidget">
        <receiver
            android:name="it.niedermann.owncloud.notes.android.widget.AllNotesWidget"
            android:label="@string/widget_all_notes_title">
            <intent-filter>
                <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
            </intent-filter>
@@ -77,7 +79,9 @@

        <!-- Single Note Widget -->

        <receiver android:name="it.niedermann.owncloud.notes.android.widget.SingleNoteWidget">
        <receiver
            android:name="it.niedermann.owncloud.notes.android.widget.SingleNoteWidget"
            android:label="@string/widget_single_note_title">
            <intent-filter>
                <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
            </intent-filter>
+1 −1
Original line number Diff line number Diff line
@@ -141,7 +141,7 @@ public class NotesListViewActivity extends AppCompatActivity implements
            if (!todaySet && recent.getTimeInMillis() - currentNote.getModified().getTimeInMillis() >= 600000 && currentNote.getModified().getTimeInMillis() >= today.getTimeInMillis()) {
                // < 10 minutes but after 00:00 today
                if (i > 0) {
                    itemList.add(new SectionItem(getResources().getString(R.string.listview_updated_today)));
                    //itemList.add(new SectionItem(getResources().getString(R.string.listview_updated_today)));
                }
                todaySet = true;
            } else if (!yesterdaySet && currentNote.getModified().getTimeInMillis() < today.getTimeInMillis() && currentNote.getModified().getTimeInMillis() >= yesterday.getTimeInMillis()) {
+8 −4
Original line number Diff line number Diff line
@@ -8,7 +8,6 @@ import android.support.v7.app.AppCompatActivity;
import android.support.v7.widget.LinearLayoutManager;
import android.support.v7.widget.RecyclerView;
import android.view.View;
import android.widget.AdapterView;
import android.widget.RemoteViews;

import java.util.ArrayList;
@@ -25,7 +24,7 @@ import it.niedermann.owncloud.notes.persistence.NoteSQLiteOpenHelper;
 * Configuration Activity to select a single note which should be displayed in the SingleNoteWidget
 * Created by stefan on 08.10.15.
 */
public class SelectSingleNoteActivity extends AppCompatActivity implements AdapterView.OnItemClickListener {
public class SelectSingleNoteActivity extends AppCompatActivity implements ItemAdapter.NoteClickListener {

    int appWidgetId = AppWidgetManager.INVALID_APPWIDGET_ID;
    private NoteSQLiteOpenHelper db = null;
@@ -69,11 +68,11 @@ public class SelectSingleNoteActivity extends AppCompatActivity implements Adapt
        listView = (RecyclerView) findViewById(R.id.select_single_note_list_view);
        listView.setAdapter(adapter);
        listView.setLayoutManager(new LinearLayoutManager(this));
        //httpslistView.setOnItemClickListener(this);
        ItemAdapter.setNoteClickListener(this);
    }

    @Override
    public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
    public void onNoteClick(int position, View v) {
        final Context context = SelectSingleNoteActivity.this;

        AppWidgetManager appWidgetManager = AppWidgetManager.getInstance(context);
@@ -87,4 +86,9 @@ public class SelectSingleNoteActivity extends AppCompatActivity implements Adapt
        setResult(RESULT_OK, resultValue);
        finish();
    }

    @Override
    public boolean onNoteLongClick(int position, View v) {
        return false;
    }
}
+118 KiB
Loading image diff...
+3 −0
Original line number Diff line number Diff line
@@ -85,4 +85,7 @@
    <string name="about_credits_tab_title">Credits</string>
    <string name="about_contribution_tab_title">Mitmachen</string>
    <string name="about_license_tab_title">Lizenz</string>

    <string name="widget_all_notes_title">Alle Notizen</string>
    <string name="widget_single_note_title">Eine Notiz</string>
</resources>
 No newline at end of file
Loading