V 1.7.14 SDK Update, new login layout

.idea/gradle.xml

@@ -5,9 +5,8 @@
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
         <option name="testRunner" value="PLATFORM" />
-        <option name="distributionType" value="LOCAL" />
+        <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleHome" value="/opt/Gradle/gradle-6.4.1" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />

.idea/render.experimental.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="RenderSettings">
-    <option name="quality" value="0.25" />
+    <option name="quality" value="0.0" />
     <option name="showDecorations" value="true" />
   </component>
 </project>

app/build.gradle

@@ -2,14 +2,14 @@ apply plugin: 'com.android.application'
 
 android {
     buildToolsVersion '30.0.2'
-    compileSdkVersion 29
+    compileSdkVersion 30
 
     defaultConfig {
         applicationId 'org.nuclearfog.twidda'
         minSdkVersion 16
-        targetSdkVersion 29
+        targetSdkVersion 30
-        versionCode 21
+        versionCode 22
-        versionName '1.7.13'
+        versionName '1.7.14'
         vectorDrawables.useSupportLibrary true
     }
 

app/src/main/java/org/nuclearfog/twidda/activity/AppSettings.java

@@ -37,9 +37,9 @@ import org.nuclearfog.twidda.adapter.LocationAdapter;
 import org.nuclearfog.twidda.backend.LocationListLoader;
 import org.nuclearfog.twidda.backend.engine.EngineException;
 import org.nuclearfog.twidda.backend.engine.TwitterEngine;
-import org.nuclearfog.twidda.backend.helper.ErrorHandler;
-import org.nuclearfog.twidda.backend.helper.FontTool;
 import org.nuclearfog.twidda.backend.items.TrendLocation;
+import org.nuclearfog.twidda.backend.tools.ErrorHandler;
+import org.nuclearfog.twidda.backend.tools.FontTool;
 import org.nuclearfog.twidda.database.DatabaseAdapter;
 import org.nuclearfog.twidda.database.GlobalSettings;
 

app/src/main/java/org/nuclearfog/twidda/activity/DirectMessage.java

@@ -14,7 +14,7 @@ import androidx.viewpager.widget.ViewPager;
 
 import org.nuclearfog.twidda.R;
 import org.nuclearfog.twidda.adapter.FragmentAdapter;
-import org.nuclearfog.twidda.backend.helper.FontTool;
+import org.nuclearfog.twidda.backend.tools.FontTool;
 import org.nuclearfog.twidda.database.GlobalSettings;
 
 /**

app/src/main/java/org/nuclearfog/twidda/activity/ListDetail.java

@@ -14,7 +14,7 @@ import com.google.android.material.tabs.TabLayout.Tab;
 
 import org.nuclearfog.twidda.R;
 import org.nuclearfog.twidda.adapter.FragmentAdapter;
-import org.nuclearfog.twidda.backend.helper.FontTool;
+import org.nuclearfog.twidda.backend.tools.FontTool;
 import org.nuclearfog.twidda.database.GlobalSettings;
 
 /**

app/src/main/java/org/nuclearfog/twidda/activity/LoginActivity.java

@@ -20,8 +20,8 @@ import androidx.appcompat.widget.Toolbar;
 import org.nuclearfog.twidda.R;
 import org.nuclearfog.twidda.backend.Registration;
 import org.nuclearfog.twidda.backend.engine.EngineException;
-import org.nuclearfog.twidda.backend.helper.ErrorHandler;
+import org.nuclearfog.twidda.backend.tools.ErrorHandler;
-import org.nuclearfog.twidda.backend.helper.FontTool;
+import org.nuclearfog.twidda.backend.tools.FontTool;
 import org.nuclearfog.twidda.database.GlobalSettings;
 
 import java.security.NoSuchAlgorithmException;
@@ -57,7 +57,7 @@ public class LoginActivity extends AppCompatActivity implements OnClickListener
         root = findViewById(R.id.login_root);
         pinInput = findViewById(R.id.pin);
 
-        toolbar.setTitle("");
+        toolbar.setTitle(R.string.login_info);
         setSupportActionBar(toolbar);
 
         linkButton.setOnClickListener(this);

app/src/main/java/org/nuclearfog/twidda/activity/MediaViewer.java

@@ -27,8 +27,8 @@ import org.nuclearfog.twidda.adapter.ImageAdapter.OnImageClickListener;
 import org.nuclearfog.twidda.backend.ImageLoader;
 import org.nuclearfog.twidda.backend.ImageSaver;
 import org.nuclearfog.twidda.backend.engine.EngineException;
-import org.nuclearfog.twidda.backend.helper.ErrorHandler;
 import org.nuclearfog.twidda.backend.holder.ImageHolder;
+import org.nuclearfog.twidda.backend.tools.ErrorHandler;
 import org.nuclearfog.zoomview.ZoomView;
 
 import static android.Manifest.permission.WRITE_EXTERNAL_STORAGE;

app/src/main/java/org/nuclearfog/twidda/activity/MessagePopup.java

@@ -23,9 +23,9 @@ import androidx.appcompat.app.AppCompatActivity;
 import org.nuclearfog.twidda.R;
 import org.nuclearfog.twidda.backend.MessageUploader;
 import org.nuclearfog.twidda.backend.engine.EngineException;
-import org.nuclearfog.twidda.backend.helper.ErrorHandler;
-import org.nuclearfog.twidda.backend.helper.FontTool;
 import org.nuclearfog.twidda.backend.holder.MessageHolder;
+import org.nuclearfog.twidda.backend.tools.ErrorHandler;
+import org.nuclearfog.twidda.backend.tools.FontTool;
 import org.nuclearfog.twidda.database.GlobalSettings;
 
 import static android.Manifest.permission.READ_EXTERNAL_STORAGE;

app/src/main/java/org/nuclearfog/twidda/activity/ProfileEditor.java

@@ -32,10 +32,10 @@ import com.squareup.picasso.Picasso;
 import org.nuclearfog.twidda.R;
 import org.nuclearfog.twidda.backend.ProfileUpdater;
 import org.nuclearfog.twidda.backend.engine.EngineException;
-import org.nuclearfog.twidda.backend.helper.ErrorHandler;
-import org.nuclearfog.twidda.backend.helper.FontTool;
 import org.nuclearfog.twidda.backend.holder.UserHolder;
 import org.nuclearfog.twidda.backend.items.TwitterUser;
+import org.nuclearfog.twidda.backend.tools.ErrorHandler;
+import org.nuclearfog.twidda.backend.tools.FontTool;
 import org.nuclearfog.twidda.database.GlobalSettings;
 
 import static android.Manifest.permission.READ_EXTERNAL_STORAGE;

app/src/main/java/org/nuclearfog/twidda/activity/TweetActivity.java

@@ -34,9 +34,9 @@ import org.nuclearfog.twidda.adapter.FragmentAdapter;
 import org.nuclearfog.twidda.backend.TweetLoader;
 import org.nuclearfog.twidda.backend.TweetLoader.Action;
 import org.nuclearfog.twidda.backend.engine.EngineException;
-import org.nuclearfog.twidda.backend.helper.ErrorHandler;
-import org.nuclearfog.twidda.backend.helper.FontTool;
 import org.nuclearfog.twidda.backend.items.Tweet;
+import org.nuclearfog.twidda.backend.tools.ErrorHandler;
+import org.nuclearfog.twidda.backend.tools.FontTool;
 import org.nuclearfog.twidda.database.GlobalSettings;
 
 import java.text.NumberFormat;

app/src/main/java/org/nuclearfog/twidda/activity/TweetPopup.java

@@ -27,9 +27,9 @@ import androidx.appcompat.app.AppCompatActivity;
 import org.nuclearfog.twidda.R;
 import org.nuclearfog.twidda.backend.TweetUploader;
 import org.nuclearfog.twidda.backend.engine.EngineException;
-import org.nuclearfog.twidda.backend.helper.ErrorHandler;
-import org.nuclearfog.twidda.backend.helper.FontTool;
 import org.nuclearfog.twidda.backend.holder.TweetHolder;
+import org.nuclearfog.twidda.backend.tools.ErrorHandler;
+import org.nuclearfog.twidda.backend.tools.FontTool;
 import org.nuclearfog.twidda.database.GlobalSettings;
 
 import java.util.LinkedList;
@@ -288,7 +288,7 @@ public class TweetPopup extends AppCompatActivity implements OnClickListener, Lo
 
 
     @Override
-    public void onLocationChanged(Location location) {
+    public void onLocationChanged(@NonNull Location location) {
         this.location = location;
         Toast.makeText(this, R.string.info_gps_attached, LENGTH_LONG).show();
         locationProg.setVisibility(INVISIBLE);
@@ -296,7 +296,7 @@ public class TweetPopup extends AppCompatActivity implements OnClickListener, Lo
     }
 
     @Override
-    public void onProviderDisabled(String provider) {
+    public void onProviderDisabled(@NonNull String provider) {
         if (location == null)
             Toast.makeText(this, R.string.error_gps, LENGTH_LONG).show();
         locationProg.setVisibility(INVISIBLE);
@@ -304,7 +304,7 @@ public class TweetPopup extends AppCompatActivity implements OnClickListener, Lo
     }
 
     @Override
-    public void onProviderEnabled(String provider) {
+    public void onProviderEnabled(@NonNull String provider) {
     }
 
     @Override

app/src/main/java/org/nuclearfog/twidda/activity/TwitterList.java

@@ -10,7 +10,7 @@ import androidx.viewpager.widget.ViewPager;
 
 import org.nuclearfog.twidda.R;
 import org.nuclearfog.twidda.adapter.FragmentAdapter;
-import org.nuclearfog.twidda.backend.helper.FontTool;
+import org.nuclearfog.twidda.backend.tools.FontTool;
 import org.nuclearfog.twidda.database.GlobalSettings;
 
 /**

app/src/main/java/org/nuclearfog/twidda/activity/UserDetail.java

@@ -10,7 +10,7 @@ import androidx.viewpager.widget.ViewPager;
 
 import org.nuclearfog.twidda.R;
 import org.nuclearfog.twidda.adapter.FragmentAdapter;
-import org.nuclearfog.twidda.backend.helper.FontTool;
+import org.nuclearfog.twidda.backend.tools.FontTool;
 import org.nuclearfog.twidda.database.GlobalSettings;
 
 /**

app/src/main/java/org/nuclearfog/twidda/activity/UserProfile.java

@@ -35,10 +35,10 @@ import org.nuclearfog.twidda.R;
 import org.nuclearfog.twidda.adapter.FragmentAdapter;
 import org.nuclearfog.twidda.backend.ProfileLoader;
 import org.nuclearfog.twidda.backend.engine.EngineException;
-import org.nuclearfog.twidda.backend.helper.ErrorHandler;
-import org.nuclearfog.twidda.backend.helper.FontTool;
 import org.nuclearfog.twidda.backend.items.TwitterUser;
 import org.nuclearfog.twidda.backend.items.UserRelation;
+import org.nuclearfog.twidda.backend.tools.ErrorHandler;
+import org.nuclearfog.twidda.backend.tools.FontTool;
 import org.nuclearfog.twidda.database.GlobalSettings;
 
 import java.text.NumberFormat;

app/src/main/java/org/nuclearfog/twidda/adapter/ListAdapter.java

@@ -16,9 +16,9 @@ import androidx.recyclerview.widget.RecyclerView.ViewHolder;
 import com.squareup.picasso.Picasso;
 
 import org.nuclearfog.twidda.R;
-import org.nuclearfog.twidda.backend.helper.FontTool;
 import org.nuclearfog.twidda.backend.items.TwitterList;
 import org.nuclearfog.twidda.backend.items.TwitterUser;
+import org.nuclearfog.twidda.backend.tools.FontTool;
 import org.nuclearfog.twidda.database.GlobalSettings;
 
 import java.text.NumberFormat;
@@ -28,7 +28,7 @@ import java.util.List;
 import static android.view.View.GONE;
 import static android.view.View.VISIBLE;
 import static androidx.recyclerview.widget.RecyclerView.NO_POSITION;
-import static org.nuclearfog.twidda.backend.helper.TimeString.getTimeString;
+import static org.nuclearfog.twidda.backend.tools.TimeString.getTimeString;
 
 /**
  * Adapter class for user lists

app/src/main/java/org/nuclearfog/twidda/adapter/MessageAdapter.java

@@ -20,16 +20,16 @@ import com.squareup.picasso.Picasso;
 import org.nuclearfog.tag.Tagger;
 import org.nuclearfog.tag.Tagger.OnTagClickListener;
 import org.nuclearfog.twidda.R;
-import org.nuclearfog.twidda.backend.helper.FontTool;
 import org.nuclearfog.twidda.backend.items.Message;
 import org.nuclearfog.twidda.backend.items.TwitterUser;
+import org.nuclearfog.twidda.backend.tools.FontTool;
 import org.nuclearfog.twidda.database.GlobalSettings;
 
 import java.util.ArrayList;
 import java.util.List;
 
 import static androidx.recyclerview.widget.RecyclerView.NO_POSITION;
-import static org.nuclearfog.twidda.backend.helper.TimeString.getTimeString;
+import static org.nuclearfog.twidda.backend.tools.TimeString.getTimeString;
 
 /**
  * Adapter class for direct messages list

app/src/main/java/org/nuclearfog/twidda/adapter/TrendAdapter.java

@@ -13,8 +13,8 @@ import androidx.recyclerview.widget.RecyclerView.Adapter;
 import androidx.recyclerview.widget.RecyclerView.ViewHolder;
 
 import org.nuclearfog.twidda.R;
-import org.nuclearfog.twidda.backend.helper.FontTool;
 import org.nuclearfog.twidda.backend.items.TwitterTrend;
+import org.nuclearfog.twidda.backend.tools.FontTool;
 import org.nuclearfog.twidda.database.GlobalSettings;
 
 import java.text.NumberFormat;

app/src/main/java/org/nuclearfog/twidda/adapter/TweetAdapter.java

@@ -20,9 +20,9 @@ import com.squareup.picasso.Picasso;
 
 import org.nuclearfog.tag.Tagger;
 import org.nuclearfog.twidda.R;
-import org.nuclearfog.twidda.backend.helper.FontTool;
 import org.nuclearfog.twidda.backend.items.Tweet;
 import org.nuclearfog.twidda.backend.items.TwitterUser;
+import org.nuclearfog.twidda.backend.tools.FontTool;
 import org.nuclearfog.twidda.database.GlobalSettings;
 
 import java.text.NumberFormat;
@@ -33,7 +33,7 @@ import static android.view.View.INVISIBLE;
 import static android.view.View.VISIBLE;
 import static androidx.recyclerview.widget.RecyclerView.NO_ID;
 import static androidx.recyclerview.widget.RecyclerView.NO_POSITION;
-import static org.nuclearfog.twidda.backend.helper.TimeString.getTimeString;
+import static org.nuclearfog.twidda.backend.tools.TimeString.getTimeString;
 
 /**
  * Adapter class for tweet list

app/src/main/java/org/nuclearfog/twidda/adapter/UserAdapter.java

@@ -18,9 +18,9 @@ import androidx.recyclerview.widget.RecyclerView.ViewHolder;
 import com.squareup.picasso.Picasso;
 
 import org.nuclearfog.twidda.R;
-import org.nuclearfog.twidda.backend.helper.FontTool;
 import org.nuclearfog.twidda.backend.holder.UserListHolder;
 import org.nuclearfog.twidda.backend.items.TwitterUser;
+import org.nuclearfog.twidda.backend.tools.FontTool;
 import org.nuclearfog.twidda.database.GlobalSettings;
 
 import java.util.ArrayList;

app/src/main/java/org/nuclearfog/twidda/backend/ImageLoader.java

@@ -37,6 +37,7 @@ public class ImageLoader extends AsyncTask<String, ImageHolder, Boolean> {
      * @param callback Activity context
      */
     public ImageLoader(@NonNull MediaViewer callback) {
+        super();
         this.callback = new WeakReference<>(callback);
         mTwitter = TwitterEngine.getInstance(callback);
         Point displaySize = new Point();

app/src/main/java/org/nuclearfog/twidda/backend/ImageSaver.java

@@ -30,6 +30,7 @@ public class ImageSaver extends AsyncTask<Void, Void, ImageSaver.ImageStat> {
 
 
     public ImageSaver(MediaViewer activity, Bitmap image, String link) {
+        super();
         this.callback = new WeakReference<>(activity);
         this.image = image;
         this.link = link;

app/src/main/java/org/nuclearfog/twidda/backend/LinkContentLoader.java

@@ -40,6 +40,7 @@ public class LinkContentLoader extends AsyncTask<Uri, Integer, LinkContentLoader
     private WeakReference<MainActivity> callback;
 
     public LinkContentLoader(MainActivity callback) {
+        super();
         this.callback = new WeakReference<>(callback);
     }
 

app/src/main/java/org/nuclearfog/twidda/backend/LocationListLoader.java

@@ -25,6 +25,7 @@ public class LocationListLoader extends AsyncTask<Void, Void, List<TrendLocation
 
 
     public LocationListLoader(AppSettings callback) {
+        super();
         this.callback = new WeakReference<>(callback);
         mTwitter = TwitterEngine.getInstance(callback);
     }

app/src/main/java/org/nuclearfog/twidda/backend/MessageListLoader.java

@@ -36,6 +36,7 @@ public class MessageListLoader extends AsyncTask<Long, Long, List<Message>> {
 
 
     public MessageListLoader(MessageFragment callback, Action action) {
+        super();
         this.callback = new WeakReference<>(callback);
         db = new AppDatabase(callback.getContext());
         mTwitter = TwitterEngine.getInstance(callback.getContext());

app/src/main/java/org/nuclearfog/twidda/backend/MessageUploader.java

@@ -31,6 +31,7 @@ public class MessageUploader extends AsyncTask<Void, Void, Boolean> {
      * @param message message to send
      */
     public MessageUploader(@NonNull MessagePopup callback, MessageHolder message) {
+        super();
         mTwitter = TwitterEngine.getInstance(callback);
         this.callback = new WeakReference<>(callback);
         this.message = message;

app/src/main/java/org/nuclearfog/twidda/backend/ProfileLoader.java

@@ -36,6 +36,7 @@ public class ProfileLoader extends AsyncTask<Object, TwitterUser, UserRelation>
 
 
     public ProfileLoader(UserProfile callback, Action action) {
+        super();
         this.callback = new WeakReference<>(callback);
         mTwitter = TwitterEngine.getInstance(callback);
         db = new AppDatabase(callback);

app/src/main/java/org/nuclearfog/twidda/backend/ProfileUpdater.java

@@ -29,6 +29,7 @@ public class ProfileUpdater extends AsyncTask<Void, Void, TwitterUser> {
 
 
     public ProfileUpdater(ProfileEditor callback) {
+        super();
         this.callback = new WeakReference<>(callback);
         mTwitter = TwitterEngine.getInstance(callback);
         db = new AppDatabase(callback);

app/src/main/java/org/nuclearfog/twidda/backend/Registration.java

@@ -28,6 +28,7 @@ public class Registration extends AsyncTask<String, Void, String> {
      * @param callback Activity Context
      */
     public Registration(LoginActivity callback) {
+        super();
         this.callback = new WeakReference<>(callback);
         mTwitter = TwitterEngine.getInstance(callback);
     }

app/src/main/java/org/nuclearfog/twidda/backend/TrendListLoader.java

@@ -30,6 +30,7 @@ public class TrendListLoader extends AsyncTask<Integer, Void, List<TwitterTrend>
 
 
     public TrendListLoader(TrendFragment callback) {
+        super();
         this.callback = new WeakReference<>(callback);
         db = new AppDatabase(callback.getContext());
         mTwitter = TwitterEngine.getInstance(callback.getContext());

app/src/main/java/org/nuclearfog/twidda/backend/TweetListLoader.java

@@ -48,6 +48,7 @@ public class TweetListLoader extends AsyncTask<Long, Void, List<Tweet>> {
 
 
     public TweetListLoader(TweetFragment callback, Action action, long id, String search, int pos) {
+        super();
         this.callback = new WeakReference<>(callback);
         db = new AppDatabase(callback.getContext());
         mTwitter = TwitterEngine.getInstance(callback.getContext());

app/src/main/java/org/nuclearfog/twidda/backend/TweetLoader.java

@@ -36,6 +36,7 @@ public class TweetLoader extends AsyncTask<Long, Tweet, Tweet> {
 
 
     public TweetLoader(TweetActivity callback, Action action) {
+        super();
         mTwitter = TwitterEngine.getInstance(callback);
         db = new AppDatabase(callback);
         this.callback = new WeakReference<>(callback);

app/src/main/java/org/nuclearfog/twidda/backend/TweetUploader.java

@@ -30,6 +30,7 @@ public class TweetUploader extends AsyncTask<Void, Void, Boolean> {
      * @param tweet    tweet information
      */
     public TweetUploader(TweetPopup callback, TweetHolder tweet) {
+        super();
         this.callback = new WeakReference<>(callback);
         mTwitter = TwitterEngine.getInstance(callback);
         this.tweet = tweet;

app/src/main/java/org/nuclearfog/twidda/backend/TwitterListLoader.java

@@ -34,6 +34,7 @@ public class TwitterListLoader extends AsyncTask<Object, TwitterList, List<Twitt
 
 
     public TwitterListLoader(ListFragment callback, Action action) {
+        super();
         mTwitter = TwitterEngine.getInstance(callback.getContext());
         this.callback = new WeakReference<>(callback);
         this.action = action;

app/src/main/java/org/nuclearfog/twidda/backend/UserListLoader.java

@@ -42,6 +42,7 @@ public class UserListLoader extends AsyncTask<Void, Void, UserListHolder> {
 
 
     public UserListLoader(UserFragment callback, Action action, long id, long cursor, String search) {
+        super();
         this.callback = new WeakReference<>(callback);
         mTwitter = TwitterEngine.getInstance(callback.getContext());
         this.action = action;

app/src/main/java/org/nuclearfog/twidda/backend/tools/ErrorHandler.java

@@ -1,4 +1,4 @@
-package org.nuclearfog.twidda.backend.helper;
+package org.nuclearfog.twidda.backend.tools;
 
 import android.content.Context;
 import android.widget.Toast;

app/src/main/java/org/nuclearfog/twidda/backend/tools/FontTool.java

@@ -1,4 +1,4 @@
-package org.nuclearfog.twidda.backend.helper;
+package org.nuclearfog.twidda.backend.tools;
 
 import android.view.View;
 import android.view.ViewGroup;

app/src/main/java/org/nuclearfog/twidda/backend/tools/TimeString.java

@@ -1,4 +1,4 @@
-package org.nuclearfog.twidda.backend.helper;
+package org.nuclearfog.twidda.backend.tools;
 
 import java.text.SimpleDateFormat;
 import java.util.Date;

app/src/main/java/org/nuclearfog/twidda/fragment/ListFragment.java

@@ -25,8 +25,8 @@ import org.nuclearfog.twidda.adapter.ListAdapter;
 import org.nuclearfog.twidda.adapter.ListAdapter.ListClickListener;
 import org.nuclearfog.twidda.backend.TwitterListLoader;
 import org.nuclearfog.twidda.backend.engine.EngineException;
-import org.nuclearfog.twidda.backend.helper.ErrorHandler;
 import org.nuclearfog.twidda.backend.items.TwitterList;
+import org.nuclearfog.twidda.backend.tools.ErrorHandler;
 import org.nuclearfog.twidda.database.GlobalSettings;
 
 import java.util.List;

app/src/main/java/org/nuclearfog/twidda/fragment/MessageFragment.java

@@ -29,8 +29,8 @@ import org.nuclearfog.twidda.adapter.MessageAdapter.OnItemSelected;
 import org.nuclearfog.twidda.backend.MessageListLoader;
 import org.nuclearfog.twidda.backend.TrendListLoader;
 import org.nuclearfog.twidda.backend.engine.EngineException;
-import org.nuclearfog.twidda.backend.helper.ErrorHandler;
 import org.nuclearfog.twidda.backend.items.Message;
+import org.nuclearfog.twidda.backend.tools.ErrorHandler;
 import org.nuclearfog.twidda.database.GlobalSettings;
 
 import java.util.List;

app/src/main/java/org/nuclearfog/twidda/fragment/TrendFragment.java

@@ -21,8 +21,8 @@ import org.nuclearfog.twidda.adapter.TrendAdapter;
 import org.nuclearfog.twidda.adapter.TrendAdapter.TrendClickListener;
 import org.nuclearfog.twidda.backend.TrendListLoader;
 import org.nuclearfog.twidda.backend.engine.EngineException;
-import org.nuclearfog.twidda.backend.helper.ErrorHandler;
 import org.nuclearfog.twidda.backend.items.TwitterTrend;
+import org.nuclearfog.twidda.backend.tools.ErrorHandler;
 import org.nuclearfog.twidda.database.GlobalSettings;
 
 import java.util.List;

app/src/main/java/org/nuclearfog/twidda/fragment/TweetFragment.java

@@ -22,8 +22,8 @@ import org.nuclearfog.twidda.adapter.TweetAdapter.TweetClickListener;
 import org.nuclearfog.twidda.backend.TweetListLoader;
 import org.nuclearfog.twidda.backend.TweetListLoader.Action;
 import org.nuclearfog.twidda.backend.engine.EngineException;
-import org.nuclearfog.twidda.backend.helper.ErrorHandler;
 import org.nuclearfog.twidda.backend.items.Tweet;
+import org.nuclearfog.twidda.backend.tools.ErrorHandler;
 import org.nuclearfog.twidda.database.GlobalSettings;
 
 import java.util.List;

app/src/main/java/org/nuclearfog/twidda/fragment/UserFragment.java

@@ -22,9 +22,9 @@ import org.nuclearfog.twidda.adapter.UserAdapter.UserClickListener;
 import org.nuclearfog.twidda.backend.UserListLoader;
 import org.nuclearfog.twidda.backend.UserListLoader.Action;
 import org.nuclearfog.twidda.backend.engine.EngineException;
-import org.nuclearfog.twidda.backend.helper.ErrorHandler;
 import org.nuclearfog.twidda.backend.holder.UserListHolder;
 import org.nuclearfog.twidda.backend.items.TwitterUser;
+import org.nuclearfog.twidda.backend.tools.ErrorHandler;
 import org.nuclearfog.twidda.database.GlobalSettings;
 
 import static android.os.AsyncTask.Status.FINISHED;

app/src/main/res/drawable/copy.xml

@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="20.0"
-    android:viewportHeight="20.0">
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M11,0H3C2.447,0 2,0.447 2,1v12c0,0.552 0.447,1 1,1h5v2h2v-2H8.001v-2H10v-2H8v2H4V2h6v4h2V1C12,0.448 11.553,0 11,0zM8,7v1h2V6H9C8.447,6 8,6.447 8,7zM12,20h2v-2h-2V20zM12,8h2V6h-2V8zM8,19c0,0.552 0.447,1 1,1h1v-2H8V19zM17,6h-1v2h2V7C18,6.448 17.553,6 17,6zM16,20h1c0.553,0 1,-0.448 1,-1v-1h-2V20zM16,12h2v-2h-2V12zM16,16h2v-2h-2V16z" />
-</vector>

app/src/main/res/layout/page_login.xml

@@ -19,24 +19,56 @@
         android:gravity="center"
         android:orientation="vertical">
 
-        <Button
+        <View
-            android:id="@+id/linkButton"
+            android:layout_width="match_parent"
-            style="@style/Widget.AppCompat.Button.Borderless"
+            android:layout_height="0dp"
-            android:layout_width="wrap_content"
+            android:layout_weight="1" />
+
+        <LinearLayout
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginBottom="@dimen/loginpage_button_margin"
+            android:gravity="center"
-            android:background="@drawable/button"
+            android:orientation="horizontal">
-            android:paddingLeft="@dimen/loginpage_button_padding"
+
-            android:paddingRight="@dimen/loginpage_button_padding"
+            <TextView
-            android:text="@string/register_link"
+                android:layout_width="wrap_content"
-            android:textSize="@dimen/loginpage_textsize_button" />
+                android:layout_height="wrap_content"
+                android:layout_marginRight="@dimen/loginpage_number_padding"
+                android:layout_marginEnd="@dimen/loginpage_number_padding"
+                android:text="@string/login_first_opt"
+                android:textSize="24sp" />
+
+            <Button
+                android:id="@+id/linkButton"
+                style="@style/Widget.AppCompat.Button.Borderless"
+                android:layout_width="wrap_content"
+                android:layout_height="@dimen/loginpage_button_size"
+                android:background="@drawable/button"
+                android:paddingLeft="@dimen/loginpage_button_padding"
+                android:paddingRight="@dimen/loginpage_button_padding"
+                android:text="@string/register_link"
+                android:textSize="@dimen/loginpage_textsize_button" />
+        </LinearLayout>
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_weight="1" />
 
         <LinearLayout
             android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+            android:layout_height="@dimen/loginpage_button_size"
             android:gravity="center_vertical"
             android:orientation="horizontal">
 
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginRight="@dimen/loginpage_number_padding"
+                android:layout_marginEnd="@dimen/loginpage_number_padding"
+                android:text="@string/login_sec_opt"
+                android:textSize="24sp" />
+
             <EditText
                 android:id="@+id/pin"
                 android:layout_width="wrap_content"
@@ -47,24 +79,47 @@
                 android:inputType="numberPassword"
                 android:singleLine="true"
                 android:textSize="@dimen/loginpage_textsize_login_key"
-                app:drawableEndCompat="@drawable/copy"
                 app:drawableLeftCompat="@drawable/key"
-                app:drawableRightCompat="@drawable/copy"
+                app:drawableStartCompat="@drawable/key"
-                app:drawableStartCompat="@drawable/key" />
+                android:autofillHints="pin" />
 
         </LinearLayout>
 
-        <Button
+        <View
-            android:id="@+id/verifier"
+            android:layout_width="match_parent"
-            style="@style/Widget.AppCompat.Button.Borderless"
+            android:layout_height="0dp"
-            android:layout_width="wrap_content"
+            android:layout_weight="1" />
+
+        <LinearLayout
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_margin="@dimen/loginpage_button_size"
+            android:gravity="center"
-            android:background="@drawable/button"
+            android:orientation="horizontal">
-            android:paddingLeft="@dimen/loginpage_button_padding"
+
-            android:paddingRight="@dimen/loginpage_button_padding"
+            <TextView
-            android:text="@string/login_verifier"
+                android:layout_width="wrap_content"
-            android:textSize="@dimen/loginpage_textsize_button" />
+                android:layout_height="wrap_content"
+                android:layout_marginRight="@dimen/loginpage_number_padding"
+                android:layout_marginEnd="@dimen/loginpage_number_padding"
+                android:text="@string/login_thr_opt"
+                android:textSize="24sp" />
+
+            <Button
+                android:id="@+id/verifier"
+                style="@style/Widget.AppCompat.Button.Borderless"
+                android:layout_width="wrap_content"
+                android:layout_height="@dimen/loginpage_button_size"
+                android:background="@drawable/button"
+                android:paddingLeft="@dimen/loginpage_button_padding"
+                android:paddingRight="@dimen/loginpage_button_padding"
+                android:text="@string/login_verifier"
+                android:textSize="@dimen/loginpage_textsize_button" />
+        </LinearLayout>
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_weight="1" />
 
     </LinearLayout>
 

app/src/main/res/values-de-rDE/strings.xml

@@ -151,4 +151,5 @@
     <string name="tweet_sensitive_media">sensible inhalte</string>
     <string name="error_image_exists">Fehler, Bild ist bereits vorhanden!</string>
     <string name="info_phone_tls_support">TLS 1.2 wird nicht unterstützt. Die App wird möglicherweise nicht funktionieren!</string>
+    <string name="login_info">3 Schritte zum Login</string>
 </resources>

app/src/main/res/values/dimens.xml

@@ -120,12 +120,12 @@
 
     <!--dimens of page_login.xml-->
     <dimen name="loginpage_toolbar_height">@dimen/toolbar_height</dimen>
-    <dimen name="loginpage_button_margin">40dp</dimen>
     <dimen name="loginpage_button_padding">24dp</dimen>
     <dimen name="loginpage_button_size">40dp</dimen>
     <dimen name="loginpage_textsize_button">14sp</dimen>
     <dimen name="loginpage_padding_drawable">5dp</dimen>
     <dimen name="loginpage_textsize_login_key">24sp</dimen>
+    <dimen name="loginpage_number_padding">10dp</dimen>
 
     <!--dimens of popup_tweet.xml-->
     <dimen name="tweetpopup_margin_layout">5dp</dimen>

app/src/main/res/values/strings.xml

@@ -154,4 +154,8 @@
     <string name="tweet_sensitive_media">sensitive media</string>
     <string name="error_image_exists">Error, image already exists!</string>
     <string name="info_phone_tls_support">Phone does not support TLS 1.2. App will probably not work!</string>
+    <string name="login_info">3 steps to login</string>
+    <string name="login_first_opt" translatable="false">1.</string>
+    <string name="login_sec_opt" translatable="false">2.</string>
+    <string name="login_thr_opt" translatable="false">3.</string>
 </resources>