From d3f6a7f2d8e6b78ee242d137146417285c371b89 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Deniz=20D=C3=BCzg=C3=B6ren?= Date: Sat, 15 Jun 2019 09:26:11 +0200 Subject: [PATCH] Fixed overlapping app bar, news fragment removed --- .../java/com/denizd/substitutionplan/Main.kt | 23 +-- .../java/com/denizd/substitutionplan/News.kt | 3 - .../denizd/substitutionplan/NewsAdapter.kt | 47 ------ .../denizd/substitutionplan/NewsFragment.kt | 144 ------------------ app/src/main/res/layout/app_bar_main.xml | 3 +- app/src/main/res/layout/news.xml | 38 ----- app/src/main/res/layout/news_card.xml | 58 ------- app/src/main/res/menu/nav_items.xml | 2 +- app/src/main/res/values-de/strings.xml | 1 - app/src/main/res/values/strings.xml | 2 - 10 files changed, 8 insertions(+), 313 deletions(-) delete mode 100644 app/src/main/java/com/denizd/substitutionplan/News.kt delete mode 100644 app/src/main/java/com/denizd/substitutionplan/NewsAdapter.kt delete mode 100644 app/src/main/java/com/denizd/substitutionplan/NewsFragment.kt delete mode 100644 app/src/main/res/layout/news.xml delete mode 100644 app/src/main/res/layout/news_card.xml diff --git a/app/src/main/java/com/denizd/substitutionplan/Main.kt b/app/src/main/java/com/denizd/substitutionplan/Main.kt index fbe85d7..7758613 100644 --- a/app/src/main/java/com/denizd/substitutionplan/Main.kt +++ b/app/src/main/java/com/denizd/substitutionplan/Main.kt @@ -275,14 +275,12 @@ class Main : AppCompatActivity(R.layout.activity_main) { toolbarTxt.text = getString(R.string.foodmenu) } R.id.openinfopanel -> { -// if (bottomSheetBehaviour.state == BottomSheetBehavior.STATE_COLLAPSED) { -// bottomSheetBehaviour.state = BottomSheetBehavior.STATE_EXPANDED -// } else if (bottomSheetBehaviour.state == BottomSheetBehavior.STATE_EXPANDED) { -// bottomSheetBehaviour.state = BottomSheetBehavior.STATE_COLLAPSED -// } -// fragmentLoading = false - fragment = NewsFragment() - toolbarTxt.text = getString(R.string.news) + if (bottomSheetBehaviour.state == BottomSheetBehavior.STATE_COLLAPSED) { + bottomSheetBehaviour.state = BottomSheetBehavior.STATE_EXPANDED + } else if (bottomSheetBehaviour.state == BottomSheetBehavior.STATE_EXPANDED) { + bottomSheetBehaviour.state = BottomSheetBehavior.STATE_COLLAPSED + } + fragmentLoading = false } R.id.settings -> { fragment = SettingsFragment() @@ -318,15 +316,6 @@ class Main : AppCompatActivity(R.layout.activity_main) { } } catch (e: NullPointerException) {} } - R.id.openinfopanel -> { - try { - val nsvnewscard = findViewById(R.id.nsvnewscard) - nsvnewscard.post { - nsvnewscard.smoothScrollTo(0, 0) - bottomSheetBehaviour.state = BottomSheetBehavior.STATE_COLLAPSED - } - } catch (e: NullPointerException) {} - } R.id.settings -> { try { val nsv = findViewById(R.id.nsvsettings) diff --git a/app/src/main/java/com/denizd/substitutionplan/News.kt b/app/src/main/java/com/denizd/substitutionplan/News.kt deleted file mode 100644 index 5b6e06b..0000000 --- a/app/src/main/java/com/denizd/substitutionplan/News.kt +++ /dev/null @@ -1,3 +0,0 @@ -package com.denizd.substitutionplan - -class News(val title: String, val content: String) diff --git a/app/src/main/java/com/denizd/substitutionplan/NewsAdapter.kt b/app/src/main/java/com/denizd/substitutionplan/NewsAdapter.kt deleted file mode 100644 index 0df7225..0000000 --- a/app/src/main/java/com/denizd/substitutionplan/NewsAdapter.kt +++ /dev/null @@ -1,47 +0,0 @@ -package com.denizd.substitutionplan - -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.TextView - -import java.util.ArrayList -import androidx.recyclerview.widget.RecyclerView - -class NewsAdapter(news: ArrayList) : RecyclerView.Adapter() { - private var mNews: List? = null - - class CardViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) { - var title = itemView.findViewById(R.id.title) - var content = itemView.findViewById(R.id.content) - } - - init { - mNews = news - } - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): CardViewHolder { - val v = LayoutInflater.from(parent.context).inflate(R.layout.news_card, parent, false) - return CardViewHolder(v) - } - - fun getNewsAt(i: Int): News { - return mNews!![i] - } - - override fun onBindViewHolder(holder: CardViewHolder, position: Int) { - val currentItem = mNews!![position] - - holder.title.text = currentItem.title - holder.content.text = currentItem.content - } - - override fun getItemCount(): Int { - return mNews!!.size - } - - fun setNews(news: List) { - mNews = news - notifyDataSetChanged() - } -} diff --git a/app/src/main/java/com/denizd/substitutionplan/NewsFragment.kt b/app/src/main/java/com/denizd/substitutionplan/NewsFragment.kt deleted file mode 100644 index 87408c5..0000000 --- a/app/src/main/java/com/denizd/substitutionplan/NewsFragment.kt +++ /dev/null @@ -1,144 +0,0 @@ -package com.denizd.substitutionplan - -import android.content.Context -import android.content.SharedPreferences -import android.os.AsyncTask -import android.os.Bundle -import android.os.Handler -import android.os.Looper -import android.preference.PreferenceManager -import android.view.View -import android.view.animation.Animation -import android.view.animation.AnimationUtils -import android.widget.FrameLayout -import android.widget.ProgressBar -import androidx.fragment.app.Fragment -import androidx.recyclerview.widget.GridLayoutManager -import androidx.recyclerview.widget.RecyclerView -import androidx.swiperefreshlayout.widget.SwipeRefreshLayout -import androidx.viewpager.widget.ViewPager -import androidx.viewpager2.widget.ViewPager2 -import com.google.android.material.snackbar.Snackbar -import com.madapps.prefrences.EasyPrefrences -import com.rd.PageIndicatorView -import org.jsoup.Jsoup -import org.jsoup.nodes.Document -import org.jsoup.select.Elements -import java.lang.IndexOutOfBoundsException - - - -class NewsFragment : Fragment(R.layout.news) { - - private lateinit var mContext: Context - private lateinit var prefs: SharedPreferences - private lateinit var edit: SharedPreferences.Editor - private lateinit var easyPrefs: EasyPrefrences - private lateinit var pageIndicatorView: PageIndicatorView - - override fun onAttach(context: Context) { - super.onAttach(context) - mContext = context - prefs = PreferenceManager.getDefaultSharedPreferences(mContext) - edit = prefs.edit() - easyPrefs = EasyPrefrences(mContext) - } - - override fun onViewCreated(view: View, savedInstanceState: Bundle?) { // TODO go on stackoverflow and get the necessary code lol - super.onViewCreated(view, savedInstanceState) - val pullToRefresh = view.findViewById(R.id.pullToRefresh) - - val viewPager2 = view.findViewById(R.id.viewPager2) - val list = ArrayList() - val adapter = NewsAdapter(list) - viewPager2.orientation = ViewPager2.ORIENTATION_HORIZONTAL - viewPager2.adapter = adapter - - pageIndicatorView = view.findViewById(R.id.indicator) - - viewPager2.registerOnPageChangeCallback(object : ViewPager2.OnPageChangeCallback() { - override fun onPageSelected(position: Int) { - pageIndicatorView.selection = position - } - }) - - pageIndicatorView.count = 0 - pageIndicatorView.selection = 0 - - pullToRefresh.isRefreshing = true - FetchNews(mContext, adapter, list, pageIndicatorView, viewPager2, pullToRefresh, view.rootView).execute() - - pullToRefresh.setOnRefreshListener { - pullToRefresh.isRefreshing = true - FetchNews(mContext, adapter, list, pageIndicatorView, viewPager2, pullToRefresh, view.rootView).execute() - } - } - - class FetchNews(context: Context, adapter: NewsAdapter, arrayList: ArrayList, pageIndicatorView: PageIndicatorView, viewPager2: ViewPager2, - swipeRefreshLayout: SwipeRefreshLayout, rootView: View) : AsyncTask() { - - private val mContext = context - private val mAdapter = adapter - private val mArrayList = arrayList - private val mPageIndicatorView = pageIndicatorView - private val mViewPager2 = viewPager2 - private val frameLayout = rootView.findViewById(R.id.frameLayoutNews) - private var foodList = ArrayList() - private lateinit var foodElements: Elements - private lateinit var doc: Document - private val pullToRefresh = swipeRefreshLayout - private lateinit var progressBar: ProgressBar - val mRootView = rootView - private val fadeOut = AnimationUtils.loadAnimation(context, R.anim.fade_out) - private val handler = Handler(Looper.getMainLooper()) - private var exceptionOccured = false - private var size = 0 - - override fun doInBackground(vararg params: Void?): Void? { - try { - doc = Jsoup.connect("http://307.joomla.schule.bremen.de/index.php/schulleben/aktuelles").maxBodySize(0).get() - val blog = doc.getElementsByClass("blog").first() - val a = blog.getElementsByTag("h2") - - size = a.size - - for (i in 0 until a.size) { -// var searching = true - var content = "" - for (e in a[i].parent().parent().getElementsByTag("p")) { - if (e.text().isNotEmpty()) { - if (content.isEmpty()) { - content = e.text() - } else { - content += "\n\n" + e.text() - } - } - } - mArrayList.add(News(a[i].text(), content)) - } - - } catch (e: Exception) { exceptionOccured = true } - return null - } - - override fun onPostExecute(result: Void?) { - super.onPostExecute(result) - - if (!exceptionOccured) { - mAdapter.setNews(mArrayList) - frameLayout.scheduleLayoutAnimation() - mPageIndicatorView.count = size - mPageIndicatorView.selection = 0 - mViewPager2.setCurrentItem(0, true) - pullToRefresh.isRefreshing = false - - } else { - pullToRefresh.isRefreshing = false - val snackbarview = mRootView.findViewById(R.id.coordination) - Snackbar.make(snackbarview, mContext.getText(R.string.nointernet), Snackbar.LENGTH_LONG) - .setAction("Action", null).show() - - } - } - } -} \ No newline at end of file diff --git a/app/src/main/res/layout/app_bar_main.xml b/app/src/main/res/layout/app_bar_main.xml index fe18109..57628a4 100644 --- a/app/src/main/res/layout/app_bar_main.xml +++ b/app/src/main/res/layout/app_bar_main.xml @@ -11,8 +11,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:theme="@style/AppThemeLight.AppBarOverlay" - app:elevation="0dp" - android:translationZ="0.1dp"> + app:elevation="0dp"> - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/news_card.xml b/app/src/main/res/layout/news_card.xml deleted file mode 100644 index b75c0e8..0000000 --- a/app/src/main/res/layout/news_card.xml +++ /dev/null @@ -1,58 +0,0 @@ - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/menu/nav_items.xml b/app/src/main/res/menu/nav_items.xml index b78e4e8..507125e 100644 --- a/app/src/main/res/menu/nav_items.xml +++ b/app/src/main/res/menu/nav_items.xml @@ -19,7 +19,7 @@ Zeige Info-Tab in Navigationsleisete "Zuletzt aktualisiert: " Aktiviert den Nachtmodus - News (Alpha) \ 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 1279f38..8ed16a0 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -140,6 +140,4 @@ Enables night mode - News (Alpha) -