Skip to content

Commit

Permalink
Merge pull request #45 from OpenPecha/develop
Browse files Browse the repository at this point in the history
fix: setting ui change, update localization & default Tibetan
  • Loading branch information
CodingWithTashi authored Nov 28, 2024
2 parents 1fb1b41 + 4eeb920 commit 7357d1a
Show file tree
Hide file tree
Showing 14 changed files with 301 additions and 249 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ jobs:
echo "new_version=$NEW_VERSION" >> $GITHUB_OUTPUT
- name: Build APK
run: flutter build apk --release
run: flutter build apk --debug

- name: Get PR message
if: github.event_name == 'pull_request'
Expand Down
26 changes: 23 additions & 3 deletions android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,13 @@ plugins {
// The Flutter Gradle Plugin must be applied after the Android and Kotlin Gradle plugins.
id "dev.flutter.flutter-gradle-plugin"
}

def keystoreProperties = new Properties()
def keystorePropertiesFile = rootProject.file('key.properties')
if (keystorePropertiesFile.exists()) {
keystoreProperties.load(new FileInputStream(keystorePropertiesFile))
}
android {
namespace = "com.example.gompa_tour"
namespace = "com.monlam.gompa_tour"
compileSdk = flutter.compileSdkVersion
ndkVersion = flutter.ndkVersion

Expand All @@ -21,7 +25,7 @@ android {

defaultConfig {
// TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
applicationId = "com.example.gompa_tour"
applicationId = "com.monlam.gompa_tour"
// You can update the following values to match your application needs.
// For more information, see: https://flutter.dev/to/review-gradle-config.
minSdk = flutter.minSdkVersion
Expand All @@ -30,8 +34,24 @@ android {
versionName = flutter.versionName
}

signingConfigs {
release {
if (keystoreProperties['storeFile']) {
storeFile file(keystoreProperties['storeFile'])
storePassword keystoreProperties['storePassword']
keyAlias keystoreProperties['keyAlias']
keyPassword keystoreProperties['keyPassword']
}
}

}
buildTypes {
release {
// TODO: Add your own signing config for the release build.
// Signing with the debug keys for now, so `flutter run --release` works.
signingConfig = signingConfigs.release
}
debug {
// TODO: Add your own signing config for the release build.
// Signing with the debug keys for now, so `flutter run --release` works.
signingConfig = signingConfigs.debug
Expand Down
2 changes: 2 additions & 0 deletions android/app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<uses-permission android:name="android.permission.CAMERA" />

<application
android:label="Gonpa Tour"
android:name="${applicationName}"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.example.gompa_tour
package com.monlam.gompa_tour

import io.flutter.embedding.android.FlutterActivity

Expand Down
2 changes: 2 additions & 0 deletions android/gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,5 @@ org.gradle.jvmargs=-Xmx4G -XX:MaxMetaspaceSize=2G -XX:+HeapDumpOnOutOfMemoryErro
android.useAndroidX=true
android.enableJetifier=true
#dev.steenbakker.mobile_scanner.useUnbundled=true


86 changes: 43 additions & 43 deletions lib/l10n/app_bo.arb
Original file line number Diff line number Diff line change
@@ -1,44 +1,44 @@
{
"appName": "དགོན་སྐོར་",
"home":"ཁྱིམ།",
"map":"ཁྱིམ།",
"qr":"ཀྱུ་ར།",
"search":"འཚོལ།",
"settings":"སྒྲིག་",
"appearance": "སྣང་བ།",
"language": "སྐད་ཡིག་",
"support" : "རྒྱབ་སྐྱོར།",
"legal":"ཁྲིམས་ལུགས་",
"system":"ལམ་ལུགས་",
"dark":"མུན་ནག་",
"light":"འོད།",
"faq":"དྲི་བ་དྲིས་ལན།",
"contactUs":"འབྲེལ་བ་བྱེད་",
"privacyPolicy":"གསང་དོན་",
"contactSupport":"རྒྱབ་སྐྱོར་",
"sendEmail" : "གློག་འཕྲིན་",
"close":"ཁ་རྒྱག",
"recentSearches":"ཉེ་ཆར་གྱི་འཚོལ་བྱེད་",
"suggestion":"འོས་སྦྱོར་",
"detail":"ཞིབ་ཕྲ།",
"deities": "རྟེན་བཤད།",
"organizations": "གནས་བཤད།",
"festival": "དུས་ཆེན།",
"deity": "རྟེན་བཤད།",
"organization": "གནས་བཤད།",
"scanQrCode": "ཚབ་ཨང་ཕབ་སྒྱུར།",
"address": "ཁ་བྱང་",
"location": "ས་གནས།",
"noRecordFound": "གྲོས་བསྒྲིག་མི་འདུག",
"noRecentSearch": "ཉེ་ཆར་གྱི་འཚོལ་བཤེར་ལོ་རྒྱུས་",
"buddha": "སངས།",
"king": "རྒྱལ།",
"gaden": "དགའ་ལྡན།",
"arya": "ཨརྱ།",
"acharya": "སློབ་དཔོན་",
"milarepa": "མི་ལ་རེ་པ།",
"india": "རྒྱ་གར།",
"nepal": "བལ་ཡུལ།",
"bhutan": "འབྲུག་ཡུལ།"

}
"appName": "དགོན་སྐོར་",
"home": "ཁྱིམ།",
"map": "ཁྱིམ།",
"qr": "ཀྱུ་ར།",
"search": "འཚོལ།",
"settings": "སྒྲིག་",
"appearance": "སྣང་བ།",
"language": "སྐད་ཡིག་",
"support": "རྒྱབ་སྐྱོར།",
"legal": "ཁྲིམས་ལུགས་",
"system": "ལམ་ལུགས་",
"dark": "མུན་ནག་",
"light": "འོད།",
"faq": "དྲི་བ་དྲིས་ལན།",
"contactUs": "འབྲེལ་བ་བྱེད་",
"privacyPolicy": "གསང་དོན་",
"contactSupport": "རྒྱབ་སྐྱོར་",
"sendEmail": "གློག་འཕྲིན་",
"close": "ཁ་རྒྱག",
"recentSearches": "ཉེ་ཆར་གྱི་འཚོལ་བྱེད་",
"suggestion": "འོས་སྦྱོར་",
"detail": "ཞིབ་ཕྲ།",
"deities": "རྟེན་བཤད།",
"organizations": "ཆོས་སྡེ།",
"festival": "དུས་ཆེན།",
"deity": "རྟེན་བཤད།",
"organization": "ཆོས་སྡེ།",
"scanQrCode": "ཚབ་ཨང་ཕབ་སྒྱུར།",
"address": "ཁ་བྱང་",
"location": "ས་གནས།",
"noRecordFound": "གྲོས་བསྒྲིག་མི་འདུག",
"noRecentSearch": "ཉེ་ཆར་གྱི་འཚོལ་བཤེར་ལོ་རྒྱུས་",
"buddha": "སངས།",
"king": "རྒྱལ།",
"gaden": "དགའ་ལྡན།",
"arya": "ཨརྱ།",
"acharya": "སློབ་དཔོན་",
"milarepa": "མི་ལ་རེ་པ།",
"india": "རྒྱ་གར།",
"nepal": "བལ་ཡུལ།",
"bhutan": "འབྲུག་ཡུལ།",
"darkMode": "འཆར་ངོས་ནག་པོ།"
}
90 changes: 43 additions & 47 deletions lib/l10n/app_en.arb
Original file line number Diff line number Diff line change
@@ -1,48 +1,44 @@
{
"appName": "Gonpa Tour",
"home":"Home",
"map":"Map",
"qr":"QR",
"search":"Search",
"settings":"Settings",
"appearance": "Appearance",
"language": "Language",
"support" : "Support",
"legal":"Legal",
"system":"System",
"dark":"Dark",
"light":"Light",
"faq":"FAQ",
"contactUs":"Contact Us",
"privacyPolicy":"Privacy Policy",
"contactSupport":"Contact Support",
"sendEmail" : "Send Email",
"close":"Close",
"recentSearches":"Recent Search",
"suggestion":"Suggestion",
"detail":"Detail",
"deities": "Deities",
"organizations": "Organizations",
"festival": "Festival",
"deity": "Deity",
"organization": "Organization",
"scanQrCode": "Scan QR Code",
"address": "Address",
"location": "Location",
"noRecordFound": "No Record Found",
"noRecentSearch": "No Recent Search",
"buddha": "Buddha",
"king": "King",
"gaden": "Gaden",
"arya": "Arya",
"acharya": "Acharya",
"milarepa": "Milarepa",
"india": "India",
"nepal": "Nepal",
"bhutan": "Bhutan"





}
"appName": "Gonpa Tour",
"home": "Home",
"map": "Map",
"qr": "QR",
"search": "Search",
"settings": "Settings",
"appearance": "Appearance",
"language": "Language",
"support": "Support",
"legal": "Legal",
"system": "System",
"dark": "Dark",
"light": "Light",
"faq": "FAQ",
"contactUs": "Contact Us",
"privacyPolicy": "Privacy Policy",
"contactSupport": "Contact Support",
"sendEmail": "Send Email",
"close": "Close",
"recentSearches": "Recent Search",
"suggestion": "Suggestion",
"detail": "Detail",
"deities": "Statue",
"organizations": "Monastery",
"festival": "Festival",
"deity": "Deity",
"organization": "Organization",
"scanQrCode": "Scan QR Code",
"address": "Address",
"location": "Location",
"noRecordFound": "No Record Found",
"noRecentSearch": "No Recent Search",
"buddha": "Buddha",
"king": "King",
"gaden": "Gaden",
"arya": "Arya",
"acharya": "Acharya",
"milarepa": "Milarepa",
"india": "India",
"nepal": "Nepal",
"bhutan": "Bhutan",
"darkMode": "Dark Mode"
}
4 changes: 2 additions & 2 deletions lib/states/language_state.dart
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@ class LanguageState extends ChangeNotifier {

String? _currentLanguage;

String get currentLanguage => _currentLanguage ?? ENGLISH;
String get currentLanguage => _currentLanguage ?? TIBETAN;

Future<void> _loadLanguage() async {
final prefs = await SharedPreferences.getInstance();
_currentLanguage = prefs.getString(_languagePreferenceKey) ?? ENGLISH;
_currentLanguage = prefs.getString(_languagePreferenceKey) ?? TIBETAN;
notifyListeners();
}

Expand Down
Loading

0 comments on commit 7357d1a

Please sign in to comment.