喵

TMessagesProj/src/main/java/tw/nekomimi/nekogram/BottomBuilder.kt

@@ -0,0 +1,109 @@
+package tw.nekomimi.nekogram
+
+import android.content.Context
+import android.content.DialogInterface
+import android.view.Gravity
+import android.view.View
+import android.widget.LinearLayout
+import org.telegram.messenger.AndroidUtilities
+import org.telegram.messenger.LocaleController
+import org.telegram.messenger.R
+import org.telegram.ui.ActionBar.BottomSheet
+import org.telegram.ui.ActionBar.Theme
+import org.telegram.ui.Cells.CheckBoxCell
+import org.telegram.ui.Cells.HeaderCell
+import org.telegram.ui.Components.LayoutHelper
+
+class BottomBuilder(val ctx: Context) {
+
+    val builder = BottomSheet.Builder(ctx)
+
+    private val rootView = LinearLayout(ctx).apply {
+
+        orientation = LinearLayout.VERTICAL
+
+        builder.setCustomView(this)
+
+    }
+
+    private val buttonsView by lazy {
+
+        LinearLayout(ctx).apply {
+
+            orientation = LinearLayout.HORIZONTAL
+
+            minimumHeight = AndroidUtilities.dp(48F)
+
+            this@BottomBuilder.rootView.addView(this,LayoutHelper.createLinear(-1,-2))
+
+        }
+
+    }
+
+    @JvmOverloads
+    fun addTitle(title: String,bigTitle: Boolean = true) {
+
+        val headerCell = if (bigTitle) HeaderCell(ctx, Theme.key_dialogTextBlue2, 21, 15, false) else HeaderCell(ctx)
+
+        rootView.addView(headerCell,LayoutHelper.createLinear(-1,-2))
+
+    }
+
+    @JvmOverloads
+    fun addCheckBox(text: String, value: Boolean, valueText: String? = null,bottom: Boolean = false,listener: View.OnClickListener) {
+
+        val checkBoxCell = CheckBoxCell(ctx, 1, 21)
+        checkBoxCell.setBackgroundDrawable(Theme.getSelectorDrawable(false))
+        checkBoxCell.minimumHeight = AndroidUtilities.dp(50F)
+        rootView.addView(checkBoxCell, LayoutHelper.createLinear(-1,-2))
+        checkBoxCell.setText(text, valueText ?: "", value, !bottom)
+        checkBoxCell.setTextColor(Theme.getColor(Theme.key_dialogTextBlack))
+        checkBoxCell.setOnClickListener(listener)
+
+    }
+
+    @FunctionalInterface
+    interface IndexedListener {
+
+        fun onClick(index: Int,view: CheckBoxCell)
+
+    }
+
+    @JvmOverloads
+    fun setCheckItems(text: Array<String>, value: (Int) -> Boolean , valueText: ((Int) -> String)? = null,listener: IndexedListener) {
+
+        text.forEachIndexed { index, textI ->
+
+            val checkBoxCell = CheckBoxCell(ctx, 1, 21)
+            checkBoxCell.setBackgroundDrawable(Theme.getSelectorDrawable(false))
+            checkBoxCell.minimumHeight = AndroidUtilities.dp(50F)
+            rootView.addView(checkBoxCell, LayoutHelper.createLinear(-1, -2))
+            checkBoxCell.setText(textI, valueText?.invoke(index) ?: "", value.invoke(index), index < text.size - 1)
+            checkBoxCell.setTextColor(Theme.getColor(Theme.key_dialogTextBlack))
+            checkBoxCell.setOnClickListener { _ -> listener.onClick(index,checkBoxCell) }
+
+        }
+
+    }
+
+    @JvmOverloads
+    fun addButton(text: String,icon: Int = 0,red: Boolean = false,listener: View.OnClickListener) {
+
+        buttonsView.addView(BottomSheet.BottomSheetCell(ctx,1).apply {
+
+            setBackgroundDrawable(Theme.getSelectorDrawable(false))
+            setTextAndIcon(text, icon)
+            setTextColor(Theme.getColor(if (red) Theme.key_windowBackgroundWhiteRedText else Theme.key_dialogTextBlue2))
+            setOnClickListener { v ->
+                listener.onClick(v)
+                builder.dismissRunnable.run()
+            }
+
+        })
+
+    }
+
+    fun create() = builder.create()
+    fun show() = builder.show()
+
+}

TMessagesProj/src/main/java/tw/nekomimi/nekogram/NekoConfig.java

@@ -9,9 +9,12 @@ import android.os.Build;
 
 import org.telegram.messenger.ApplicationLoader;
 import org.telegram.messenger.FileLog;
+import org.telegram.messenger.LocaleController;
 import org.telegram.messenger.NotificationsService;
 import org.telegram.messenger.SharedConfig;
 
+import java.util.Locale;
+
 @SuppressLint("ApplySharedPref")
 public class NekoConfig {
 
@@ -271,6 +274,8 @@ public class NekoConfig {
         SharedPreferences.Editor editor = preferences.edit();
         editor.putInt("nameOrder", nameOrder);
         editor.apply();
+
+        LocaleController.getInstance().recreateFormatters();
     }
 
     public static void setMapPreviewProvider(int provider) {

TMessagesProj/src/main/java/tw/nekomimi/nekogram/NekoSettingsActivity.java

@@ -272,7 +272,7 @@ public class NekoSettingsActivity extends BaseFragment {
                         LocaleController.getString("FirstLast", R.string.FirstLast),
                         LocaleController.getString("FirstLast", R.string.FirstLast)
                 }, (i) -> {
-                    NekoConfig.setNameOrder(i);
+                    NekoConfig.setNameOrder(i + 1);
                     listAdapter.notifyItemChanged(mapPreviewRow);
                 });