Build changes

This commit is contained in:
NekoInverter 2020-01-28 15:01:42 +08:00
parent bc9865f2f1
commit fb19bf4f1a
6 changed files with 68 additions and 20 deletions

View File

@ -0,0 +1,2 @@
#!/usr/bin/env bash
$ANDROID_HOME/tools/bin/sdkmanager "ndk;20.0.5594570"

View File

@ -65,19 +65,27 @@ android {
} }
signingConfigs { signingConfigs {
Properties properties = new Properties() def keystorePwd = null
properties.load(project.rootProject.file('local.properties').newDataInputStream()) def alias = null
def pwd = null
if (project.rootProject.file('local.properties').exists()) {
Properties properties = new Properties()
properties.load(project.rootProject.file('local.properties').newDataInputStream())
keystorePwd = properties.getProperty("RELEASE_STORE_PASSWORD")
alias = properties.getProperty("RELEASE_KEY_ALIAS")
pwd = properties.getProperty("RELEASE_KEY_PASSWORD")
}
release { release {
storeFile file("config/release.keystore") storeFile file("config/release.keystore")
storePassword properties.getProperty("RELEASE_STORE_PASSWORD") storePassword keystorePwd != null ? keystorePwd : System.getenv("KEYSTORE_PASS")
keyAlias properties.getProperty("RELEASE_KEY_ALIAS") keyAlias alias != null ? alias : System.getenv("ALIAS_NAME")
keyPassword properties.getProperty("RELEASE_KEY_PASSWORD") keyPassword pwd != null ? pwd : System.getenv("ALIAS_PASS")
} }
debug { debug {
storeFile file("config/release.keystore") storeFile file("config/release.keystore")
storePassword properties.getProperty("RELEASE_STORE_PASSWORD") storePassword keystorePwd != null ? keystorePwd : System.getenv("KEYSTORE_PASS")
keyAlias properties.getProperty("RELEASE_KEY_ALIAS") keyAlias alias != null ? alias : System.getenv("ALIAS_NAME")
keyPassword properties.getProperty("RELEASE_KEY_PASSWORD") keyPassword pwd != null ? pwd : System.getenv("ALIAS_PASS")
} }
} }
@ -87,7 +95,7 @@ android {
debuggable true debuggable true
jniDebuggable true jniDebuggable true
signingConfig signingConfigs.debug signingConfig signingConfigs.debug
//applicationIdSuffix ".beta" applicationIdSuffix ".beta"
minifyEnabled true minifyEnabled true
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
} }
@ -134,7 +142,7 @@ android {
debuggable false debuggable false
jniDebuggable false jniDebuggable false
signingConfig signingConfigs.debug signingConfig signingConfigs.debug
//applicationIdSuffix ".beta" applicationIdSuffix ".beta"
minifyEnabled true minifyEnabled true
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
} }
@ -290,7 +298,7 @@ android {
} }
} }
defaultConfig.versionCode = 10 * 1851 defaultConfig.versionCode = 10 * 1852
applicationVariants.all { variant -> applicationVariants.all { variant ->
variant.outputs.all { output -> variant.outputs.all { output ->

View File

@ -21,19 +21,52 @@
], ],
"api_key": [ "api_key": [
{ {
"current_key": "AIzaSyAC4QRIDv2Tjp79zR2aqFgzYd_s1d_nsHI" "current_key": "AIzaSyCGMAA5lSWvRAgaVtF1-Bh3Di07zePnUbA"
},
{
"current_key": "AIzaSyB1FZcptgvQQZcUrPV7cJmjG5zkbCWxiK0"
} }
], ],
"services": { "services": {
"analytics_service": {
"status": 1
},
"appinvite_service": { "appinvite_service": {
"status": 1, "other_platform_oauth_client": [
"other_platform_oauth_client": [] {
"client_id": "551995224478-u59bvc0oqd8ma9499rvo9s5vvgofrd0f.apps.googleusercontent.com",
"client_type": 3
}
]
}
}
},
{
"client_info": {
"mobilesdk_app_id": "1:551995224478:android:99f9755a158003cb3a268f",
"android_client_info": {
"package_name": "tw.nekomimi.nekogram.beta"
}
},
"oauth_client": [
{
"client_id": "551995224478-u59bvc0oqd8ma9499rvo9s5vvgofrd0f.apps.googleusercontent.com",
"client_type": 3
}
],
"api_key": [
{
"current_key": "AIzaSyCGMAA5lSWvRAgaVtF1-Bh3Di07zePnUbA"
}, },
"ads_service": { {
"status": 2 "current_key": "AIzaSyB1FZcptgvQQZcUrPV7cJmjG5zkbCWxiK0"
}
],
"services": {
"appinvite_service": {
"other_platform_oauth_client": [
{
"client_id": "551995224478-u59bvc0oqd8ma9499rvo9s5vvgofrd0f.apps.googleusercontent.com",
"client_type": 3
}
]
} }
} }
} }

View File

@ -19,7 +19,7 @@ public class BuildVars {
public static boolean USE_CLOUD_STRINGS = true; public static boolean USE_CLOUD_STRINGS = true;
public static boolean CHECK_UPDATES = true; public static boolean CHECK_UPDATES = true;
public static boolean TON_WALLET_STANDALONE = false; public static boolean TON_WALLET_STANDALONE = false;
public static int BUILD_VERSION = 1851; public static int BUILD_VERSION = 1852;
public static String BUILD_VERSION_STRING = "5.14.0"; public static String BUILD_VERSION_STRING = "5.14.0";
public static int APP_ID = 336779; //obtain your own APP_ID at https://core.telegram.org/api/obtaining_api_id public static int APP_ID = 336779; //obtain your own APP_ID at https://core.telegram.org/api/obtaining_api_id
public static String APP_HASH = "b91eefacc86747c068c8d8a16b41500d"; //obtain your own APP_HASH at https://core.telegram.org/api/obtaining_api_id public static String APP_HASH = "b91eefacc86747c068c8d8a16b41500d"; //obtain your own APP_HASH at https://core.telegram.org/api/obtaining_api_id

View File

@ -679,6 +679,11 @@ public class NekoSettingsActivity extends BaseFragment {
public void onBindViewHolder(RecyclerView.ViewHolder holder, int position) { public void onBindViewHolder(RecyclerView.ViewHolder holder, int position) {
switch (holder.getItemViewType()) { switch (holder.getItemViewType()) {
case 1: { case 1: {
if (position == experiment2Row) {
holder.itemView.setBackgroundDrawable(Theme.getThemedDrawable(mContext, R.drawable.greydivider_bottom, Theme.key_windowBackgroundGrayShadow));
} else {
holder.itemView.setBackgroundDrawable(Theme.getThemedDrawable(mContext, R.drawable.greydivider, Theme.key_windowBackgroundGrayShadow));
}
break; break;
} }
case 2: { case 2: {