Skip to content

Commit 5f4370c

Browse files
committed
feat: review comments
1 parent 9694944 commit 5f4370c

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

templates/android/example/src/main/java/io/appwrite/android/ui/accounts/AccountsFragment.kt.twig

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,23 +8,22 @@ import android.widget.Toast
88
import androidx.activity.ComponentActivity
99
import androidx.databinding.DataBindingUtil
1010
import androidx.fragment.app.Fragment
11+
import androidx.fragment.app.viewModels
1112
import androidx.lifecycle.Observer
12-
import androidx.lifecycle.ViewModelProvider
1313
import {{ sdk.namespace | caseDot }}.android.R
1414
import {{ sdk.namespace | caseDot }}.android.databinding.FragmentAccountBinding
1515

1616

1717
class AccountsFragment : Fragment() {
1818

1919
private lateinit var binding: FragmentAccountBinding
20-
private lateinit var viewModel: AccountsViewModel
20+
private val viewModel: AccountsViewModel by viewModels()
2121

2222
override fun onCreateView(
2323
inflater: LayoutInflater ,
2424
container: ViewGroup? ,
2525
savedInstanceState: Bundle?
26-
): View? {
27-
viewModel = ViewModelProvider(this).get(AccountsViewModel::class.java)
26+
): View {
2827
binding = DataBindingUtil.inflate(
2928
inflater,
3029
R.layout.fragment_account,

templates/android/library/build.gradle.twig

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,13 @@ android {
2828
targetSdkVersion(30)
2929
versionCode = 1
3030
versionName = "1.0"
31-
31+
buildConfigField "String", "SDK_VERSION", "\"${PUBLISH_VERSION}\""
3232
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
3333
consumerProguardFiles("consumer-rules.pro")
3434
}
3535

3636
buildTypes {
37-
named("release") {
37+
release {
3838
minifyEnabled false
3939
proguardFiles(
4040
getDefaultProguardFile("proguard-android-optimize.txt"),

templates/android/library/src/main/java/io/appwrite/Client.kt.twig

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ package {{ sdk.namespace | caseDot }}
33
import android.content.Context
44
import android.content.pm.PackageManager
55
import com.google.gson.Gson
6+
import io.appwrite.appwrite.BuildConfig
67
import {{ sdk.namespace | caseDot }}.exceptions.{{ spec.title | caseUcfirst }}Exception
78
import {{ sdk.namespace | caseDot }}.extensions.JsonExtensions.fromJson
89
import {{ sdk.namespace | caseDot }}.models.Error
@@ -69,7 +70,7 @@ class Client @JvmOverloads constructor(
6970
"content-type" to "application/json",
7071
"origin" to "appwrite-android://${context.packageName}",
7172
"user-agent" to "${context.packageName}/${appVersion}, ${System.getProperty("http.agent")}",
72-
"x-sdk-version" to "{{spec.title | caseDash}}:{{ language.name | caseLower }}:{{ sdk.version }}"{% if spec.global.defaultHeaders | length > 0 %},{% endif %}
73+
"x-sdk-version" to "{{spec.title | caseDash}}:{{ language.name | caseLower }}:${BuildConfig.SDK_VERSION}"{% if spec.global.defaultHeaders | length > 0 %},{% endif %}
7374

7475
{% for key,header in spec.global.defaultHeaders %}
7576
"{{ key | caseLower }}" to "{{ header }}"{% if not loop.last %},{% endif %}

0 commit comments

Comments
 (0)