Mastodon/nextpush-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove SettingsActivity

Browse Source
This commit is contained in:
S1m 2021-11-23 08:19:16 +01:00
parent 82095e1284
commit 4cc86f6d21
6 changed files with 0 additions and 180 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/AndroidManifest.xml
View File

@ -15,10 +15,6 @@
android:supportsRtl="true"
android:theme="@style/Theme.NextPush"
android:networkSecurityConfig="@xml/network_security_config">
<activity
android:name=".activities.SettingsActivity"
android:label="@string/action_settings"
android:parentActivityName=".activities.MainActivity" />
<activity
android:name=".activities.MainActivity"
android:label="@string/app_name"

5
app/src/main/java/org/unifiedpush/distributor/nextpush/activities/MainActivity.kt
View File

@ -126,11 +126,6 @@ class MainActivity : AppCompatActivity() {
override fun onOptionsItemSelected(item: MenuItem): Boolean {
return when (item.itemId) {
R.id.action_settings -> {
val intent = Intent(this, SettingsActivity::class.java)
startActivity(intent)
return true
}
R.id.action_restart -> {
restart()
return true

48
app/src/main/java/org/unifiedpush/distributor/nextpush/activities/SettingsActivity.kt
View File

@ -1,48 +0,0 @@
package org.unifiedpush.distributor.nextpush.activities
import android.content.Context
import android.content.Intent
import android.content.SharedPreferences
import androidx.appcompat.app.AppCompatActivity
import android.os.Bundle
import android.util.Log
import android.view.View
import android.widget.EditText
import org.unifiedpush.distributor.nextpush.R
import org.unifiedpush.distributor.nextpush.distributor.MessagingDatabase
import org.unifiedpush.distributor.nextpush.distributor.getEndpoint
import org.unifiedpush.distributor.nextpush.distributor.sendEndpoint
class SettingsActivity : AppCompatActivity() {
private var prefs: SharedPreferences? = null
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
prefs = getSharedPreferences("Config", Context.MODE_PRIVATE)
setContentView(R.layout.activity_settings)
val address = prefs?.getString("address", "")
val proxy = prefs?.getString("proxy", "")
findViewById<EditText>(R.id.settings_address_value).setText(address)
findViewById<EditText>(R.id.settings_proxy_value).setText(proxy)
val btn = findViewById<View>(R.id.settings_save_button)
btn.setOnClickListener { v -> save(v) }
}
fun save(view: View){
val address = findViewById<EditText>(R.id.settings_address_value).text.toString()
val proxy = findViewById<EditText>(R.id.settings_proxy_value).text.toString()
Log.i("save",address)
val editor = prefs!!.edit()
editor.putString("address", address)
editor.putString("proxy", proxy)
editor.commit()
val db = MessagingDatabase(this)
val tokenList = db.listTokens()
db.close()
tokenList.forEach {
sendEndpoint(this, it)
}
val intent = Intent(this, MainActivity::class.java)
startActivity(intent)
}
}

110
app/src/main/res/layout/activity_settings.xml
View File

@ -1,110 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context="org.unifiedpush.distributor.nextpush.activities.SettingsActivity">
<TextView
android:id="@+id/settings_address_label"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginTop="16dp"
android:text="@string/settings_address_label"
android:textAppearance="@style/TextAppearance.AppCompat.Body1"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<EditText
android:id="@+id/settings_address_value"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginTop="16dp"
android:layout_marginEnd="16dp"
android:ems="10"
android:hint="@string/settings_address_hint"
android:inputType="textPersonName"
android:minHeight="48dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/textView" />
<TextView
android:id="@+id/settings_address_help"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="32dp"
android:clickable="true"
android:focusable="true"
android:text="@string/help"
android:textAppearance="@style/TextAppearance.AppCompat.Body1"
app:layout_constraintBottom_toBottomOf="@+id/settings_address_value"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="@+id/settings_address_value" />
<TextView
android:id="@+id/settings_gateway_label"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginTop="16dp"
android:text="@string/settings_gateway_label"
android:textAppearance="@style/TextAppearance.AppCompat.Body1"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/settings_address_value" />
<EditText
android:id="@+id/settings_proxy_value"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginTop="16dp"
android:layout_marginEnd="16dp"
android:ems="10"
android:hint="@string/settings_gateway_hint"
android:inputType="textPersonName"
android:minHeight="48dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/textView2" />
<Button
android:id="@+id/settings_save_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:text="@string/settings_save_button"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/settings_proxy_value" />
<TextView
android:id="@+id/textView"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginTop="8dp"
android:layout_marginEnd="16dp"
android:text="@string/settings_address_information"
android:textAppearance="@style/TextAppearance.AppCompat.Small"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/settings_address_label" />
<TextView
android:id="@+id/textView2"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginTop="8dp"
android:layout_marginEnd="16dp"
android:text="@string/settings_gateway_information"
android:textAppearance="@style/TextAppearance.AppCompat.Small"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/settings_gateway_label" />
</androidx.constraintlayout.widget.ConstraintLayout>

5
app/src/main/res/menu/menu_main.xml
View File

@ -2,11 +2,6 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
tools:context="org.unifiedpush.distributor.nextpush.activities.MainActivity">
<item
android:id="@+id/action_settings"
android:orderInCategory="100"
android:title="@string/action_settings"
app:showAsAction="never" />
<item
android:id="@+id/action_restart"
android:orderInCategory="100"

8
app/src/main/res/values/strings.xml
View File

@ -4,14 +4,6 @@
<!-- Strings used on the main page -->
<string name="main_applications_title">Registered applications</string>
<!-- Strings used for configuration -->
<string name="settings_address_label">Your address</string>
<string name="settings_address_information">This is your static address on your custom network. It is necessary to know where to forward the notifications.</string>
<string name="settings_address_hint">[::1]</string>
<string name="settings_gateway_label">Your proxy</string>
<string name="settings_gateway_information">This is the proxy to forward requests inside your custom network, to reach your phone from the Internet.</string>
<string name="settings_gateway_hint">https://proxy.example.tld</string>
<string name="settings_save_button">Save</string>
<string name="help"></string>
<string name="listening_notif_description">Listening incoming notifications</string>
<string name="connection_button">Login</string>