Bump version number

This reverts commit bfd87cf94e.

README.md

@@ -1,6 +1,6 @@
 ![Pink logo with pink shark](mastodon/src/main/res/mipmap-xhdpi/ic_launcher_round.png)
 
-# Moshidon
+# Moshidon, the material you mastodon client! 
 
 > A fork of [megalodon](https://github.com/sk22/megalodon) which is a fork of [official Mastodon Android app](https://github.com/mastodon/mastodon-android) adding important features that are missing in the official app and possibly won’t ever be implemented, such as the federated timeline, unlisted posting, bookmarks and an image description viewer.
 
@@ -12,6 +12,8 @@
 
 ## Key features
 
+### **Material you theme support on Android 12+ devices!**
+
 ### **Translate button**
 
 **Allows you to translate posts in instances with the translate feature!**

mastodon/build.gradle

@@ -9,8 +9,8 @@ android {
 		applicationId "org.joinmastodon.android.moshinda"
 		minSdk 23
 		targetSdk 33
-		versionCode 63
-		versionName "1.1.4+fork.63.moshinda"
+		versionCode 64
+		versionName "1.1.4+fork.64.moshinda"
 		testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 		resConfigs "en", "ar-rSA", "bs-rBA", "ca-rES", "cs-rCZ", "de-rDE", "el-rGR", "es-rES",
 				"eu-rES", "fi-rFI", "fr-rFR", "gl-rES", "hr-rHR", "hy-rAM", "it-rIT", "iw-rIL",

mastodon/src/main/java/org/joinmastodon/android/api/requests/lists/AddList.java

@@ -0,0 +1,17 @@
+package org.joinmastodon.android.api.requests.lists;
+
+import org.joinmastodon.android.api.MastodonAPIRequest;
+import java.util.List;
+
+public class AddList extends MastodonAPIRequest<Object> {
+    public AddList(String listName){
+        super(HttpMethod.POST, "/lists", Object.class);
+        Request req = new Request();
+        req.title = listName;
+        setRequestBody(req);
+    }
+
+    public static class Request{
+        public String title;
+    }
+}

mastodon/src/main/java/org/joinmastodon/android/api/requests/lists/EditListName.java

@@ -0,0 +1,17 @@
+package org.joinmastodon.android.api.requests.lists;
+
+import org.joinmastodon.android.api.MastodonAPIRequest;
+import java.util.List;
+
+public class EditListName extends MastodonAPIRequest<Object> {
+    public EditListName(String newListName, String listId){
+        super(HttpMethod.PUT, "/lists/"+listId, Object.class);
+        Request req = new Request();
+        req.title = newListName;
+        setRequestBody(req);
+    }
+
+    public static class Request{
+        public String title;
+    }
+}

mastodon/src/main/java/org/joinmastodon/android/api/requests/lists/RemoveList.java

@@ -0,0 +1,10 @@
+package org.joinmastodon.android.api.requests.lists;
+
+import org.joinmastodon.android.api.MastodonAPIRequest;
+import java.util.List;
+
+public class RemoveList extends MastodonAPIRequest<Object> {
+    public RemoveList(String listId){
+        super(HttpMethod.DELETE, "/lists/"+listId, Object.class);
+    }
+}

mastodon/src/main/java/org/joinmastodon/android/fragments/discover/DiscoverFragment.java

@@ -88,11 +88,11 @@ public class DiscoverFragment extends AppKitFragment implements ScrollableToTop,
 			tabView.setId(switch(switchIndex){
 				case 0 -> R.id.discover_local_timeline;
 				case 1 -> R.id.discover_federated_timeline;
-				case 2 -> R.id.discover_hashtags;
-				case 3 -> R.id.discover_posts;
-				case 4 -> R.id.discover_news;
-				case 5 -> R.id.discover_users;
-				case 6 -> R.id.discover_lists;
+				case 2 -> R.id.discover_lists;
+				case 3 -> R.id.discover_hashtags;
+				case 4 -> R.id.discover_posts;
+				case 5 -> R.id.discover_news;
+				case 6 -> R.id.discover_users;
 				default -> throw new IllegalStateException("Unexpected value: "+switchIndex);
 			});
 			tabView.setVisibility(View.GONE);
@@ -165,11 +165,12 @@ public class DiscoverFragment extends AppKitFragment implements ScrollableToTop,
 				tab.setText(switch(position){
 					case 0 -> R.string.local_timeline;
 					case 1 -> R.string.sk_federated_timeline;
-					case 2 -> R.string.hashtags;
-					case 3 -> R.string.posts;
-					case 4 -> R.string.news;
-					case 5 -> R.string.for_you;
-					case 6 -> R.string.sk_list_timelines;
+					case 2 -> R.string.sk_list_timelines;
+					case 3 -> R.string.hashtags;
+					case 4 -> R.string.posts;
+					case 5 -> R.string.news;
+					case 6 -> R.string.for_you;
+
 					default -> throw new IllegalStateException("Unexpected value: "+position);
 				});
 				tab.view.textView.setAllCaps(true);

mastodon/src/main/res/drawable/ic_fluent_lists_28_selector.xml

@@ -0,0 +1,5 @@
+<vector android:height="28dp" android:tint="#000000"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="28dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M3,5v14h17L20,5L3,5zM7,7v2L5,9L5,7h2zM5,13v-2h2v2L5,13zM5,15h2v2L5,17v-2zM18,17L9,17v-2h9v2zM18,13L9,13v-2h9v2zM18,9L9,9L9,7h9v2z"/>
+</vector>

mastodon/src/main/res/layout/fragment_lists.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <org.joinmastodon.android.ui.tabs.TabLayout
+        android:id="@+id/tabbar"
+        android:layout_width="match_parent"
+        android:layout_height="48dp"
+        app:tabGravity="fill"
+        app:tabIndicator="@drawable/mtrl_tabs_default_indicator"
+        app:tabIndicatorAnimationMode="elastic"
+        app:tabIndicatorColor="?android:textColorPrimary"
+        app:tabMode="fixed"
+        android:background="@drawable/bg_discover_tabs"/>
+</LinearLayout>

mastodon/src/main/res/layout/item_list_timeline.xml

@@ -28,4 +28,29 @@
         android:layout_height="match_parent"
         android:paddingRight="16dp"/>
 
+<!--    <ImageView-->
+<!--        android:id="@+id/edit"-->
+<!--        android:layout_width="36dp"-->
+<!--        android:layout_height="36dp"-->
+<!--        android:layout_marginTop="0dp"-->
+<!--        android:layout_marginEnd="6dp"-->
+<!--        android:layout_toStartOf="@id/list_toggle"-->
+<!--        android:background="?android:selectableItemBackgroundBorderless"-->
+<!--        android:scaleType="center"-->
+<!--        android:src="@drawable/ic_fluent_edit_24_regular"-->
+<!--        android:tint="?android:textColorSecondary" />-->
+
+<!--    <ImageView-->
+<!--        android:id="@+id/delete"-->
+<!--        android:layout_width="36dp"-->
+<!--        android:layout_height="36dp"-->
+<!--        android:layout_marginTop="0dp"-->
+<!--        android:layout_marginEnd="6dp"-->
+<!--        android:layout_toStartOf="@id/edit"-->
+<!--        android:background="?android:selectableItemBackgroundBorderless"-->
+<!--        android:scaleType="center"-->
+<!--        android:src="@drawable/ic_fluent_delete_24_regular"-->
+<!--        android:tint="?android:textColorSecondary" />-->
+
 </LinearLayout>
+