diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 5467b865e..3053a1744 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -34,6 +34,7 @@ android:windowSoftInputMode="stateVisible|adjustResize" /> + . */ + +package com.keylesspalace.tusky; + +import android.os.Bundle; +import android.support.annotation.Nullable; +import android.support.v4.app.Fragment; +import android.support.v4.app.FragmentTransaction; +import android.support.v7.app.ActionBar; +import android.support.v7.app.AppCompatActivity; +import android.support.v7.widget.Toolbar; + +public class ViewTagActivity extends AppCompatActivity { + @Override + protected void onCreate(@Nullable Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_view_tag); + + String hashtag = getIntent().getStringExtra("hashtag"); + + Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar); + setSupportActionBar(toolbar); + ActionBar bar = getSupportActionBar(); + if (bar != null) { + bar.setTitle(String.format(getString(R.string.title_tag), hashtag)); + } + + FragmentTransaction fragmentTransaction = getSupportFragmentManager().beginTransaction(); + Fragment fragment = TimelineFragment.newInstance(TimelineFragment.Kind.TAG, hashtag); + fragmentTransaction.add(R.id.fragment_container, fragment); + fragmentTransaction.commit(); + } +} diff --git a/app/src/main/java/com/keylesspalace/tusky/ViewThreadFragment.java b/app/src/main/java/com/keylesspalace/tusky/ViewThreadFragment.java index 9dbfd61ac..ccc6e392d 100644 --- a/app/src/main/java/com/keylesspalace/tusky/ViewThreadFragment.java +++ b/app/src/main/java/com/keylesspalace/tusky/ViewThreadFragment.java @@ -140,4 +140,8 @@ public class ViewThreadFragment extends SFragment implements StatusActionListene public void onViewThread(int position) { super.viewThread(adapter.getItem(position)); } + + public void onViewTag(String tag) { + super.viewTag(tag); + } } diff --git a/app/src/main/res/layout/activity_view_tag.xml b/app/src/main/res/layout/activity_view_tag.xml new file mode 100644 index 000000000..9b24139d4 --- /dev/null +++ b/app/src/main/res/layout/activity_view_tag.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 62e1aa812..eb4712284 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -5,6 +5,8 @@ oauth2redirect com.keylesspalace.tusky.PREFERENCES + content://com.keylesspalace.tusky.viewtagactivity/%s + /api/v1/statuses /api/v1/media /api/v1/timelines/home @@ -53,6 +55,7 @@ Notifications Public Thread + #%s \@%s %s boosted