release

MatteCarra · Aug 5, 2021 · e39ad8a · e39ad8a
1 parent fc4ee1f
commit e39ad8a
Show file tree

Hide file tree

Showing 6 changed files with 53 additions and 60 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -76,7 +76,7 @@ dependencies {
 
     implementation "androidx.appcompat:appcompat:1.3.1"
     implementation "androidx.core:core-ktx:1.6.0"
-    implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
+    implementation 'androidx.constraintlayout:constraintlayout:2.1.0'
     implementation "androidx.legacy:legacy-support-v4:1.0.0"
     implementation "androidx.vectordrawable:vectordrawable:1.1.0"
     implementation "androidx.preference:preference-ktx:1.1.1"

diff --git a/app/src/main/java/mattecarra/accapp/activities/LogViewerActivity.kt b/app/src/main/java/mattecarra/accapp/activities/LogViewerActivity.kt
@@ -28,8 +28,7 @@ class LogViewerActivity : AppCompatActivity()
     private lateinit var job: Shell.Job
     private var isPaused = false
 
-    override fun onOptionsItemSelected(item: MenuItem): Boolean
-    {
+    override fun onOptionsItemSelected(item: MenuItem): Boolean {
         when (item.itemId)
         {
             android.R.id.home ->
@@ -42,10 +41,10 @@ class LogViewerActivity : AppCompatActivity()
         return super.onOptionsItemSelected(item)
     }
 
-    private fun scrollToBottom()
-    {
+    private fun scrollToBottom() {
         log_recycler.scrollToPosition(adapter.itemCount - 1)
         onBottom = true
+        log_button_scroll_end.visibility = View.GONE
     }
 
     private fun setTitleCount(count: Int)
@@ -59,14 +58,14 @@ class LogViewerActivity : AppCompatActivity()
         Toast.makeText(this, R.string.text_copied_to_clipboard, Toast.LENGTH_SHORT).show()
     }
 
-    public override fun onSaveInstanceState(outState: Bundle)
-    {
+    public override fun onSaveInstanceState(outState: Bundle) {
         super.onSaveInstanceState(outState)
         this.adapter.saveState(outState)
+        outState.putBoolean("paused", isPaused)
+        outState.putBoolean("onBottom", onBottom)
     }
 
-    override fun onCreate(savedInstanceState: Bundle?)
-    {
+    override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_log_viewer)
 
@@ -78,14 +77,19 @@ class LogViewerActivity : AppCompatActivity()
         linearLayoutManager = LinearLayoutManager(this)
         log_recycler.layoutManager = linearLayoutManager
         adapter = LogRecyclerViewAdapter(ArrayList(), clickerListener)
-        if (savedInstanceState != null) this.adapter.restoreState(savedInstanceState)
+        if (savedInstanceState != null){
+            isPaused = savedInstanceState.getBoolean("paused")
+            onBottom = savedInstanceState.getBoolean("onBottom")
+            this.adapter.restoreState(savedInstanceState)
+        }
         log_recycler.adapter = adapter
         log_recycler.setHasFixedSize(true)
         linearLayoutManager.stackFromEnd = true
 
         log_button_scroll_end.setOnClickListener { scrollToBottom() }
         log_button_clear.setOnClickListener { adapter.clearAll(); setTitleCount(0) }
 
+        log_button_pause.setImageResource(if (isPaused) R.drawable.ic_baseline_play_arrow_24 else R.drawable.ic_baseline_pause_24)
         log_button_pause.setOnClickListener {
             isPaused = !isPaused
             log_button_pause.setImageResource(if (isPaused) R.drawable.ic_baseline_play_arrow_24 else R.drawable.ic_baseline_pause_24)
@@ -96,8 +100,13 @@ class LogViewerActivity : AppCompatActivity()
             override fun onScrolled(recyclerView: RecyclerView, dx: Int, dy: Int)
             {
                 if (dy == 0) return
-                if (dy < 0) onBottom = false else
-                if (!onBottom) if (linearLayoutManager.findLastCompletelyVisibleItemPosition() == adapter.itemCount - 1) onBottom = true
+                if (dy < 0) {
+                    onBottom = false
+                    log_button_scroll_end.visibility = View.VISIBLE
+                } else if (!onBottom && linearLayoutManager.findLastCompletelyVisibleItemPosition() == adapter.itemCount - 1) {
+                    onBottom = true
+                    log_button_scroll_end.visibility = View.GONE
+                }
             }
         })
 
@@ -117,25 +126,8 @@ class LogViewerActivity : AppCompatActivity()
         job.submit { println(it.code) }
     }
 
-    override fun onDestroy()
-    {
+    override fun onDestroy() {
         Shell.getCachedShell()?.close()
         super.onDestroy()
     }
-
-    override fun onResume()
-    {
-        Log.d(LOG_TAG, "onResume")
-        adapter.notifyDataSetChanged()
-        scrollToBottom()
-        isPaused = false
-        super.onResume()
-    }
-
-    override fun onPause()
-    {
-        Log.d(LOG_TAG, "onPause")
-        isPaused = true
-        super.onPause()
-    }
 }
diff --git a/app/src/main/res/layout/activity_log_viewer.xml b/app/src/main/res/layout/activity_log_viewer.xml
@@ -29,39 +29,41 @@
             android:layout_height="match_parent"
             android:padding="10dp" />
 
-        <com.google.android.material.floatingactionbutton.FloatingActionButton
-            android:id="@+id/log_button_clear"
+        <LinearLayout
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_alignEnd="@id/log_recycler"
             android:layout_alignRight="@id/log_recycler"
-            android:layout_above="@id/log_button_pause"
-            android:layout_margin="@dimen/fab_margin"
-            app:elevation="@dimen/ttlm_default_elevation"
-            app:srcCompat="@drawable/ic_baseline_delete_24" />
+            android:layout_alignBottom="@+id/log_recycler"
+            android:orientation="vertical">
+
+            <com.google.android.material.floatingactionbutton.FloatingActionButton
+                android:id="@+id/log_button_scroll_end"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginHorizontal="@dimen/fab_margin"
+                app:elevation="@dimen/ttlm_default_elevation"
+                app:srcCompat="@drawable/ic_baseline_scrolldown_24" />
+
+            <com.google.android.material.floatingactionbutton.FloatingActionButton
+                android:id="@+id/log_button_clear"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_margin="@dimen/fab_margin"
+                app:elevation="@dimen/ttlm_default_elevation"
+                app:srcCompat="@drawable/ic_baseline_delete_24" />
+
+            <com.google.android.material.floatingactionbutton.FloatingActionButton
+                android:id="@+id/log_button_pause"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginHorizontal="@dimen/fab_margin"
+                android:layout_marginBottom="@dimen/fab_margin"
+                app:elevation="@dimen/ttlm_default_elevation"
+                app:srcCompat="@drawable/ic_baseline_pause_24" />
+        </LinearLayout>
 
-        <com.google.android.material.floatingactionbutton.FloatingActionButton
-            android:id="@+id/log_button_pause"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignEnd="@id/log_recycler"
-            android:layout_alignRight="@id/log_recycler"
-            android:layout_above="@id/log_button_scroll_end"
-            android:layout_marginEnd="@dimen/fab_margin"
-            android:layout_marginRight="@dimen/fab_margin"
-            app:elevation="@dimen/ttlm_default_elevation"
-            app:srcCompat="@drawable/ic_baseline_pause_24" />
 
-        <com.google.android.material.floatingactionbutton.FloatingActionButton
-            android:id="@+id/log_button_scroll_end"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignEnd="@id/log_recycler"
-            android:layout_alignRight="@id/log_recycler"
-            android:layout_alignBottom="@id/log_recycler"
-            android:layout_margin="@dimen/fab_margin"
-            app:elevation="@dimen/ttlm_default_elevation"
-            app:srcCompat="@drawable/ic_baseline_scrolldown_24" />
 
     </RelativeLayout>
 

diff --git a/app/src/main/res/values-pl-rPL/strings.xml b/app/src/main/res/values-pl-rPL/strings.xml
@@ -129,7 +129,7 @@ Jebac pis?</string>
     <string name="automatic">Automatyczny</string>
     <string name="error_occurred">Wystąpił błąd</string>
     <string name="retry">Spróbuj ponownie</string>
-    <string name="edit_charging_limit_once">Ładuj raz do #\%, bez ograniczeń</string>
+    <string name="edit_charging_limit_once_button">Ładuj raz do #\%, bez ograniczeń</string>
     <string name="done_applied_charge_limit">Ładowanie do %1$d%%</string>
     <string name="charge_limit_not_applied">Stosowanie limitu ładowania zostało przerwane</string>
     <string name="apply">Zastosuj</string>

diff --git a/app/src/main/res/values-ru-rRU/strings.xml b/app/src/main/res/values-ru-rRU/strings.xml
@@ -257,7 +257,6 @@
     <string name="about_attributes">Дополнительно</string>
     <string name="about_attrib_telegram_icon">Используется Telegram иконка, сделанная пользователем Pixel perfect с сайта www.flaticon.com</string>
     <string name="about_acca_version_label">Версия АссА:</string>
-    <string name="about_acc_version_label">Версия ACC:</string>
     <string name="about_project_github">AccA GitHub</string>
     <string name="about_project_telegram">AccA Telegram</string>
     <string name="about_github">GitHub</string>

diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
@@ -126,7 +126,7 @@
     <string name="automatic">自動</string>
     <string name="error_occurred">發生了一個錯誤</string>
     <string name="retry">重試</string>
-    <string name="edit_charging_limit_once">一次性無限制充電至 #\%</string>
+    <string name="edit_charging_limit_once_button">一次性無限制充電至 #\%</string>
     <string name="done_applied_charge_limit">充電至 %1$d%%</string>
     <string name="charge_limit_not_applied">充電限制已取消</string>
     <string name="apply">套用</string>