Skip to content

Commit 2be6a53

Browse files
AndraxDevAndraxDev
committed
v4.19-pre
1 parent f8ef99e commit 2be6a53

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+190
-85
lines changed

‎.idea/deploymentTargetSelector.xml

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎app/build.gradle

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ android {
1717
applicationId "org.teslasoft.assistant"
1818
minSdk 28
1919
targetSdk 35
20-
versionCode 418
21-
versionName "4.18"
20+
versionCode 419
21+
versionName "4.19"
2222
}
2323

2424
buildTypes {
@@ -51,6 +51,7 @@ android {
5151

5252
dependencies {
5353
implementation 'androidx.core:core-ktx:1.13.1'
54+
implementation 'androidx.activity:activity-ktx:1.9.1'
5455
implementation 'androidx.appcompat:appcompat:1.7.0'
5556
implementation 'com.google.android.material:material:1.13.0-alpha05'
5657
implementation 'com.google.code.gson:gson:2.11.0'

‎app/src/main/java/org/teslasoft/assistant/ui/activities/AboutActivity.kt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -194,6 +194,7 @@ class AboutActivity : FragmentActivity() {
194194
reloadAmoled()
195195
}
196196

197+
@Suppress("deprecation")
197198
private fun reloadAmoled() {
198199
if (isDarkThemeEnabled() && Preferences.getPreferences(this, "").getAmoledPitchBlack()) {
199200
if (android.os.Build.VERSION.SDK_INT <= 34) {
@@ -230,7 +231,7 @@ class AboutActivity : FragmentActivity() {
230231
}
231232

232233
private fun getDarkDrawable(drawable: Drawable) : Drawable {
233-
DrawableCompat.setTint(DrawableCompat.wrap(drawable), SurfaceColors.SURFACE_2.getColor(this))
234+
DrawableCompat.setTint(DrawableCompat.wrap(drawable), SurfaceColors.SURFACE_1.getColor(this))
234235
return drawable
235236
}
236237

@@ -253,7 +254,7 @@ class AboutActivity : FragmentActivity() {
253254
return if (isDarkThemeEnabled() && preferences?.getAmoledPitchBlack() == true) {
254255
ResourcesCompat.getColor(resources, R.color.accent_50, theme)
255256
} else {
256-
SurfaceColors.SURFACE_5.getColor(this)
257+
SurfaceColors.SURFACE_1.getColor(this)
257258
}
258259
}
259260
}

‎app/src/main/java/org/teslasoft/assistant/ui/activities/ChatActivity.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ import android.content.res.Configuration.KEYBOARD_QWERTY
2929
import android.graphics.Bitmap
3030
import android.graphics.BitmapFactory
3131
import android.graphics.Canvas
32-
import android.graphics.Color
3332
import android.graphics.Paint
3433
import android.graphics.PorterDuff
3534
import android.graphics.PorterDuffXfermode

‎app/src/main/java/org/teslasoft/assistant/ui/activities/PromptViewActivity.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,7 @@ class PromptViewActivity : FragmentActivity(), SwipeRefreshLayout.OnRefreshListe
246246
}
247247

248248
private fun getDarkDrawable(drawable: Drawable) : Drawable {
249-
DrawableCompat.setTint(DrawableCompat.wrap(drawable), SurfaceColors.SURFACE_2.getColor(this))
249+
DrawableCompat.setTint(DrawableCompat.wrap(drawable), SurfaceColors.SURFACE_1.getColor(this))
250250
return drawable
251251
}
252252

‎app/src/main/java/org/teslasoft/assistant/ui/adapters/AISetAdapter.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ class AISetAdapter(private val mContext: Context, private val dataArray: ArrayLi
143143
}
144144

145145
private fun getSurfaceColor() : Int {
146-
return SurfaceColors.SURFACE_4.getColor(mContext)
146+
return SurfaceColors.SURFACE_5.getColor(mContext)
147147
}
148148

149149
private fun getAccentDrawable(drawable: Drawable) : Drawable {

‎app/src/main/java/org/teslasoft/assistant/ui/fragments/tabs/ChatsListFragment.kt

Lines changed: 30 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,8 @@ import android.view.ViewGroup
3535
import android.widget.EditText
3636
import android.widget.ImageButton
3737
import android.widget.Toast
38+
import androidx.activity.result.ActivityResult
39+
import androidx.activity.result.ActivityResultCallback
3840
import androidx.activity.result.contract.ActivityResultContracts
3941
import androidx.constraintlayout.widget.ConstraintLayout
4042
import androidx.core.content.res.ResourcesCompat
@@ -181,6 +183,8 @@ class ChatsListFragment : Fragment(), Preferences.PreferencesChangedListener, Ch
181183
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
182184
super.onViewCreated(view, savedInstanceState)
183185

186+
fileIntentLauncher = registerForActivityResult(ActivityResultContracts.StartActivityForResult(), activityResultCallback)
187+
184188
Thread {
185189
while (!isAttached) {
186190
Thread.sleep(100)
@@ -426,32 +430,6 @@ class ChatsListFragment : Fragment(), Preferences.PreferencesChangedListener, Ch
426430
})
427431
}
428432

429-
private val fileIntentLauncher = registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { result ->
430-
run {
431-
if (result.resultCode == Activity.RESULT_OK) {
432-
result.data?.data?.also { uri ->
433-
selectedFile = readFile(uri)
434-
435-
if (isValidJson(selectedFile)) {
436-
val chatDialogFragment: AddChatDialogFragment =
437-
AddChatDialogFragment.newInstance(false, "", fromFile = true, disableAutoName = false, saveChat = false, "", "", "", "", "", -1)
438-
chatDialogFragment.setStateChangedListener(chatListUpdatedListener)
439-
chatDialogFragment.show(
440-
parentFragmentManager.beginTransaction(),
441-
"AddChatDialog"
442-
)
443-
} else {
444-
MaterialAlertDialogBuilder(mContext?: return@also, R.style.App_MaterialAlertDialog)
445-
.setTitle(getString(R.string.label_error))
446-
.setMessage(getString(R.string.msg_error_importing_chat))
447-
.setPositiveButton(R.string.btn_close) { _, _ -> }
448-
.show()
449-
}
450-
}
451-
}
452-
}
453-
}
454-
455433
private fun isValidJson(jsonStr: String?): Boolean {
456434
return try {
457435
val gson = Gson()
@@ -476,6 +454,32 @@ class ChatsListFragment : Fragment(), Preferences.PreferencesChangedListener, Ch
476454
return stringBuilder.toString()
477455
}
478456

457+
val activityResultCallback: ActivityResultCallback<ActivityResult> = ActivityResultCallback<ActivityResult> { result ->
458+
if (result.resultCode == Activity.RESULT_OK) {
459+
result.data?.data?.also { uri ->
460+
selectedFile = readFile(uri)
461+
462+
if (isValidJson(selectedFile)) {
463+
val chatDialogFragment: AddChatDialogFragment =
464+
AddChatDialogFragment.newInstance(false, "", fromFile = true, disableAutoName = false, saveChat = false, "", "", "", "", "", -1)
465+
chatDialogFragment.setStateChangedListener(chatListUpdatedListener)
466+
chatDialogFragment.show(
467+
parentFragmentManager.beginTransaction(),
468+
"AddChatDialog"
469+
)
470+
} else {
471+
MaterialAlertDialogBuilder(mContext?: return@also, R.style.App_MaterialAlertDialog)
472+
.setTitle(getString(R.string.label_error))
473+
.setMessage(getString(R.string.msg_error_importing_chat))
474+
.setPositiveButton(R.string.btn_close) { _, _ -> }
475+
.show()
476+
}
477+
}
478+
}
479+
}
480+
481+
private var fileIntentLauncher = registerForActivityResult(ActivityResultContracts.StartActivityForResult(), activityResultCallback)
482+
479483
private fun openFile(pickerInitialUri: Uri) {
480484
val intent = Intent(Intent.ACTION_OPEN_DOCUMENT).apply {
481485
addCategory(Intent.CATEGORY_OPENABLE)

‎app/src/main/res/anim-v33/mtrl_activity_open_enter.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
android:fillBefore="true"
2626
android:fillAfter="true"
2727
android:interpolator="@android:anim/linear_interpolator"
28-
android:startOffset="50"
28+
android:startOffset="35"
2929
android:duration="83" />
3030

3131
<translate

‎app/src/main/res/anim-v33/mtrl_activity_open_exit.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
android:fillEnabled="true"
2525
android:fillBefore="true"
2626
android:fillAfter="true"
27-
android:interpolator="@android:anim/accelerate_interpolator"
27+
android:interpolator="@android:anim/accelerate_decelerate_interpolator"
2828
android:startOffset="0"
2929
android:duration="450" />
3030

‎app/src/main/res/anim-v33/mtrl_fragment_close_enter.xml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@
2525
android:fillBefore="true"
2626
android:fillAfter="true"
2727
android:interpolator="@android:anim/linear_interpolator"
28-
android:startOffset="0"
29-
android:duration="450" />
28+
android:startOffset="200"
29+
android:duration="300" />
3030

3131
<translate
3232
android:fromXDelta="-96dp"
@@ -35,8 +35,8 @@
3535
android:fillBefore="true"
3636
android:fillAfter="true"
3737
android:interpolator="@android:interpolator/fast_out_extra_slow_in"
38-
android:startOffset="0"
39-
android:duration="450" />
38+
android:startOffset="50"
39+
android:duration="600" />
4040

4141
<extend
4242
android:fromExtendLeft="0"
@@ -48,6 +48,6 @@
4848
android:toExtendRight="96dp"
4949
android:toExtendBottom="0"
5050
android:interpolator="@android:interpolator/fast_out_extra_slow_in"
51-
android:startOffset="0"
52-
android:duration="450" />
51+
android:startOffset="50"
52+
android:duration="600" />
5353
</set>

‎app/src/main/res/anim-v33/mtrl_fragment_close_exit.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@
2525
android:fillBefore="true"
2626
android:fillAfter="true"
2727
android:interpolator="@android:anim/linear_interpolator"
28-
android:startOffset="35"
29-
android:duration="83" />
28+
android:startOffset="0"
29+
android:duration="150" />
3030

3131
<translate
3232
android:fromXDelta="0"
@@ -36,7 +36,7 @@
3636
android:fillAfter="true"
3737
android:interpolator="@android:interpolator/fast_out_extra_slow_in"
3838
android:startOffset="0"
39-
android:duration="450" />
39+
android:duration="600" />
4040

4141
<extend
4242
android:fromExtendLeft="96dp"
@@ -49,5 +49,5 @@
4949
android:toExtendBottom="0"
5050
android:interpolator="@android:interpolator/fast_out_extra_slow_in"
5151
android:startOffset="0"
52-
android:duration="450" />
52+
android:duration="600" />
5353
</set>

‎app/src/main/res/anim-v33/mtrl_fragment_open_enter.xml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,17 +25,18 @@
2525
android:fillBefore="true"
2626
android:fillAfter="true"
2727
android:interpolator="@android:anim/linear_interpolator"
28-
android:startOffset="0"
29-
android:duration="450" />
28+
android:startOffset="200"
29+
android:duration="300" />
3030

3131
<translate
3232
android:fromXDelta="96dp"
3333
android:toXDelta="0"
3434
android:fillEnabled="true"
3535
android:fillBefore="true"
3636
android:fillAfter="true"
37+
android:startOffset="50"
3738
android:interpolator="@android:interpolator/fast_out_extra_slow_in"
38-
android:duration="450" />
39+
android:duration="600" />
3940

4041
<extend
4142
android:fromExtendLeft="96dp"
@@ -47,6 +48,6 @@
4748
android:toExtendRight="0"
4849
android:toExtendBottom="0"
4950
android:interpolator="@android:interpolator/fast_out_extra_slow_in"
50-
android:startOffset="0"
51-
android:duration="450" />
51+
android:startOffset="50"
52+
android:duration="600" />
5253
</set>

‎app/src/main/res/anim-v33/mtrl_fragment_open_exit.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@
2525
android:fillBefore="true"
2626
android:fillAfter="true"
2727
android:interpolator="@android:anim/accelerate_interpolator"
28-
android:startOffset="35"
29-
android:duration="83" />
28+
android:startOffset="0"
29+
android:duration="150" />
3030

3131
<translate
3232
android:fromXDelta="0"
@@ -36,7 +36,7 @@
3636
android:fillAfter="true"
3737
android:interpolator="@android:interpolator/fast_out_extra_slow_in"
3838
android:startOffset="0"
39-
android:duration="450" />
39+
android:duration="600" />
4040

4141
<extend
4242
android:fromExtendLeft="0"
@@ -49,5 +49,5 @@
4949
android:toExtendBottom="0"
5050
android:interpolator="@android:interpolator/fast_out_extra_slow_in"
5151
android:startOffset="0"
52-
android:duration="450" />
52+
android:duration="600" />
5353
</set>

‎app/src/main/res/anim/mtrl_activity_open_enter.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
android:fillBefore="true"
2626
android:fillAfter="true"
2727
android:interpolator="@android:anim/linear_interpolator"
28-
android:startOffset="50"
28+
android:startOffset="35"
2929
android:duration="83" />
3030

3131
<translate

‎app/src/main/res/anim/mtrl_activity_open_exit.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
android:fillEnabled="true"
2525
android:fillBefore="true"
2626
android:fillAfter="true"
27-
android:interpolator="@android:anim/accelerate_interpolator"
27+
android:interpolator="@android:anim/linear_interpolator"
2828
android:startOffset="0"
2929
android:duration="450" />
3030

‎app/src/main/res/anim/mtrl_fragment_close_enter.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@
2525
android:fillBefore="true"
2626
android:fillAfter="true"
2727
android:interpolator="@android:anim/linear_interpolator"
28-
android:startOffset="0"
29-
android:duration="450" />
28+
android:startOffset="200"
29+
android:duration="300" />
3030

3131
<translate
3232
android:fromXDelta="-96dp"
@@ -35,6 +35,6 @@
3535
android:fillBefore="true"
3636
android:fillAfter="true"
3737
android:interpolator="@android:interpolator/fast_out_extra_slow_in"
38-
android:startOffset="0"
39-
android:duration="450" />
38+
android:startOffset="50"
39+
android:duration="600" />
4040
</set>

‎app/src/main/res/anim/mtrl_fragment_close_exit.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@
2525
android:fillBefore="true"
2626
android:fillAfter="true"
2727
android:interpolator="@android:anim/linear_interpolator"
28-
android:startOffset="35"
29-
android:duration="83" />
28+
android:startOffset="0"
29+
android:duration="150" />
3030

3131
<translate
3232
android:fromXDelta="0"
@@ -36,5 +36,5 @@
3636
android:fillAfter="true"
3737
android:interpolator="@android:interpolator/fast_out_extra_slow_in"
3838
android:startOffset="0"
39-
android:duration="450" />
39+
android:duration="600" />
4040
</set>

‎app/src/main/res/anim/mtrl_fragment_open_enter.xml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,15 +25,16 @@
2525
android:fillBefore="true"
2626
android:fillAfter="true"
2727
android:interpolator="@android:anim/linear_interpolator"
28-
android:startOffset="0"
29-
android:duration="450" />
28+
android:startOffset="200"
29+
android:duration="300" />
3030

3131
<translate
3232
android:fromXDelta="96dp"
3333
android:toXDelta="0"
3434
android:fillEnabled="true"
3535
android:fillBefore="true"
3636
android:fillAfter="true"
37+
android:startOffset="0"
3738
android:interpolator="@android:interpolator/fast_out_extra_slow_in"
38-
android:duration="450" />
39+
android:duration="600" />
3940
</set>

0 commit comments

Comments
 (0)