Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 87275580 authored by Philipp Heckel's avatar Philipp Heckel
Browse files

More styling

parent d2f04323

app/src/main/AndroidManifest.xml

+3 −1
Original line number Diff line number Diff line
@@ -11,7 +11,9 @@ 
        android:roundIcon="@mipmap/ic_launcher_round"

        android:supportsRtl="true"

        android:theme="@style/AppTheme">

        <activity android:name="io.heckel.ntfy.ui.MainActivity">

        <activity android:name="io.heckel.ntfy.ui.MainActivity"

                  android:icon="@drawable/ntfy"

                  android:label="@string/main_action_bar_label">

            <intent-filter>

                <action android:name="android.intent.action.MAIN" />

                <category android:name="android.intent.category.LAUNCHER" />

app/src/main/java/io/heckel/ntfy/ui/AddFragment.kt

+2 −2
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ class AddFragment(private val listener: Listener) : DialogFragment() { 
    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {

        return activity?.let {

            // Build root view

            val view = requireActivity().layoutInflater.inflate(R.layout.fragment_add, null)

            val view = requireActivity().layoutInflater.inflate(R.layout.add_dialog_fragment, null)

            val topicNameText = view.findViewById(R.id.add_dialog_topic_text) as TextInputEditText

            val baseUrlText = view.findViewById(R.id.add_dialog_base_url_text) as TextInputEditText

            val useAnotherServerCheckbox = view.findViewById(R.id.add_dialog_use_another_server_checkbox) as CheckBox
@@ -72,7 +72,7 @@ class AddFragment(private val listener: Listener) : DialogFragment() { 
                }

                topicNameText.addTextChangedListener(textWatcher)

                baseUrlText.addTextChangedListener(textWatcher)

                useAnotherServerCheckbox.setOnCheckedChangeListener { buttonView, isChecked ->

                useAnotherServerCheckbox.setOnCheckedChangeListener { _, isChecked ->

                    if (isChecked) baseUrlText.visibility = View.VISIBLE

                    else baseUrlText.visibility = View.GONE

                    validateInput()

app/src/main/java/io/heckel/ntfy/ui/DetailActivity.kt

+1 −1
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ class DetailActivity : AppCompatActivity() { 


    override fun onCreate(savedInstanceState: Bundle?) {

        super.onCreate(savedInstanceState)

        setContentView(R.layout.topic_detail_activity)

        setContentView(R.layout.detail_activity)



        var subscriptionId: Long? = null

app/src/main/java/io/heckel/ntfy/ui/MainActivity.kt

+3 −3
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ class MainActivity : AppCompatActivity(), AddFragment.Listener { 


    override fun onCreate(savedInstanceState: Bundle?) {

        super.onCreate(savedInstanceState)

        setContentView(R.layout.activity_main)

        setContentView(R.layout.main_activity)



        // Floating action button ("+")

        val fab: View = findViewById(R.id.fab)
@@ -63,11 +63,11 @@ class MainActivity : AppCompatActivity(), AddFragment.Listener { 
    override fun onOptionsItemSelected(item: MenuItem): Boolean {

        return when (item.itemId) {

            R.id.menu_action_source -> {

                startActivity(Intent(Intent.ACTION_VIEW, Uri.parse(getString(R.string.menu_source_url))))

                startActivity(Intent(Intent.ACTION_VIEW, Uri.parse(getString(R.string.main_menu_source_url))))

                true

            }

            R.id.menu_action_website -> {

                startActivity(Intent(Intent.ACTION_VIEW, Uri.parse(getString(R.string.menu_website_url))))

                startActivity(Intent(Intent.ACTION_VIEW, Uri.parse(getString(R.string.main_menu_website_url))))

                true

            }

            else -> super.onOptionsItemSelected(item)

app/src/main/java/io/heckel/ntfy/ui/SubscriptionsAdapter.kt

+1 −1
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ class TopicsAdapter(private val onClick: (Subscription) -> Unit) : 
    /* Creates and inflates view and return TopicViewHolder. */

    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): TopicViewHolder {

        val view = LayoutInflater.from(parent.context)

            .inflate(R.layout.topic_item, parent, false)

            .inflate(R.layout.main_fragment_item, parent, false)

        return TopicViewHolder(view, onClick)

    }