diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index ac35681..bb09d7d 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -59,7 +59,7 @@ android:configChanges="keyboardHidden|orientation|screenSize" android:label="@string/app_name" android:launchMode="singleTop" - android:theme="@style/NoteTheme" + android:theme="@style/Theme.AppCompat.Light.DarkActionBar" android:uiOptions="splitActionBarWhenNarrow" android:windowSoftInputMode="adjustPan" android:exported="true"> diff --git a/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java b/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java index 96a9ff8..f2091d0 100644 --- a/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java +++ b/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java @@ -74,6 +74,7 @@ import java.util.regex.Pattern; public class NoteEditActivity extends Activity implements OnClickListener, NoteSettingChangedListener, OnTextViewChangeListener { + private class HeadViewHolder { public TextView tvModified; diff --git a/app/src/main/java/net/micode/notes/ui/NotesListActivity.java b/app/src/main/java/net/micode/notes/ui/NotesListActivity.java index 9d9eebe..492fcf6 100644 --- a/app/src/main/java/net/micode/notes/ui/NotesListActivity.java +++ b/app/src/main/java/net/micode/notes/ui/NotesListActivity.java @@ -60,6 +60,8 @@ import android.widget.PopupMenu; import android.widget.TextView; import android.widget.Toast; +import androidx.appcompat.app.AppCompatActivity; + import net.micode.notes.R; import net.micode.notes.data.Notes; import net.micode.notes.data.Notes.NoteColumns; @@ -78,7 +80,8 @@ import java.io.InputStream; import java.io.InputStreamReader; import java.util.HashSet; -public class NotesListActivity extends Activity implements OnClickListener, OnItemLongClickListener { +public class NotesListActivity extends AppCompatActivity implements OnClickListener, OnItemLongClickListener { + private int mode=-1; private static final int FOLDER_NOTE_LIST_QUERY_TOKEN = 0; private static final int FOLDER_LIST_QUERY_TOKEN = 1; @@ -139,6 +142,9 @@ public class NotesListActivity extends Activity implements OnClickListener, OnI protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.note_list); + + getWindow().setBackgroundDrawableResource(R.drawable.beijing); + getWindow().setBackgroundDrawableResource(R.drawable.bb); initResources(); /** @@ -775,12 +781,27 @@ public class NotesListActivity extends Activity implements OnClickListener, OnI } else { Log.e(TAG, "Wrong state:" + mState); } + + if(mode==-1) + menu.findItem(R.id.menu_beijing).setVisible(false); + else if(mode==0) + menu.findItem(R.id.menu_bb).setVisible(false); return true; } @Override public boolean onOptionsItemSelected(MenuItem item) { switch (item.getItemId()) { + case R.id.menu_beijing:{ + mode=-1; + getWindow().setBackgroundDrawableResource(R.drawable.beijing); + break; + } + case R.id.menu_bb:{ + mode=0; + getWindow().setBackgroundDrawableResource(R.drawable.bb); + break; + } case R.id.menu_new_folder: { showCreateOrModifyFolderDialog(true); break; diff --git a/app/src/main/res/drawable/bb.png b/app/src/main/res/drawable/bb.png new file mode 100644 index 0000000..a4cfd30 Binary files /dev/null and b/app/src/main/res/drawable/bb.png differ diff --git a/app/src/main/res/drawable/beijing.png b/app/src/main/res/drawable/beijing.png new file mode 100644 index 0000000..2a2a6ee Binary files /dev/null and b/app/src/main/res/drawable/beijing.png differ diff --git a/app/src/main/res/layout/note_list.xml b/app/src/main/res/layout/note_list.xml index 6b25d38..23989cb 100644 --- a/app/src/main/res/layout/note_list.xml +++ b/app/src/main/res/layout/note_list.xml @@ -18,8 +18,8 @@ + android:layout_height="fill_parent"> + + + diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 55df868..6a316b5 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -120,6 +120,9 @@ Call notes Input name + Background: beijing + Background: bb + Searching Notes Search notes Text in your notes diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 1ed07c0..448262c 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -63,7 +63,10 @@ + + + \ No newline at end of file