diff --git a/README.md b/README.md new file mode 100644 index 0000000..3e949e7 --- /dev/null +++ b/README.md @@ -0,0 +1,2 @@ +## NitterizeMe + diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index a8981fa..2d9a98a 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -75,6 +75,12 @@ android:host="youtube-nocookie.com" /> + + \ No newline at end of file diff --git a/app/src/main/ic_launcher-web.png b/app/src/main/ic_launcher-web.png new file mode 100644 index 0000000..bb93f1f Binary files /dev/null and b/app/src/main/ic_launcher-web.png differ diff --git a/app/src/main/java/app/fedilab/nitterizeme/MainActivity.java b/app/src/main/java/app/fedilab/nitterizeme/MainActivity.java index 5ce0492..67a4b86 100644 --- a/app/src/main/java/app/fedilab/nitterizeme/MainActivity.java +++ b/app/src/main/java/app/fedilab/nitterizeme/MainActivity.java @@ -13,6 +13,9 @@ package app.fedilab.nitterizeme; * * You should have received a copy of the GNU General Public License along with NitterizeMe; if not, * see . */ +import android.content.Context; +import android.content.Intent; +import android.content.SharedPreferences; import android.os.Bundle; @@ -21,6 +24,13 @@ import androidx.appcompat.widget.Toolbar; import android.view.Menu; import android.view.MenuItem; +import android.view.View; +import android.widget.Button; + +import com.google.android.material.snackbar.Snackbar; +import com.google.android.material.textfield.TextInputEditText; + +import java.util.Objects; public class MainActivity extends AppCompatActivity { @@ -29,7 +39,7 @@ public class MainActivity extends AppCompatActivity { public static String SET_NITTER_HOST = "set_nitter_host"; public static String DEFAULT_NITTER_HOST = "nitter.net"; public static String SET_INVIDIOUS_HOST = "set_invidious_host"; - public static String DEFAULT_INVIDIOUS_HOST = "invidious.net"; + public static String DEFAULT_INVIDIOUS_HOST = "invidio.us"; public static final String APP_PREFS = "app_prefs"; @Override @@ -38,7 +48,40 @@ public class MainActivity extends AppCompatActivity { setContentView(R.layout.activity_main); Toolbar toolbar = findViewById(R.id.toolbar); setSupportActionBar(toolbar); + Objects.requireNonNull(getSupportActionBar()).setDisplayShowHomeEnabled(true); + getSupportActionBar().setDisplayHomeAsUpEnabled(true); + SharedPreferences sharedpreferences = getSharedPreferences(APP_PREFS, Context.MODE_PRIVATE); + + TextInputEditText nitter_instance = findViewById(R.id.nitter_instance); + TextInputEditText invidious_instance = findViewById(R.id.invidious_instance); + Button button_save = findViewById(R.id.button_save); + + String nitterHost = sharedpreferences.getString(SET_NITTER_HOST, null); + String invidiousHost = sharedpreferences.getString(SET_INVIDIOUS_HOST, null); + if(nitterHost!=null) { + nitter_instance.setText(nitterHost); + } + if(invidiousHost!=null) { + invidious_instance.setText(invidiousHost); + } + button_save.setOnClickListener(v -> { + SharedPreferences.Editor editor = sharedpreferences.edit(); + if (nitter_instance.getText() != null && nitter_instance.getText().toString().trim().length() > 0) { + editor.putString(SET_NITTER_HOST, nitter_instance.getText().toString().toLowerCase().trim()); + } else { + editor.putString(SET_NITTER_HOST, null); + } + editor.apply(); + if (invidious_instance.getText() != null && invidious_instance.getText().toString().trim().length() > 0) { + editor.putString(SET_INVIDIOUS_HOST, invidious_instance.getText().toString().toLowerCase().trim()); + } else { + editor.putString(SET_INVIDIOUS_HOST, null); + } + editor.apply(); + View parentLayout = findViewById(android.R.id.content); + Snackbar.make(parentLayout, R.string.instances_saved, Snackbar.LENGTH_LONG).show(); + }); } @Override @@ -57,7 +100,11 @@ public class MainActivity extends AppCompatActivity { //noinspection SimplifiableIfStatement if (id == R.id.action_about) { + Intent intent = new Intent(MainActivity.this, AboutActivity.class); + startActivity(intent); return true; + }else if(id == android.R.id.home){ + finish(); } return super.onOptionsItemSelected(item); diff --git a/app/src/main/java/app/fedilab/nitterizeme/TransformActivity.java b/app/src/main/java/app/fedilab/nitterizeme/TransformActivity.java index 7c9cbca..6608ae6 100644 --- a/app/src/main/java/app/fedilab/nitterizeme/TransformActivity.java +++ b/app/src/main/java/app/fedilab/nitterizeme/TransformActivity.java @@ -18,7 +18,6 @@ import android.content.Intent; import android.content.SharedPreferences; import android.net.Uri; import android.os.Bundle; -import android.util.Log; import androidx.appcompat.app.AppCompatActivity; @@ -61,7 +60,6 @@ public class TransformActivity extends AppCompatActivity { } } } - Log.v(MainActivity.TAG,"newUrl: " + newUrl); Intent delegate = new Intent(Intent.ACTION_VIEW); delegate.setData(Uri.parse(newUrl)); delegate.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK); diff --git a/app/src/main/res/drawable/ic_launcher_foreground.xml b/app/src/main/res/drawable/ic_launcher_foreground.xml new file mode 100644 index 0000000..03f10d4 --- /dev/null +++ b/app/src/main/res/drawable/ic_launcher_foreground.xml @@ -0,0 +1,13 @@ + + + + + diff --git a/app/src/main/res/layout/activity_about.xml b/app/src/main/res/layout/activity_about.xml index caf494b..7902d27 100644 --- a/app/src/main/res/layout/activity_about.xml +++ b/app/src/main/res/layout/activity_about.xml @@ -24,8 +24,6 @@ android:layout_margin="@dimen/fab_margin" tools:context=".AboutActivity"> - + app:layout_constraintTop_toTopOf="parent"> + + + + + + + + + + + +