96 changelog

Fix/typos

README.md

@@ -15,6 +15,8 @@
 
 ## Key features
 
+### **The ability to add new custom local timelines!**
+
 ### **Material you theme support on Android 12+ devices!**
 
 ### **Show posts filtered with a warning!**
@@ -94,7 +96,7 @@ Variant with an integrated updater. If you download Moshidon from here (and not
   ([Pull request](https://github.com/mastodon/mastodon-android/pull/103))
 * Adding a useful private profile note box!*
 * Auto hiding the compose button on scroll!*
-* Adding the hability to remind yourself to add alt text to images!*
+* Adding the ability to remind yourself to add alt text to images!*
 * An indicator for if an image has alt text or not*
 * Adding the ability to have drafts!*
 * Also adding the ability to view announcements from your instance!*

mastodon/build.gradle

@@ -9,8 +9,8 @@ android {
 		applicationId "org.joinmastodon.android.moshinda"
 		minSdk 23
 		targetSdk 33
-		versionCode 95
-		versionName "1.2.0+fork.95.moshinda"
+		versionCode 96
+		versionName "1.2.0+fork.96.moshinda"
 		testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 		resConfigs "ar-rSA", "be-rBY", "bn-rBD", "bs-rBA", "ca-rES", "cs-rCZ", "de-rDE", "el-rGR", "es-rES", "eu-rES", "fi-rFI", "fil-rPH", "fr-rFR", "ga-rIE", "gd-rGB", "gl-rES", "hi-rIN", "hr-rHR", "hu-rHU", "hy-rAM", "in-rID", "is-rIS", "it-rIT", "iw-rIL", "ja-rJP", "kab", "ko-rKR", "nl-rNL", "oc-rFR", "pl-rPL", "pt-rBR", "pt-rPT", "ro-rRO", "ru-rRU", "si-rLK", "sl-rSI", "sv-rSE", "th-rTH", "tr-rTR", "uk-rUA", "vi-rVN", "zh-rCN", "zh-rTW"
 	}

mastodon/src/main/java/org/joinmastodon/android/fragments/BaseStatusListFragment.java

@@ -13,13 +13,11 @@ import android.text.Layout;
 import android.text.StaticLayout;
 import android.text.TextPaint;
 import android.text.TextUtils;
-import android.util.Log;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.WindowInsets;
 import android.view.animation.TranslateAnimation;
 import android.widget.ImageButton;
-import android.widget.ImageButton;
 import android.widget.Toolbar;
 
 import org.joinmastodon.android.E;
@@ -34,7 +32,6 @@ import org.joinmastodon.android.model.Poll;
 import org.joinmastodon.android.model.Relationship;
 import org.joinmastodon.android.model.Status;
 import org.joinmastodon.android.ui.BetterItemAnimator;
-import org.joinmastodon.android.model.DisplayItemsParent;
 import org.joinmastodon.android.ui.PhotoLayoutHelper;
 import org.joinmastodon.android.ui.TileGridLayoutManager;
 import org.joinmastodon.android.ui.displayitems.ExtendedFooterStatusDisplayItem;
@@ -85,7 +82,7 @@ public abstract class BaseStatusListFragment<T extends DisplayItemsParent> exten
 	protected HashMap<String, Relationship> relationships=new HashMap<>();
 	protected Rect tmpRect=new Rect();
 
-	private final int THRESHHOLD = 800;
+	private final int THRESHOLD = 800;
 
 	public BaseStatusListFragment(){
 		super(20);
@@ -303,7 +300,7 @@ public abstract class BaseStatusListFragment<T extends DisplayItemsParent> exten
 				if (fab!=null && GlobalUserPreferences.enableFabAutoHide) {
 //					This piece of code should make it so that the fab is always visible if the status list scroll view is at the item at the top
 					if(list.getChildAt(0).getTop() == 0){
-						scrollDiff=THRESHHOLD+1;
+						scrollDiff= THRESHOLD +1;
 					}else{
 						if(dy > 0){
 							scrollDiff=0;
@@ -323,7 +320,7 @@ public abstract class BaseStatusListFragment<T extends DisplayItemsParent> exten
 						fab.setVisibility(View.INVISIBLE);
 						scrollDiff = 0;
 					} else if (dy < 0 && fab.getVisibility() != View.VISIBLE) {
-						if (scrollDiff > THRESHHOLD) {
+						if (scrollDiff > THRESHOLD) {
 							TranslateAnimation animate = new TranslateAnimation(
 									0,
 									0,

mastodon/src/main/java/org/joinmastodon/android/fragments/EditTimelinesFragment.java

@@ -150,7 +150,6 @@ public class EditTimelinesFragment extends BaseRecyclerFragment<TimelineDefiniti
         FrameLayout inputWrap = new FrameLayout(getContext());
         EditText input = new EditText(getContext());
         input.setHint(R.string.sk_example_domain);
-        input.setText(GlobalUserPreferences.publishButtonText.trim());
         FrameLayout.LayoutParams params = new FrameLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT);
         params.setMargins(V.dp(16), V.dp(4), V.dp(16), V.dp(16));
         input.setLayoutParams(params);
@@ -190,7 +189,7 @@ public class EditTimelinesFragment extends BaseRecyclerFragment<TimelineDefiniti
         hashtagsMenu.getItem().setIcon(R.drawable.ic_fluent_number_symbol_24_regular);
 
         MenuItem addLocalTimelines = menu.add(0, R.id.menu_add_local_timelines, NONE, R.string.local_timeline);
-        addLocalTimelines.setIcon(R.drawable.ic_fluent_people_community_24_regular);
+        addLocalTimelines.setIcon(R.drawable.ic_fluent_add_24_regular);
 
         makeBackItem(timelinesMenu);
         makeBackItem(listsMenu);

mastodon/src/main/java/org/joinmastodon/android/model/Poll.java

@@ -17,7 +17,7 @@ public class Poll extends BaseModel{
 	public boolean multiple;
 	public int votersCount;
 	public boolean voted;
-	@RequiredField
+//	@RequiredField
 	public List<Integer> ownVotes;
 	@RequiredField
 	public List<Option> options;

metadata/en-US/changelogs/96.txt

@@ -0,0 +1,3 @@
+New things for 95:
+- Improving the ability to have other server's local timelines in the timelines
+- Minor fixes and improvements